X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=samltest%2Fbinding.h;h=3564bb1d752d9a3d20a3b7d8d2eca9cd60193074;hp=4d4cc16a5451940983d3b9d0b98ea61dfb95c39a;hb=c9e0e2dc2e15d2004333db7f135947db13956b5e;hpb=932cfaae2176c2eba1a9938dc420591a9551a7f3

diff --git a/samltest/binding.h b/samltest/binding.h
index 4d4cc16..3564bb1 100644
--- a/samltest/binding.h
+++ b/samltest/binding.h
@@ -17,17 +17,18 @@
 #include "internal.h"
 
 #include <saml/SAMLConfig.h>
-#include <saml/binding/HTTPRequest.h>
-#include <saml/binding/HTTPResponse.h>
 #include <saml/binding/MessageDecoder.h>
 #include <saml/binding/MessageEncoder.h>
 #include <saml/binding/SecurityPolicyRule.h>
-#include <saml/binding/URLEncoder.h>
 #include <saml/saml2/metadata/Metadata.h>
 #include <saml/saml2/metadata/MetadataProvider.h>
+#include <xmltooling/io/HTTPRequest.h>
+#include <xmltooling/io/HTTPResponse.h>
 #include <xmltooling/security/TrustEngine.h>
+#include <xmltooling/util/URLEncoder.h>
 
 using namespace opensaml::saml2md;
+using namespace opensaml;
 using namespace xmlsignature;
 
 class SAMLBindingBaseTestCase : public HTTPRequest, public HTTPResponse
@@ -40,8 +41,7 @@ protected:
     map<string,string> m_headers;
     string m_method,m_url,m_query;
     vector<XSECCryptoX509*> m_clientCerts;
-    vector<const SecurityPolicyRule*> m_rules1;
-    vector<const SecurityPolicyRule*> m_rules2;
+    vector<const SecurityPolicyRule*> m_rules;
 
 public:
     void setUp() {
@@ -80,15 +80,9 @@ public:
                 
             m_trust = XMLToolingConfig::getConfig().TrustEngineManager.newPlugin(EXPLICIT_KEY_TRUSTENGINE, NULL);
 
-            m_rules1.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SAML1MESSAGE_POLICY_RULE,NULL));
-            m_rules1.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEFLOW_POLICY_RULE,NULL));
-            m_rules1.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SIMPLESIGNING_POLICY_RULE,NULL));
-            m_rules1.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(XMLSIGNING_POLICY_RULE,NULL));
-
-            m_rules2.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SAML2MESSAGE_POLICY_RULE,NULL));
-            m_rules2.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEFLOW_POLICY_RULE,NULL));
-            m_rules2.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SIMPLESIGNING_POLICY_RULE,NULL));
-            m_rules2.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(XMLSIGNING_POLICY_RULE,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));
+            m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(XMLSIGNING_POLICY_RULE,NULL));
         }
         catch (XMLToolingException& ex) {
             TS_TRACE(ex.what());
@@ -99,10 +93,8 @@ public:
     }
     
     void tearDown() {
-        for_each(m_rules1.begin(), m_rules1.end(), xmltooling::cleanup<SecurityPolicyRule>());
-        m_rules1.clear();
-        for_each(m_rules2.begin(), m_rules2.end(), xmltooling::cleanup<SecurityPolicyRule>());
-        m_rules2.clear();
+        for_each(m_rules.begin(), m_rules.end(), xmltooling::cleanup<SecurityPolicyRule>());
+        m_rules.clear();
         delete m_creds;
         delete m_metadata;
         delete m_trust;
@@ -212,7 +204,7 @@ public:
                 pch=strchr(pch,'&');
                 if (pch)
                     *pch++=0;
-                SAMLConfig::getConfig().getURLEncoder()->decode(value);
+                XMLToolingConfig::getConfig().getURLEncoder()->decode(value);
                 m_fields[name] = value;
                 name = pch; 
             }
@@ -248,6 +240,8 @@ public:
         return decoded;
     }
     
+    using HTTPResponse::sendResponse;
+
     long sendResponse(std::istream& inputStream, long status) {
         m_method="POST";
         string page,line;