Mark executable.

[shibboleth/xmltooling.git] / xmltooling / XMLToolingConfig.h

diff --git a/xmltooling/XMLToolingConfig.h b/xmltooling/XMLToolingConfig.h
index 2523c54..bd49bc5 100644 (file)
--- a/xmltooling/XMLToolingConfig.h
+++ b/xmltooling/XMLToolingConfig.h
@@ -15,7 +15,7 @@
  */
 
 /**
- * @file XMLToolingConfig.h
+ * @file xmltooling/XMLToolingConfig.h
  * 
  * Library configuration 
  */
@@ -25,6 +25,7 @@
 
 #include <xmltooling/Lockable.h>
 #include <xmltooling/PluginManager.h>
+#include <xmltooling/soap/SOAPTransport.h>
 #include <xmltooling/util/ParserPool.h>
 
 #ifndef XMLTOOLING_NO_XMLSEC
@@ -43,11 +44,12 @@ namespace xmltooling {
 
 namespace xmltooling {
     
-    class XMLTOOL_API ReplayCache;
-    class XMLTOOL_API SOAPTransport;
-    class XMLTOOL_API StorageService;
     class XMLTOOL_API TemplateEngine;
     class XMLTOOL_API URLEncoder;
+#ifndef XMLTOOLING_LITE
+    class XMLTOOL_API ReplayCache;
+    class XMLTOOL_API StorageService;
+#endif
 
     /**
      * Singleton object that manages library startup/shutdown.configuration.
@@ -60,14 +62,18 @@ namespace xmltooling {
     {
         MAKE_NONCOPYABLE(XMLToolingConfig);
     protected:
+#ifndef XMLTOOLING_NO_XMLSEC
         XMLToolingConfig() : m_keyInfoResolver(NULL), m_replayCache(NULL), m_templateEngine(NULL), m_urlEncoder(NULL), clock_skew_secs(180) {}
-        
+
         /** Global KeyInfoResolver instance. */
         KeyInfoResolver* m_keyInfoResolver;
 
         /** Global ReplayCache instance. */
         ReplayCache* m_replayCache;
-        
+#else
+        XMLToolingConfig() : m_templateEngine(NULL), m_urlEncoder(NULL), clock_skew_secs(180) {}
+#endif
+
         /** Global TemplateEngine instance. */
         TemplateEngine* m_templateEngine;
 
@@ -146,6 +152,7 @@ namespace xmltooling {
          */
         virtual ParserPool& getValidatingParser() const=0;
 
+#ifndef XMLTOOLING_NO_XMLSEC
         /**
          * Sets the global KeyInfoResolver instance.
          * This method must be externally synchronized with any code that uses the object.
@@ -181,6 +188,7 @@ namespace xmltooling {
         ReplayCache* getReplayCache() const {
             return m_replayCache;
         }
+#endif
 
         /**
          * Sets the global URLEncoder instance.
@@ -240,17 +248,22 @@ namespace xmltooling {
         /**
          * Manages factories for KeyInfoResolver plugins.
          */
-        PluginManager<KeyInfoResolver,const xercesc::DOMElement*> KeyInfoResolverManager;
+        PluginManager<KeyInfoResolver,std::string,const xercesc::DOMElement*> KeyInfoResolverManager;
 
         /**
          * Manages factories for CredentialResolver plugins.
          */
-        PluginManager<CredentialResolver,const xercesc::DOMElement*> CredentialResolverManager;
+        PluginManager<CredentialResolver,std::string,const xercesc::DOMElement*> CredentialResolverManager;
 
         /**
          * Manages factories for TrustEngine plugins.
          */
-        PluginManager<TrustEngine,const xercesc::DOMElement*> TrustEngineManager;
+        PluginManager<TrustEngine,std::string,const xercesc::DOMElement*> TrustEngineManager;
+
+        /**
+         * Manages factories for StorageService plugins.
+         */
+        PluginManager<StorageService,std::string,const xercesc::DOMElement*> StorageServiceManager;
 
         /**
          * Maps an XML Signature/Encryption algorithm identifier to a library-specific
@@ -277,12 +290,7 @@ namespace xmltooling {
          * 
          * <p>The factory interface takes a peer name/endpoint pair.
          */
-        PluginManager<SOAPTransport,std::pair<const char*,const char*> > SOAPTransportManager;
-
-        /**
-         * Manages factories for StorageService plugins.
-         */
-        PluginManager<StorageService,const xercesc::DOMElement*> StorageServiceManager;
+        PluginManager<SOAPTransport,std::string,SOAPTransport::Address> SOAPTransportManager;
     };
 
 };