X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=samltest%2Fbinding.h;h=b412be8173760d1ee966add9dfdb6a0a2354b57f;hp=13638f1c9f356a228f46f8c3f241501289847dfd;hb=a30857e2c0f4bcd1817aa2939ffdc0856e93a533;hpb=c3c89629114e8a29b8c9a769956b6b4e7e2c4c24

diff --git a/samltest/binding.h b/samltest/binding.h
index 13638f1..b412be8 100644
--- a/samltest/binding.h
+++ b/samltest/binding.h
@@ -22,10 +22,11 @@
 #include <saml/binding/MessageDecoder.h>
 #include <saml/binding/MessageEncoder.h>
 #include <saml/binding/URLEncoder.h>
+#include <saml/saml2/metadata/Metadata.h>
 #include <saml/saml2/metadata/MetadataProvider.h>
-#include <saml/security/TrustEngine.h>
+#include <xmltooling/security/TrustEngine.h>
 
-using namespace saml2md;
+using namespace opensaml::saml2md;
 using namespace xmlsignature;
 
 class SAMLBindingBaseTestCase : public HTTPRequest, public HTTPResponse
@@ -33,7 +34,7 @@ class SAMLBindingBaseTestCase : public HTTPRequest, public HTTPResponse
 protected:
     CredentialResolver* m_creds; 
     MetadataProvider* m_metadata;
-    opensaml::TrustEngine* m_trust;
+    TrustEngine* m_trust;
     map<string,string> m_fields;
     map<string,string> m_headers;
     string m_method,m_url,m_query;
@@ -75,7 +76,7 @@ public:
                 FILESYSTEM_CREDENTIAL_RESOLVER,doc2->getDocumentElement()
                 );
                 
-            m_trust = SAMLConfig::getConfig().TrustEngineManager.newPlugin(EXPLICIT_KEY_SAMLTRUSTENGINE, NULL);
+            m_trust = XMLToolingConfig::getConfig().TrustEngineManager.newPlugin(EXPLICIT_KEY_TRUSTENGINE, NULL);
 
             m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEFLOW_POLICY_RULE,NULL));
             m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SIMPLESIGNING_POLICY_RULE,NULL));