X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml1%2Fbinding%2FSAML1SOAPClient.h;h=4279f0762f458b5e5b2bb08d2cd2fe5f3dad367a;hb=3e12b03ef5f4ad38074b127845f7b08c834cd3cc;hp=3c28e653075d7288398ab1dfadca1d44313e74a2;hpb=7b2379b0581ae09769029861b9bc351e95fed799;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/saml1/binding/SAML1SOAPClient.h b/saml/saml1/binding/SAML1SOAPClient.h
index 3c28e65..4279f07 100644
--- a/saml/saml1/binding/SAML1SOAPClient.h
+++ b/saml/saml1/binding/SAML1SOAPClient.h
@@ -1,5 +1,5 @@
 /*
- *  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.
@@ -17,7 +17,7 @@
 /**
  * @file saml/saml1/binding/SAML1SOAPClient.h
  * 
- * Specialized SOAPClient for SAML 1.x SOAP binding.
+ * Client class for SAML 1.x SOAP binding.
  */
 
 #ifndef __saml1_soap11client_h__
@@ -26,6 +26,7 @@
 #include <saml/binding/SOAPClient.h>
 
 namespace opensaml {
+
     namespace saml1p {
         
         class SAML_API Request;
@@ -33,33 +34,34 @@ namespace opensaml {
         class SAML_API Status;
 
         /**
-         * Specialized SOAPClient for SAML 1.x SOAP binding.
+         *  Client class for SAML 1.x SOAP binding.
          */
-        class SAML_API SAML1SOAPClient : opensaml::SOAPClient
+        class SAML_API SAML1SOAPClient
         {
         public:
             /**
-             * Creates a SOAP client instance with a particular SecurityPolicy.
+             * Constructor
              * 
-             * @param policy    reference to SecurityPolicy to apply
+             * @param soaper    reference to SOAPClient object to use for call
              */
-            SAML1SOAPClient(SecurityPolicy& policy) : opensaml::SOAPClient(policy), m_correlate(NULL) {}
+            SAML1SOAPClient(SOAPClient& soaper) : m_soaper(soaper), m_correlate(NULL) {
+            }
             
             virtual ~SAML1SOAPClient() {
-                XMLString::release(&m_correlate);
+                xercesc::XMLString::release(&m_correlate);
             }
     
             /**
              * Specialized method for sending SAML 1.x requests. The SOAP layer will be
              * constructed automatically.
              * 
-             * <p>The request will be freed by the client object if the method succeeds.
+             * <p>The request will be freed by the client object regardless of the outcome.
              * 
              * @param request   SAML request to send
-             * @param peer      peer to send message to, expressed in metadata terms
+             * @param peer      peer to send message to, expressed in metadata criteria terms
              * @param endpoint  URL of endpoint to recieve message
              */
-            virtual void sendSAML(Request* request, const saml2md::RoleDescriptor& peer, const char* endpoint);
+            virtual void sendSAML(Request* request, saml2md::MetadataCredentialCriteria& peer, const char* endpoint);
             
             /**
              * Specialized method for receiving SAML 1.x responses. The SOAP layer will be
@@ -79,7 +81,10 @@ namespace opensaml {
              * @return true iff the error should be treated as a fatal error
              */
             virtual bool handleError(const Status& status);
-        
+
+            /** SOAP client object */
+            SOAPClient& m_soaper;
+
         private:
             XMLCh* m_correlate;
         };