You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2004/04/21 12:14:50 UTC
cvs commit: xml-security/c/src/utils/winutils XSECBinHTTPURIInputStream.hpp XSECSOAPRequestorSimpleWin32.cpp
blautenb 2004/04/21 03:14:50
Modified: c/Projects/VC6.0/xsec/xsec_lib xsec_lib.dsp
c/src/utils/winutils XSECBinHTTPURIInputStream.hpp
XSECSOAPRequestorSimpleWin32.cpp
Log:
Clean windows build with overarching SimpleSOAPRequestor
Revision Changes Path
1.30 +8 -4 xml-security/c/Projects/VC6.0/xsec/xsec_lib/xsec_lib.dsp
Index: xsec_lib.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/xsec_lib/xsec_lib.dsp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xsec_lib.dsp 19 Apr 2004 10:56:51 -0000 1.29
+++ xsec_lib.dsp 21 Apr 2004 10:14:49 -0000 1.30
@@ -605,10 +605,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\src\utils\winutils\XSECSOAPRequestorSimpleWin32.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\src\utils\winutils\XSECURIResolverGenericWin32.cpp
# End Source File
# Begin Source File
@@ -667,6 +663,14 @@
# Begin Source File
SOURCE=..\..\..\..\src\utils\XSECSOAPRequestor.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\utils\XSECSOAPRequestorSimple.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\utils\XSECSOAPRequestorSimple.hpp
# End Source File
# Begin Source File
1.6 +6 -3 xml-security/c/src/utils/winutils/XSECBinHTTPURIInputStream.hpp
Index: XSECBinHTTPURIInputStream.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/winutils/XSECBinHTTPURIInputStream.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECBinHTTPURIInputStream.hpp 16 Apr 2004 12:07:23 -0000 1.5
+++ XSECBinHTTPURIInputStream.hpp 21 Apr 2004 10:14:49 -0000 1.6
@@ -30,6 +30,9 @@
* $Id$
*
* $Log$
+ * Revision 1.6 2004/04/21 10:14:49 blautenb
+ * Clean windows build with overarching SimpleSOAPRequestor
+ *
* Revision 1.5 2004/04/16 12:07:23 blautenb
* Skeleton code for XKMS MessageFactory
*
@@ -67,7 +70,7 @@
struct hostent;
struct sockaddr;
-class XSECSOAPRequestorSimpleWin32;
+class XSECSOAPRequestorSimple;
class DSIG_EXPORT XSECBinHTTPURIInputStream : public XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream
{
@@ -81,7 +84,7 @@
static void Cleanup();
- friend XSECSOAPRequestorSimpleWin32;
+ friend class XSECSOAPRequestorSimple;
protected:
1.3 +4 -111 xml-security/c/src/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp
Index: XSECSOAPRequestorSimpleWin32.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSECSOAPRequestorSimpleWin32.cpp 19 Apr 2004 10:55:37 -0000 1.2
+++ XSECSOAPRequestorSimpleWin32.cpp 21 Apr 2004 10:14:50 -0000 1.3
@@ -25,11 +25,11 @@
*
*/
-#include "XSECSOAPRequestorSimpleWin32.hpp"
#include <xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp>
#include <xsec/framework/XSECError.hpp>
#include <xsec/utils/XSECSafeBuffer.hpp>
+#include <xsec/utils/XSECSOAPRequestorSimple.hpp>
#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/xkms/XKMSConstants.hpp>
@@ -58,130 +58,23 @@
XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
-// Strings for constructing SOAP envelopes
-// --------------------------------------------------------------------------------
-
-static XMLCh s_prefix[] = {
-
- chLatin_e,
- chLatin_n,
- chLatin_v,
- chNull
-};
-
-static XMLCh s_Envelope[] = {
-
- chLatin_E,
- chLatin_n,
- chLatin_v,
- chLatin_e,
- chLatin_l,
- chLatin_o,
- chLatin_p,
- chLatin_e,
- chNull
-};
-
-static XMLCh s_Header[] = {
-
- chLatin_H,
- chLatin_e,
- chLatin_a,
- chLatin_d,
- chLatin_e,
- chLatin_r,
- chNull
-};
-
-static XMLCh s_Body[] = {
-
- chLatin_B,
- chLatin_o,
- chLatin_d,
- chLatin_y,
- chNull
-};
-
-// --------------------------------------------------------------------------------
// Constructors and Destructors
// --------------------------------------------------------------------------------
-XSECSOAPRequestorSimpleWin32::XSECSOAPRequestorSimpleWin32(const XMLCh * uri) : m_uri(uri) {
+XSECSOAPRequestorSimple::XSECSOAPRequestorSimple(const XMLCh * uri) : m_uri(uri) {
XSECBinHTTPURIInputStream::ExternalInitialize();
}
-XSECSOAPRequestorSimpleWin32::~XSECSOAPRequestorSimpleWin32() {
-}
-
-
-// --------------------------------------------------------------------------------
-// Wrap and serialise the request message
-// --------------------------------------------------------------------------------
-
-char * XSECSOAPRequestorSimpleWin32::wrapAndSerialise(DOMDocument * request) {
-
- // Create a new document to wrap the request in
-
- XMLCh tempStr[100];
- XMLString::transcode("Core", tempStr, 99);
- DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
-
- safeBuffer str;
-
- makeQName(str, s_prefix, s_Envelope);
-
- DOMDocument *doc = impl->createDocument(
- XKMSConstants::s_unicodeStrURISOAP11,
- str.rawXMLChBuffer(),
- NULL);// DOMDocumentType()); // document type object (DTD).
-
- DOMElement *rootElem = doc->getDocumentElement();
-
- makeQName(str, s_prefix, s_Body);
- DOMElement *body = doc->createElementNS(
- XKMSConstants::s_unicodeStrURISOAP11,
- str.rawXMLChBuffer());
-
- rootElem->appendChild(body);
-
- // Now replicate the request into the document
- DOMElement * reqElement = (DOMElement *) doc->importNode(request->getDocumentElement(), true);
- body->appendChild(reqElement);
-
- // OK - Now we have the SOAP request as a document, we serialise to a string buffer
- // and return
-
- DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
-
- theSerializer->setEncoding(MAKE_UNICODE_STRING("UTF-8"));
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, false))
- theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, false);
-
- MemBufFormatTarget *formatTarget = new MemBufFormatTarget;
- theSerializer->writeNode(formatTarget, *doc);
-
- // Now replicate the buffer
- char * ret = XMLString::replicate((const char *) formatTarget->getRawBuffer());
-
- delete theSerializer;
- delete formatTarget;
-
- doc->release();
-
- return ret;
-}
-
-
// --------------------------------------------------------------------------------
// Interface
// --------------------------------------------------------------------------------
-DOMDocument * XSECSOAPRequestorSimpleWin32::doRequest(DOMDocument * request) {
+DOMDocument * XSECSOAPRequestorSimple::doRequest(DOMDocument * request) {
char * content = wrapAndSerialise(request);