Add new builder base class to indicate support for "argument-less" construction.

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

diff --git a/xmltooling/XMLToolingConfig.h b/xmltooling/XMLToolingConfig.h
index 2a99b1c..0f8ae43 100644 (file)
--- a/xmltooling/XMLToolingConfig.h
+++ b/xmltooling/XMLToolingConfig.h
@@ -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,13 @@ namespace xmltooling {
 
 namespace xmltooling {
     
-    class XMLTOOL_API ReplayCache;
-    class XMLTOOL_API SOAPTransport;
-    class XMLTOOL_API StorageService;
+    class XMLTOOL_API PathResolver;
     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,13 +63,21 @@ namespace xmltooling {
     {
         MAKE_NONCOPYABLE(XMLToolingConfig);
     protected:
-        XMLToolingConfig() : m_keyInfoResolver(NULL), m_replayCache(NULL), m_templateEngine(NULL), m_urlEncoder(NULL), clock_skew_secs(180) {}
-        
+#ifndef XMLTOOLING_NO_XMLSEC
+        XMLToolingConfig() : m_keyInfoResolver(NULL), m_replayCache(NULL),
+            m_pathResolver(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_pathResolver(NULL), m_templateEngine(NULL), m_urlEncoder(NULL), clock_skew_secs(180) {}
+#endif
+
+        /** Global PathResolver instance. */
+        PathResolver* m_pathResolver;
         
         /** Global TemplateEngine instance. */
         TemplateEngine* m_templateEngine;
@@ -146,6 +157,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 +193,7 @@ namespace xmltooling {
         ReplayCache* getReplayCache() const {
             return m_replayCache;
         }
+#endif
 
         /**
          * Sets the global URLEncoder instance.
@@ -217,7 +230,25 @@ namespace xmltooling {
         TemplateEngine* getTemplateEngine() const {
             return m_templateEngine;
         }
-                
+
+        /**
+         * Sets the global PathResolver instance.
+         * This method must be externally synchronized with any code that uses the object.
+         * Any previously set object is destroyed.
+         * 
+         * @param pathResolver   new PathResolver instance to store
+         */
+        void setPathResolver(PathResolver* pathResolver);
+
+        /**
+         * Returns the global PathResolver instance.
+         * 
+         * @return  global PathResolver or NULL
+         */
+        PathResolver* getPathResolver() const {
+            return m_pathResolver;
+        }
+        
         /**
          * List of catalog files to load into validating parser pool at initialization time.
          * Like other path settings, the separator depends on the platform
@@ -240,17 +271,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 +313,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;
     };
 
 };