You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by wh...@apache.org on 2004/11/22 12:13:38 UTC
cvs commit: ws-axis/c/src/soap SoapHeader.h SoapSerializer.cpp SoapSerializer.h
whitlock 2004/11/22 03:13:38
Modified: c/include/axis/client Call.hpp
c/include/axis/server IHandlerSoapSerializer.hpp
c/src/engine/client Call.cpp
c/src/soap SoapHeader.h SoapSerializer.cpp SoapSerializer.h
Removed: c/include/axis/server IParam.hpp ISoapDeSerializer.hpp
ISoapHeader.hpp ISoapSerializer.hpp
Log:
Remove ISoapHeader and other redundant external headers
Revision Changes Path
1.9 +0 -2 ws-axis/c/include/axis/client/Call.hpp
Index: Call.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/client/Call.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Call.hpp 19 Nov 2004 15:00:55 -0000 1.8
+++ Call.hpp 22 Nov 2004 11:13:37 -0000 1.9
@@ -54,7 +54,6 @@
#include "../server/AxisUserAPI.hpp"
#include "../server/WSDDDefines.hpp"
#include "../server/IHeaderBlock.hpp"
-#include "../server/ISoapHeader.hpp"
AXIS_CPP_NAMESPACE_START
@@ -266,7 +265,6 @@
IHeaderBlock* AXISCALL createHeaderBlock(AxisChar *pachLocalName,
AxisChar *pachUri);
IHeaderBlock* createHeaderBlock();
- int setSoapHeader(ISoapHeader *pSoapHeader);
/* Methods used by stubs to get a deserialized value of XML element
* as basic types
*/
1.3 +0 -14 ws-axis/c/include/axis/server/IHandlerSoapSerializer.hpp
Index: IHandlerSoapSerializer.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/IHandlerSoapSerializer.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IHandlerSoapSerializer.hpp 26 Oct 2004 09:11:04 -0000 1.2
+++ IHandlerSoapSerializer.hpp 22 Nov 2004 11:13:38 -0000 1.3
@@ -22,7 +22,6 @@
AXIS_CPP_NAMESPACE_START
-class ISoapHeader;
class IHeaderBlock;
/**
* @class IHandlerSoapSerializer
@@ -80,19 +79,6 @@
* @return AXIS_SUCCESS or AXIS_FAIL to indicate success or fail.
*/
virtual int AXISCALL addHeaderBlock(IHeaderBlock* pBlk)=0;
-
- /**
- * Sets the given Soap Header to the Serializer. If a Soap Header already
- * exists then this method doesn't do anything, but returns a state to
- * indicate this situation.
- *
- * @param pSoapHeader The Soap Header to be set.
- * @return Returns the following status:
- * - AXIS_FAIL : to indicate failuer.
- * - AXIS_SUCCESS : to indicate success.
- * - AXIS_OBJECT_ALREADY_EXISTS : if a Soap Header already exists.
- */
- virtual int setSoapHeader(ISoapHeader* pSoapHeader)=0;
/**
* Sets the SOAP Version.
1.76 +0 -6 ws-axis/c/src/engine/client/Call.cpp
Index: Call.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/Call.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Call.cpp 12 Nov 2004 11:39:19 -0000 1.75
+++ Call.cpp 22 Nov 2004 11:13:38 -0000 1.76
@@ -634,12 +634,6 @@
pNamespace);
}
-int Call::setSoapHeader (ISoapHeader* pSoapHeader)
-{
- m_nStatus = (m_pIWSSZ->setSoapHeader (pSoapHeader));
- return m_nStatus;
-}
-
IHeaderBlock* Call::createHeaderBlock ()
{
return (m_pIWSSZ->createHeaderBlock ());
1.13 +6 -3 ws-axis/c/src/soap/SoapHeader.h
Index: SoapHeader.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapHeader.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SoapHeader.h 2 Nov 2004 13:53:31 -0000 1.12
+++ SoapHeader.h 22 Nov 2004 11:13:38 -0000 1.13
@@ -17,8 +17,6 @@
#if !defined(_SOAPHEADER_H____OF_AXIS_INCLUDED_)
#define _SOAPHEADER_H____OF_AXIS_INCLUDED_
-#include <axis/server/ISoapHeader.hpp>
-
/**
* @class SoapHeader
* @brief The Header element information item according to SOAP
@@ -40,6 +38,11 @@
* @author Roshan Weerasuriya (roshan@opensource.lk, roshanw@jkcsworld.com)
*/
+#include "Attribute.h"
+#include "HeaderBlock.h"
+#include <list>
+using namespace std;
+
/*
* Revision 1.1 2004/06/13 roshan
* Added doxygen comments to help autobuild API docs
@@ -58,7 +61,7 @@
AXIS_CPP_NAMESPACE_START
class Attribute;
-class SoapHeader : public ISoapHeader
+class SoapHeader
{
private:
int serializeNamespaceDecl(SoapSerializer& pSZ);
1.76 +2 -2 ws-axis/c/src/soap/SoapSerializer.cpp
Index: SoapSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- SoapSerializer.cpp 19 Nov 2004 16:22:07 -0000 1.75
+++ SoapSerializer.cpp 22 Nov 2004 11:13:38 -0000 1.76
@@ -64,7 +64,7 @@
return AXIS_SUCCESS;
}
-int SoapSerializer::setSoapHeader(ISoapHeader *pSoapHeader)
+int SoapSerializer::setSoapHeader(SoapHeader *pSoapHeader)
{
int intStatus = AXIS_FAIL;
@@ -78,7 +78,7 @@
}
else
{
- m_pSoapEnvelope->setSoapHeader((SoapHeader*)pSoapHeader);
+ m_pSoapEnvelope->setSoapHeader(pSoapHeader);
intStatus= AXIS_SUCCESS;
}
}
1.30 +1 -1 ws-axis/c/src/soap/SoapSerializer.h
Index: SoapSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- SoapSerializer.h 2 Nov 2004 13:53:31 -0000 1.29
+++ SoapSerializer.h 22 Nov 2004 11:13:38 -0000 1.30
@@ -102,7 +102,6 @@
int setSoapMethod(SoapMethod* pSoapMethod);
int setSoapFault(SoapFault* pSoapFault);
int setSoapBody(SoapBody* pSoapBody);
- int setSoapHeader(ISoapHeader* pSoapHeader);
int setSoapEnvelope(SoapEnvelope* pSoapEnvelope);
SoapSerializer();
virtual ~SoapSerializer();
@@ -142,6 +141,7 @@
IArrayBean* makeArrayBean(XSDTYPE nType, void* pArray);
IArrayBean* makeArrayBean(void* pObject, void* pSZFunct, void* pDelFunct,
void* pSizeFunct);
+ int setSoapHeader(SoapHeader* pSoapHeader);
public: /* Basic Type Serializing methods */
int removeSoapHeader();