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 0f8ae43..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.
@@ -159,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
@@ -177,15 +168,6 @@ namespace xmltooling {
         }
 
         /**
-         * Sets the global ReplayCache instance.
-         * This method must be externally synchronized with any code that uses the object.
-         * Any previously set object is destroyed.
-         * 
-         * @param replayCache   new ReplayCache instance to store
-         */
-        void setReplayCache(ReplayCache* replayCache);
-
-        /**
          * Returns the global ReplayCache instance.
          * 
          * @return  global ReplayCache or NULL
@@ -193,36 +175,36 @@ namespace xmltooling {
         ReplayCache* getReplayCache() const {
             return m_replayCache;
         }
-#endif
 
         /**
-         * Sets the global URLEncoder instance.
+         * 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 urlEncoder   new URLEncoder instance to store
-         */
-        void setURLEncoder(URLEncoder* urlEncoder);
-        
-        /**
-         * Returns the global URLEncoder instance.
-         * 
-         * @return  global URLEncoder or NULL
+         * @param keyInfoResolver   new KeyInfoResolver instance to store
          */
-        const URLEncoder* getURLEncoder() const {
-            return m_urlEncoder;
-        }
-        
+        void setKeyInfoResolver(KeyInfoResolver* keyInfoResolver);
+
         /**
-         * Sets the global TemplateEngine instance.
+         * Sets the global ReplayCache instance.
          * This method must be externally synchronized with any code that uses the object.
          * Any previously set object is destroyed.
          * 
-         * @param templateEngine   new TemplateEngine instance to store
+         * @param replayCache   new ReplayCache instance to store
          */
-        void setTemplateEngine(TemplateEngine* templateEngine);
+        void setReplayCache(ReplayCache* replayCache);
+#endif
 
         /**
+         * Returns the global PathResolver instance.
+         * 
+         * @return  global PathResolver or NULL
+         */
+        PathResolver* getPathResolver() const {
+            return m_pathResolver;
+        }
+        
+        /**
          * Returns the global TemplateEngine instance.
          * 
          * @return  global TemplateEngine or NULL
@@ -232,6 +214,15 @@ namespace xmltooling {
         }
 
         /**
+         * Returns the global URLEncoder instance.
+         * 
+         * @return  global URLEncoder or NULL
+         */
+        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.
@@ -239,15 +230,24 @@ namespace xmltooling {
          * @param pathResolver   new PathResolver instance to store
          */
         void setPathResolver(PathResolver* pathResolver);
+        
+        /**
+         * Sets the global TemplateEngine instance.
+         * This method must be externally synchronized with any code that uses the object.
+         * Any previously set object is destroyed.
+         * 
+         * @param templateEngine   new TemplateEngine instance to store
+         */
+        void setTemplateEngine(TemplateEngine* templateEngine);
 
         /**
-         * Returns the global PathResolver 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 PathResolver or NULL
+         * @param urlEncoder   new URLEncoder instance to store
          */
-        PathResolver* getPathResolver() const {
-            return m_pathResolver;
-        }
+        void setURLEncoder(URLEncoder* urlEncoder);
         
         /**
          * List of catalog files to load into validating parser pool at initialization time.