X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2FSAMLConfig.cpp;h=d429d96b927db0e63df4e7af597f3af3a4617935;hb=197bcbae7339bc779bc5780882d11fdeb45f8223;hp=48a8175014a47b508d27519af4a38b0b5d41b02f;hpb=3e40c0e62375c069e7860a87ca4f65fb2003f018;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index 48a8175..d429d96 100644
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -1,6 +1,6 @@
 
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
 #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"
@@ -67,9 +66,13 @@ 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(MetadataException,opensaml::saml2md);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(BindingException,opensaml);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(ProfileException,opensaml);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(FatalProfileException,opensaml);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(RetryableProfileException,opensaml);
 
 namespace opensaml {
    SAMLInternalConfig g_config;
@@ -91,12 +94,6 @@ void SAMLConfig::setArtifactMap(ArtifactMap* artifactMap)
     m_artifactMap = artifactMap;
 }
 
-void SAMLConfig::setURLEncoder(URLEncoder* urlEncoder)
-{
-    delete m_urlEncoder;
-    m_urlEncoder = urlEncoder;
-}
-
 bool SAMLInternalConfig::init(bool initXMLTooling)
 {
 #ifdef _DEBUG
@@ -110,9 +107,13 @@ 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(MetadataException,opensaml::saml2md);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(BindingException,opensaml);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ProfileException,opensaml);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(FatalProfileException,opensaml);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(RetryableProfileException,opensaml);
 
     saml1::registerAssertionClasses();
     saml1p::registerProtocolClasses();
@@ -125,8 +126,6 @@ bool SAMLInternalConfig::init(bool initXMLTooling)
     registerMessageEncoders();
     registerMessageDecoders();
     registerSecurityPolicyRules();
-    
-    m_urlEncoder = new URLEncoder();
 
     log.info("library initialization complete");
     return true;
@@ -148,8 +147,6 @@ void SAMLInternalConfig::term(bool termXMLTooling)
 
     delete m_artifactMap;
     m_artifactMap = NULL;
-    delete m_urlEncoder;
-    m_urlEncoder = NULL;
 
     if (termXMLTooling) {
         XMLToolingConfig::getConfig().term();