X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=samltest%2Fbinding.h;h=3564bb1d752d9a3d20a3b7d8d2eca9cd60193074;hb=d832e76c5e3e4657231ed9f553fbd869b24de1e9;hp=33551445b74205cc625fcdee853ab6d60daf0738;hpb=197bcbae7339bc779bc5780882d11fdeb45f8223;p=shibboleth%2Fcpp-opensaml.git

diff --git a/samltest/binding.h b/samltest/binding.h
index 3355144..3564bb1 100644
--- a/samltest/binding.h
+++ b/samltest/binding.h
@@ -17,13 +17,13 @@
 #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/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>
 
@@ -41,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() {
@@ -81,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());
@@ -100,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;
@@ -249,6 +240,8 @@ public:
         return decoded;
     }
     
+    using HTTPResponse::sendResponse;
+
     long sendResponse(std::istream& inputStream, long status) {
         m_method="POST";
         string page,line;