X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2FSAMLConfig.h;h=dc342e647efe77a2969f3df808af045ab0b90365;hb=d8a4f024b89272eae00618fc39e6127b6c191edd;hp=91a059827ae2d0a9661bd23afd2dea837d8109ab;hpb=b1bc6cee9765011e91f139f4af302dd1007bb2a1;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/SAMLConfig.h b/saml/SAMLConfig.h
index 91a0598..dc342e6 100644
--- a/saml/SAMLConfig.h
+++ b/saml/SAMLConfig.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 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
@@ -59,7 +58,7 @@ namespace opensaml {
     {
     MAKE_NONCOPYABLE(SAMLConfig);
     public:
-        virtual ~SAMLConfig() {}
+        virtual ~SAMLConfig();
 
         /**
          * Returns the global configuration object for the library.
@@ -107,9 +106,7 @@ namespace opensaml {
          * 
          * @return  global ArtifactMap or NULL
          */
-        ArtifactMap* getArtifactMap() const {
-            return m_artifactMap;
-        }
+        ArtifactMap* getArtifactMap() const;
 
         /**
          * Generate random information using the underlying security library
@@ -146,10 +143,10 @@ namespace opensaml {
         virtual std::string hashSHA1(const char* s, bool toHex=false)=0;
 
         /** Manages factories for MessageDecoder plugins. */
-        xmltooling::PluginManager<MessageDecoder,std::string,const xercesc::DOMElement*> MessageDecoderManager;
+        xmltooling::PluginManager< MessageDecoder,std::string,std::pair<const xercesc::DOMElement*,const XMLCh*> > MessageDecoderManager;
 
         /** Manages factories for MessageEncoder plugins. */
-        xmltooling::PluginManager<MessageEncoder,std::string,const xercesc::DOMElement*> MessageEncoderManager;        
+        xmltooling::PluginManager< MessageEncoder,std::string,std::pair<const xercesc::DOMElement*,const XMLCh*> > MessageEncoderManager;
 
         /** Manages factories for SAMLArtifact plugins. */
         xmltooling::PluginManager<SAMLArtifact,std::string,const char*> SAMLArtifactManager;
@@ -164,7 +161,7 @@ namespace opensaml {
         xmltooling::PluginManager<saml2md::MetadataFilter,std::string,const xercesc::DOMElement*> MetadataFilterManager;
 
     protected:
-        SAMLConfig() : m_artifactMap(NULL) {}
+        SAMLConfig();
         
         /** Global ArtifactMap instance for use by artifact-related functions. */
         ArtifactMap* m_artifactMap;