From: cantor <cantor@de75baf8-a10c-0410-a50a-987c0e22f00f>
Date: Fri, 6 Nov 2009 17:19:10 +0000 (+0000)
Subject: https://bugs.internet2.edu/jira/browse/CPPXT-47
X-Git-Tag: 1.4.1~155
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fxmltooling.git;a=commitdiff_plain;h=edf85488a4952d714897ce69169121ea80bb3bce

https://bugs.internet2.edu/jira/browse/CPPXT-47

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/branches/REL_1@680 de75baf8-a10c-0410-a50a-987c0e22f00f
---

diff --git a/xmltooling/soap/OpenSSLSOAPTransport.h b/xmltooling/soap/OpenSSLSOAPTransport.h
index eb38ef0..21a2045 100644
--- a/xmltooling/soap/OpenSSLSOAPTransport.h
+++ b/xmltooling/soap/OpenSSLSOAPTransport.h
@@ -20,7 +20,7 @@
  * Encapsulates OpenSSL-capable SOAP transport layer.
  */
 
-#ifndef __xmltooling_opensslsoaptrans_h__
+#if !defined(__xmltooling_opensslsoaptrans_h__) && !defined(XMLTOOLING_NO_XMLSEC)
 #define __xmltooling_opensslsoaptrans_h__
 
 #include <xmltooling/soap/SOAPTransport.h>
diff --git a/xmltooling/soap/impl/CURLSOAPTransport.cpp b/xmltooling/soap/impl/CURLSOAPTransport.cpp
index 460a62e..af06fbb 100644
--- a/xmltooling/soap/impl/CURLSOAPTransport.cpp
+++ b/xmltooling/soap/impl/CURLSOAPTransport.cpp
@@ -271,27 +271,6 @@ void xmltooling::termSOAPTransports()
     g_CURLPool = NULL;
 }
 
-SOAPTransport::SOAPTransport()
-{
-}
-
-SOAPTransport::~SOAPTransport()
-{
-}
-
-bool SOAPTransport::setProviderOption(const char* provider, const char* option, const char* value)
-{
-    return false;
-}
-
-HTTPSOAPTransport::HTTPSOAPTransport()
-{
-}
-
-HTTPSOAPTransport::~HTTPSOAPTransport()
-{
-}
-
 OpenSSLSOAPTransport::OpenSSLSOAPTransport()
 {
 }
diff --git a/xmltooling/soap/impl/SOAPClient.cpp b/xmltooling/soap/impl/SOAPClient.cpp
index 8eaeaed..1978e28 100644
--- a/xmltooling/soap/impl/SOAPClient.cpp
+++ b/xmltooling/soap/impl/SOAPClient.cpp
@@ -23,6 +23,7 @@
 #include "internal.h"
 #include "exceptions.h"
 #include "logging.h"
+#include "soap/HTTPSOAPTransport.h"
 #include "soap/SOAP.h"
 #include "soap/SOAPClient.h"
 #include "util/XMLHelper.h"
@@ -36,6 +37,27 @@ using namespace xmltooling;
 using namespace xercesc;
 using namespace std;
 
+SOAPTransport::SOAPTransport()
+{
+}
+
+SOAPTransport::~SOAPTransport()
+{
+}
+
+bool SOAPTransport::setProviderOption(const char* provider, const char* option, const char* value)
+{
+    return false;
+}
+
+HTTPSOAPTransport::HTTPSOAPTransport()
+{
+}
+
+HTTPSOAPTransport::~HTTPSOAPTransport()
+{
+}
+
 SOAPClient::SOAPClient(bool validate) : m_validate(validate), m_transport(NULL)
 {
 }
diff --git a/xmltooling/xmltooling-lite.vcproj b/xmltooling/xmltooling-lite.vcproj
index ca08327..8968c23 100644
--- a/xmltooling/xmltooling-lite.vcproj
+++ b/xmltooling/xmltooling-lite.vcproj
@@ -692,10 +692,6 @@
 					>
 				</File>
 				<File
-					RelativePath=".\soap\OpenSSLSOAPTransport.h"
-					>
-				</File>
-				<File
 					RelativePath=".\soap\SOAP.h"
 					>
 				</File>