X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2FSAMLConfig.h;h=e36640e546cc31c10f3520e949a990368660cb9b;hb=9424cbad0360d512935936e6410fca5e32eb29bc;hp=566c2d1ba6e4638d7accd0db818e74cbc26805f4;hpb=1ffcb743f90aeb3da11054316f3d005ff7edbf7b;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/SAMLConfig.h b/saml/SAMLConfig.h
index 566c2d1..e36640e 100644
--- a/saml/SAMLConfig.h
+++ b/saml/SAMLConfig.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,8 +40,7 @@ namespace opensaml {
     class SAML_API MessageEncoder;
     class SAML_API MessageDecoder;
     class SAML_API SAMLArtifact;
-    class SAML_API TrustEngine;
-    class SAML_API URLEncoder;
+    class SAML_API SecurityPolicyRule;
 
     namespace saml2md {
         class SAML_API MetadataProvider;
@@ -113,24 +112,6 @@ namespace opensaml {
         }
 
         /**
-         * 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
@@ -164,44 +145,29 @@ namespace opensaml {
          */
         virtual std::string hashSHA1(const char* s, bool toHex=false)=0;
 
-        /**
-         * Manages factories for MessageDecoder plugins.
-         */
-        xmltooling::PluginManager<MessageDecoder,const DOMElement*> MessageDecoderManager;
+        /** Manages factories for MessageDecoder plugins. */
+        xmltooling::PluginManager< MessageDecoder,std::string,std::pair<const xercesc::DOMElement*,const XMLCh*> > MessageDecoderManager;
 
-        /**
-         * Manages factories for MessageEncoder plugins.
-         */
-        xmltooling::PluginManager<MessageEncoder,const DOMElement*> MessageEncoderManager;        
+        /** Manages factories for MessageEncoder plugins. */
+        xmltooling::PluginManager< MessageEncoder,std::string,std::pair<const xercesc::DOMElement*,const XMLCh*> > MessageEncoderManager;
 
-        /**
-         * Manages factories for SAMLArtifact plugins.
-         */
-        xmltooling::PluginManager<SAMLArtifact,const char*> SAMLArtifactManager;
+        /** Manages factories for SAMLArtifact plugins. */
+        xmltooling::PluginManager<SAMLArtifact,std::string,const char*> SAMLArtifactManager;
 
-        /**
-         * Manages factories for TrustEngine plugins.
-         */
-        xmltooling::PluginManager<TrustEngine,const DOMElement*> TrustEngineManager;
+        /** Manages factories for SecurityPolicyRule plugins. */
+        xmltooling::PluginManager<SecurityPolicyRule,std::string,const xercesc::DOMElement*> SecurityPolicyRuleManager;
 
-        /**
-         * Manages factories for MetadataProvider plugins.
-         */
-        xmltooling::PluginManager<saml2md::MetadataProvider,const DOMElement*> MetadataProviderManager;
+        /** Manages factories for MetadataProvider plugins. */
+        xmltooling::PluginManager<saml2md::MetadataProvider,std::string,const xercesc::DOMElement*> MetadataProviderManager;
         
-        /**
-         * Manages factories for MetadataFilter plugins.
-         */
-        xmltooling::PluginManager<saml2md::MetadataFilter,const DOMElement*> MetadataFilterManager;
+        /** Manages factories for MetadataFilter plugins. */
+        xmltooling::PluginManager<saml2md::MetadataFilter,std::string,const xercesc::DOMElement*> MetadataFilterManager;
 
     protected:
-        SAMLConfig() : m_artifactMap(NULL), m_urlEncoder(NULL) {}
+        SAMLConfig() : m_artifactMap(NULL) {}
         
         /** 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)