https://issues.shibboleth.net/jira/browse/CPPXT-42

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

diff --git a/xmltooling/XMLToolingConfig.h b/xmltooling/XMLToolingConfig.h
index cb558a0..3c24b2a 100644 (file)
--- a/xmltooling/XMLToolingConfig.h
+++ b/xmltooling/XMLToolingConfig.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.
@@ -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,7 +44,7 @@ namespace xmltooling {
 
 namespace xmltooling {
     
-    class XMLTOOL_API SOAPTransport;
+    class XMLTOOL_API PathResolver;
     class XMLTOOL_API TemplateEngine;
     class XMLTOOL_API URLEncoder;
 #ifndef XMLTOOLING_LITE
@@ -63,7 +64,8 @@ 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) {}
+        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;
@@ -71,9 +73,12 @@ namespace xmltooling {
         /** Global ReplayCache instance. */
         ReplayCache* m_replayCache;
 #else
-        XMLToolingConfig() : m_templateEngine(NULL), m_urlEncoder(NULL), clock_skew_secs(180) {}
+        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;
 
@@ -154,15 +159,6 @@ namespace xmltooling {
 
 #ifndef XMLTOOLING_NO_XMLSEC
         /**
-         * Sets the global KeyInfoResolver instance.
-         * This method must be externally synchronized with any code that uses the object.
-         * Any previously set object is destroyed.
-         * 
-         * @param keyInfoResolver   new KeyInfoResolver instance to store
-         */
-        void setKeyInfoResolver(KeyInfoResolver* keyInfoResolver);
-
-        /**
          * Returns the global KeyInfoResolver instance.
          * 
          * @return  global KeyInfoResolver or NULL
@@ -172,6 +168,24 @@ namespace xmltooling {
         }
 
         /**
+         * Returns the global ReplayCache instance.
+         * 
+         * @return  global ReplayCache or NULL
+         */
+        ReplayCache* getReplayCache() const {
+            return m_replayCache;
+        }
+
+        /**
+         * Sets the global KeyInfoResolver instance.
+         * This method must be externally synchronized with any code that uses the object.
+         * Any previously set object is destroyed.
+         * 
+         * @param keyInfoResolver   new KeyInfoResolver instance to store
+         */
+        void setKeyInfoResolver(KeyInfoResolver* keyInfoResolver);
+
+        /**
          * Sets the global ReplayCache instance.
          * This method must be externally synchronized with any code that uses the object.
          * Any previously set object is destroyed.
@@ -179,26 +193,26 @@ namespace xmltooling {
          * @param replayCache   new ReplayCache instance to store
          */
         void setReplayCache(ReplayCache* replayCache);
+#endif
 
         /**
-         * Returns the global ReplayCache instance.
+         * Returns the global PathResolver instance.
          * 
-         * @return  global ReplayCache or NULL
+         * @return  global PathResolver or NULL
          */
-        ReplayCache* getReplayCache() const {
-            return m_replayCache;
+        PathResolver* getPathResolver() const {
+            return m_pathResolver;
         }
-#endif
-
+        
         /**
-         * Sets the global URLEncoder instance.
-         * This method must be externally synchronized with any code that uses the object.
-         * Any previously set object is destroyed.
+         * Returns the global TemplateEngine instance.
          * 
-         * @param urlEncoder   new URLEncoder instance to store
+         * @return  global TemplateEngine or NULL
          */
-        void setURLEncoder(URLEncoder* urlEncoder);
-        
+        TemplateEngine* getTemplateEngine() const {
+            return m_templateEngine;
+        }
+
         /**
          * Returns the global URLEncoder instance.
          * 
@@ -207,6 +221,15 @@ namespace xmltooling {
         const URLEncoder* getURLEncoder() const {
             return m_urlEncoder;
         }
+
+        /**
+         * 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);
         
         /**
          * Sets the global TemplateEngine instance.
@@ -218,14 +241,14 @@ namespace xmltooling {
         void setTemplateEngine(TemplateEngine* templateEngine);
 
         /**
-         * Returns the global TemplateEngine instance.
+         * Sets the global URLEncoder instance.
+         * This method must be externally synchronized with any code that uses the object.
+         * Any previously set object is destroyed.
          * 
-         * @return  global TemplateEngine or NULL
+         * @param urlEncoder   new URLEncoder instance to store
          */
-        TemplateEngine* getTemplateEngine() const {
-            return m_templateEngine;
-        }
-                
+        void setURLEncoder(URLEncoder* urlEncoder);
+        
         /**
          * List of catalog files to load into validating parser pool at initialization time.
          * Like other path settings, the separator depends on the platform
@@ -290,7 +313,7 @@ namespace xmltooling {
          * 
          * <p>The factory interface takes a peer name/endpoint pair.
          */
-        PluginManager<SOAPTransport,std::string,std::pair<const char*,const char*> > SOAPTransportManager;
+        PluginManager<SOAPTransport,std::string,SOAPTransport::Address> SOAPTransportManager;
     };
 
 };