X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2FSAMLConfig.h;h=5a4021427eb8c8b6f656400a00a935835623b292;hb=840b05eda26529a8c06790960bbb227162523309;hp=b6f620ac2da852ff5a69b71e8e1f2b90558e9607;hpb=1bc8e721db3a50294df852662e1eddcdbdae8f9f;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/SAMLConfig.h b/saml/SAMLConfig.h
index b6f620a..5a40214 100644
--- a/saml/SAMLConfig.h
+++ b/saml/SAMLConfig.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 /**
  * @file saml/SAMLConfig.h
  * 
- * Library configuration 
+ * Library configuration.
  */
 
 #ifndef __saml_config_h__
@@ -25,10 +25,9 @@
 
 #include <saml/base.h>
 
-#include <xmltooling/PluginManager.h>
-#include <xmltooling/XMLToolingConfig.h>
-
 #include <string>
+#include <xercesc/dom/DOM.hpp>
+#include <xmltooling/PluginManager.h>
 
 /**
  * @namespace opensaml
@@ -41,8 +40,6 @@ namespace opensaml {
     class SAML_API MessageDecoder;
     class SAML_API SAMLArtifact;
     class SAML_API SecurityPolicyRule;
-    class SAML_API TrustEngine;
-    class SAML_API URLEncoder;
 
     namespace saml2md {
         class SAML_API MetadataProvider;
@@ -61,7 +58,7 @@ namespace opensaml {
     {
     MAKE_NONCOPYABLE(SAMLConfig);
     public:
-        virtual ~SAMLConfig() {}
+        virtual ~SAMLConfig();
 
         /**
          * Returns the global configuration object for the library.
@@ -109,29 +106,9 @@ namespace opensaml {
          * 
          * @return  global ArtifactMap or NULL
          */
-        ArtifactMap* getArtifactMap() const {
-            return m_artifactMap;
-        }
+        ArtifactMap* getArtifactMap() const;
 
         /**
-         * Sets the global URLEncoder instance.
-         * This method must be externally synchronized with any code that uses the object.
-         * Any previously set object is destroyed.
-         * 
-         * @param urlEncoder   new URLEncoder instance to store
-         */
-        void setURLEncoder(URLEncoder* urlEncoder);
-        
-        /**
-         * Returns the global URLEncoder instance.
-         * 
-         * @return  global URLEncoder or NULL
-         */
-        URLEncoder* getURLEncoder() const {
-            return m_urlEncoder;
-        }
-        
-        /**
          * Generate random information using the underlying security library
          * 
          * @param buf   buffer for the information
@@ -156,6 +133,7 @@ namespace opensaml {
         virtual XMLCh* generateIdentifier()=0;
         
         /**
+         * @deprecated
          * Generate the SHA-1 hash of a string
          * 
          * @param s     NULL-terminated string to hash
@@ -166,34 +144,28 @@ namespace opensaml {
         virtual std::string hashSHA1(const char* s, bool toHex=false)=0;
 
         /** Manages factories for MessageDecoder plugins. */
-        xmltooling::PluginManager<MessageDecoder,const DOMElement*> MessageDecoderManager;
+        xmltooling::PluginManager< MessageDecoder,std::string,std::pair<const xercesc::DOMElement*,const XMLCh*> > MessageDecoderManager;
 
         /** Manages factories for MessageEncoder plugins. */
-        xmltooling::PluginManager<MessageEncoder,const DOMElement*> MessageEncoderManager;        
+        xmltooling::PluginManager< MessageEncoder,std::string,std::pair<const xercesc::DOMElement*,const XMLCh*> > MessageEncoderManager;
 
         /** Manages factories for SAMLArtifact plugins. */
-        xmltooling::PluginManager<SAMLArtifact,const char*> SAMLArtifactManager;
+        xmltooling::PluginManager<SAMLArtifact,std::string,const char*> SAMLArtifactManager;
 
         /** Manages factories for SecurityPolicyRule plugins. */
-        xmltooling::PluginManager<SecurityPolicyRule,const DOMElement*> SecurityPolicyRuleManager;
-
-        /** Manages factories for TrustEngine plugins. */
-        xmltooling::PluginManager<TrustEngine,const DOMElement*> TrustEngineManager;
+        xmltooling::PluginManager<SecurityPolicyRule,std::string,const xercesc::DOMElement*> SecurityPolicyRuleManager;
 
         /** Manages factories for MetadataProvider plugins. */
-        xmltooling::PluginManager<saml2md::MetadataProvider,const DOMElement*> MetadataProviderManager;
+        xmltooling::PluginManager<saml2md::MetadataProvider,std::string,const xercesc::DOMElement*> MetadataProviderManager;
         
         /** Manages factories for MetadataFilter plugins. */
-        xmltooling::PluginManager<saml2md::MetadataFilter,const DOMElement*> MetadataFilterManager;
+        xmltooling::PluginManager<saml2md::MetadataFilter,std::string,const xercesc::DOMElement*> MetadataFilterManager;
 
     protected:
-        SAMLConfig() : m_artifactMap(NULL), m_urlEncoder(NULL) {}
+        SAMLConfig();
         
         /** Global ArtifactMap instance for use by artifact-related functions. */
         ArtifactMap* m_artifactMap;
-
-        /** Global URLEncoder instance for use by URL-related functions. */
-        URLEncoder* m_urlEncoder;
     };
 
 #if defined (_MSC_VER)