Rename exception macros to avoid conflicts.

[shibboleth/cpp-opensaml.git] / saml / SAMLConfig.cpp

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index 5d34221..9afed24 100644 (file)
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -28,13 +28,13 @@
 #include "binding/MessageDecoder.h"
 #include "binding/MessageEncoder.h"
 #include "binding/SAMLArtifact.h"
+#include "binding/SecurityPolicyRule.h"
 #include "binding/URLEncoder.h"
 #include "saml1/core/Assertions.h"
 #include "saml1/core/Protocols.h"
 #include "saml2/core/Protocols.h"
 #include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/MetadataProvider.h"
-#include "security/TrustEngine.h"
 #include "util/SAMLConstants.h"
 
 #include <xmltooling/XMLToolingConfig.h>
@@ -67,9 +67,9 @@ extern "C" void SAML_API xmltooling_extension_term()
     SAMLConfig::getConfig().term(false);
 }
 
-DECL_EXCEPTION_FACTORY(ArtifactException,opensaml);
-DECL_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md);
-DECL_EXCEPTION_FACTORY(BindingException,opensaml);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(ArtifactException,opensaml);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(BindingException,opensaml);
 
 namespace opensaml {
    SAMLInternalConfig g_config;
@@ -110,9 +110,9 @@ bool SAMLInternalConfig::init(bool initXMLTooling)
         log.debug("XMLTooling library initialized");
     }
 
-    REGISTER_EXCEPTION_FACTORY(ArtifactException,opensaml);
-    REGISTER_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md);
-    REGISTER_EXCEPTION_FACTORY(BindingException,opensaml);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ArtifactException,opensaml);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(BindingException,opensaml);
 
     saml1::registerAssertionClasses();
     saml1p::registerProtocolClasses();
@@ -122,7 +122,6 @@ bool SAMLInternalConfig::init(bool initXMLTooling)
     saml2md::registerMetadataProviders();
     saml2md::registerMetadataFilters();
     registerSAMLArtifacts();
-    registerTrustEngines();
     registerMessageEncoders();
     registerMessageDecoders();
     registerSecurityPolicyRules();
@@ -142,7 +141,6 @@ void SAMLInternalConfig::term(bool termXMLTooling)
 
     MessageDecoderManager.deregisterFactories();
     MessageEncoderManager.deregisterFactories();
-    TrustEngineManager.deregisterFactories();
     SecurityPolicyRuleManager.deregisterFactories();
     SAMLArtifactManager.deregisterFactories();
     MetadataFilterManager.deregisterFactories();