You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2004/05/25 05:47:34 UTC
cvs commit: ws-axis/c/src/xml/xerces SoapParserXerces.cpp SoapParserXerces.h XercesHandler.h
damitha 2004/05/24 20:47:34
Modified: c/include/axis/server AxisTime.h BasicHandler.h
c/samples/server/rpcfault MathOps.wsdl
c/src/common AxisTime.cpp
c/src/engine Axis.cpp SOAPTransportFactory.h
XMLParserFactory.h
c/src/engine/client ClientAxisEngine.cpp
c/src/engine/server ServerAxisEngine.cpp
c/src/soap SoapDeSerializer.cpp
c/src/wsdd WSDDDocument.cpp WSDDDocument.h
c/src/xml/expat SoapParserExpat.cpp
c/src/xml/xerces SoapParserXerces.cpp SoapParserXerces.h
XercesHandler.h
Log:
Revision Changes Path
1.13 +2 -2 ws-axis/c/include/axis/server/AxisTime.h
Index: AxisTime.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisTime.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AxisTime.h 6 May 2004 03:55:18 -0000 1.12
+++ AxisTime.h 25 May 2004 03:47:33 -0000 1.13
@@ -57,7 +57,7 @@
XSDTYPE nType);
AxisString& serialize(const AxisChar* sName, long lDuration,
XSDTYPE nType);
- long getDuration();
+ double getDuration();
struct tm getDateTime();
struct tm getDate();
struct tm getTime();
@@ -88,7 +88,7 @@
AxisString strZone;
uDuration duration;
time_t m_longYears;
- time_t m_Duration;
+ double m_Duration;
/* string strXSDDuration; */
AxisString strXSDDuration;
AxisString strXSDDate;
1.8 +1 -1 ws-axis/c/include/axis/server/BasicHandler.h
Index: BasicHandler.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/BasicHandler.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicHandler.h 30 Apr 2004 05:38:30 -0000 1.7
+++ BasicHandler.h 25 May 2004 03:47:33 -0000 1.8
@@ -48,7 +48,7 @@
{
public:
HandlerBase(){};
- ~HandlerBase(){};
+ virtual ~HandlerBase(){};
virtual int AXISCALL invoke(void* pMsg)=0;
virtual void AXISCALL onFault(void* mMsg)=0;
virtual int AXISCALL init()=0;
1.4 +2 -2 ws-axis/c/samples/server/rpcfault/MathOps.wsdl
Index: MathOps.wsdl
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/rpcfault/MathOps.wsdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MathOps.wsdl 24 May 2004 05:44:19 -0000 1.3
+++ MathOps.wsdl 25 May 2004 03:47:33 -0000 1.4
@@ -11,7 +11,7 @@
xmlns:s="http://soapinterop.org/xsd">
<types>
<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- targetNamespace="http://soapinterop.org/xsd">
+ targetNamespace="http://localhost/axis/MathOps">
<import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
<complexType name="SOAPStruct">
<sequence>
@@ -35,7 +35,7 @@
<wsdl:part name="addReturn" type="xsd:int"/>
</wsdl:message>
<message name="DivByZeroFault">
- <part name="faultstruct" type="s:SOAPStructFault"/>
+ <part name="faultstruct" type="intf:SOAPStructFault"/>
</message>
<wsdl:portType name="MathOps">
<wsdl:operation name="div" parameterOrder="in0 in1">
1.22 +3 -3 ws-axis/c/src/common/AxisTime.cpp
Index: AxisTime.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTime.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- AxisTime.cpp 18 May 2004 11:09:09 -0000 1.21
+++ AxisTime.cpp 25 May 2004 03:47:33 -0000 1.22
@@ -171,7 +171,7 @@
AxisChar *cTemp;
AxisChar *cTemp2;
AxisChar *cTemp3;
- int intLen = 0;
+ unsigned int intLen = 0;
int intHours = 0;
int intMins = 0;
int intSecs = 0;
@@ -475,7 +475,7 @@
return AXIS_SUCCESS;
}
-long AxisTime::getDuration ()
+double AxisTime::getDuration ()
{
return m_Duration;
}
@@ -511,7 +511,7 @@
AxisTime at;
at.setType (type);
at.setValue (strValue);
- return at.getDuration ();
+ return (long) at.getDuration ();
}
1.58 +1 -1 ws-axis/c/src/engine/Axis.cpp
Index: Axis.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/Axis.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Axis.cpp 24 May 2004 05:54:55 -0000 1.57
+++ Axis.cpp 25 May 2004 03:47:33 -0000 1.58
@@ -252,7 +252,7 @@
if (bServer) // no client side wsdd processing at the moment
{
/* Read from the configuration file */
- int status = g_pConfig->readConfFile ();
+ status = g_pConfig->readConfFile ();
if (status == AXIS_SUCCESS)
{
char *pWsddPath = g_pConfig->getAxConfProperty(AXCONF_WSDDFILEPATH);
1.2 +2 -1 ws-axis/c/src/engine/SOAPTransportFactory.h
Index: SOAPTransportFactory.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/SOAPTransportFactory.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SOAPTransportFactory.h 18 May 2004 11:09:09 -0000 1.1
+++ SOAPTransportFactory.h 25 May 2004 03:47:33 -0000 1.2
@@ -83,4 +83,5 @@
};
-#endif
\ No newline at end of file
+#endif
+
1.2 +2 -1 ws-axis/c/src/engine/XMLParserFactory.h
Index: XMLParserFactory.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/XMLParserFactory.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLParserFactory.h 18 May 2004 11:09:09 -0000 1.1
+++ XMLParserFactory.h 25 May 2004 03:47:33 -0000 1.2
@@ -84,4 +84,5 @@
};
-#endif
\ No newline at end of file
+#endif
+
1.9 +9 -9 ws-axis/c/src/engine/client/ClientAxisEngine.cpp
Index: ClientAxisEngine.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/ClientAxisEngine.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ClientAxisEngine.cpp 18 May 2004 04:32:31 -0000 1.8
+++ ClientAxisEngine.cpp 25 May 2004 03:47:33 -0000 1.9
@@ -63,8 +63,9 @@
pService = g_pWSDDDeployment->getService (pchService);
//Get Global and Transport Handlers
- if (AXIS_SUCCESS !=
- (Status = initializeHandlers (sSessionId, pSoap->getProtocol())))
+
+ Status = initializeHandlers (sSessionId, pSoap->getProtocol());
+ if (AXIS_SUCCESS != Status)
{
THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLERINITFAILED);
break; //do .. while(0)
@@ -72,17 +73,16 @@
//Get Service specific Handlers from the pool if configured any
if (pService != NULL)
{
- if (AXIS_SUCCESS != (Status =
- g_pHandlerPool-> getRequestFlowHandlerChain (&m_pSReqFChain,
- sSessionId, pService)))
+ Status = g_pHandlerPool-> getRequestFlowHandlerChain (&m_pSReqFChain,
+ sSessionId, pService);
+ if (AXIS_SUCCESS != Status)
{
break; //do .. while(0)
}
- if (AXIS_SUCCESS !=
- (Status =
- g_pHandlerPool->
+ Status = g_pHandlerPool->
getResponseFlowHandlerChain (&m_pSResFChain, sSessionId,
- pService)))
+ pService);
+ if (AXIS_SUCCESS != Status)
{
break; //do .. while(0)
}
1.15 +1 -1 ws-axis/c/src/engine/server/ServerAxisEngine.cpp
Index: ServerAxisEngine.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/server/ServerAxisEngine.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ServerAxisEngine.cpp 24 May 2004 09:51:21 -0000 1.14
+++ ServerAxisEngine.cpp 25 May 2004 03:47:33 -0000 1.15
@@ -206,7 +206,7 @@
/* Check whether the provider type in the wsdd matchs the service's
* binding style
*/
- AXIS_BINDING_STYLE nBindingStyle;
+ AXIS_BINDING_STYLE nBindingStyle = RPC_ENCODED;
if (0 != m_pWebService->_functions)
/* C service */
{
1.50 +2 -2 ws-axis/c/src/soap/SoapDeSerializer.cpp
Index: SoapDeSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- SoapDeSerializer.cpp 24 May 2004 05:44:20 -0000 1.49
+++ SoapDeSerializer.cpp 25 May 2004 03:47:33 -0000 1.50
@@ -181,11 +181,12 @@
}
else
{
+ pComplexElement = new ComplexElement();
+ pHeaderBlock = new HeaderBlock();
if (START_ELEMENT == m_pNode->m_type)
{
if (iLevel == HEADER_LEVEL)
{
- pHeaderBlock = new HeaderBlock();
pHeaderBlock->setUri(m_pNode->m_pchNamespace);
pHeaderBlock->setLocalName(m_pNode->m_pchNameOrValue);
@@ -219,7 +220,6 @@
{
iHeaderBlockStackLevel++;
- pComplexElement = new ComplexElement();
pComplexElement->setURI(m_pNode->m_pchNamespace);
pComplexElement->setLocalName(m_pNode->
1.32 +8 -8 ws-axis/c/src/wsdd/WSDDDocument.cpp
Index: WSDDDocument.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDocument.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- WSDDDocument.cpp 18 May 2004 11:09:10 -0000 1.31
+++ WSDDDocument.cpp 25 May 2004 03:47:34 -0000 1.32
@@ -423,15 +423,15 @@
void WSDDDocument::getParameters(WSDDLevels eElementType,
const AnyElement* pEvent)
{
- const XML_Ch* pcLocalname;
- const XML_Ch* pcNamespace;
- const XML_Ch* pcValue;
+ const XML_Ch* pcLocalname;
+ const XML_Ch* pcNamespace;
+ const XML_Ch* pcValue = 0;
const XML_Ch* pcType;
- const XML_Ch* pcName;
- for (int i=0; pEvent->m_pchAttributes[i]; i+=3)
- {
- pcLocalname = pEvent->m_pchAttributes[i];
- pcNamespace = pEvent->m_pchAttributes[i+1];
+ const XML_Ch* pcName = 0;
+ for (int i=0; pEvent->m_pchAttributes[i]; i+=3)
+ {
+ pcLocalname = pEvent->m_pchAttributes[i];
+ pcNamespace = pEvent->m_pchAttributes[i+1];
pcValue = pEvent->m_pchAttributes[i+2];
if (0 == strcmp(pcLocalname, kw_name))
{
1.18 +1 -1 ws-axis/c/src/wsdd/WSDDDocument.h
Index: WSDDDocument.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDocument.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WSDDDocument.h 18 May 2004 11:09:10 -0000 1.17
+++ WSDDDocument.h 25 May 2004 03:47:34 -0000 1.18
@@ -110,4 +110,4 @@
};
#endif
-
\ No newline at end of file
+
1.2 +1 -1 ws-axis/c/src/xml/expat/SoapParserExpat.cpp
Index: SoapParserExpat.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/expat/SoapParserExpat.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoapParserExpat.cpp 18 May 2004 11:09:10 -0000 1.1
+++ SoapParserExpat.cpp 25 May 2004 03:47:34 -0000 1.2
@@ -243,7 +243,7 @@
int SoapParserExpat::parseNext()
{
int nChars = EXPAT_BUFFER_SIZE;
- AXIS_TRANSPORT_STATUS iTransportStatus;
+ AXIS_TRANSPORT_STATUS iTransportStatus = TRANSPORT_FAILED;
m_pCurrentBuffer = (char*) XML_GetBuffer(m_Parser, EXPAT_BUFFER_SIZE);
if (m_pCurrentBuffer)
{
1.3 +2 -1 ws-axis/c/src/xml/xerces/SoapParserXerces.cpp
Index: SoapParserXerces.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/xerces/SoapParserXerces.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SoapParserXerces.cpp 24 May 2004 05:54:55 -0000 1.2
+++ SoapParserXerces.cpp 25 May 2004 03:47:34 -0000 1.3
@@ -139,4 +139,5 @@
}
return AXIS_FAIL;
}
-}
\ No newline at end of file
+}
+
1.2 +2 -1 ws-axis/c/src/xml/xerces/SoapParserXerces.h
Index: SoapParserXerces.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/xerces/SoapParserXerces.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoapParserXerces.h 18 May 2004 11:09:10 -0000 1.1
+++ SoapParserXerces.h 25 May 2004 03:47:34 -0000 1.2
@@ -61,4 +61,5 @@
};
-#endif
\ No newline at end of file
+#endif
+
1.3 +2 -1 ws-axis/c/src/xml/xerces/XercesHandler.h
Index: XercesHandler.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/xerces/XercesHandler.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesHandler.h 24 May 2004 05:54:55 -0000 1.2
+++ XercesHandler.h 25 May 2004 03:47:34 -0000 1.3
@@ -88,4 +88,5 @@
Nelement->m_pchNamespace = NULL;
}
-};
\ No newline at end of file
+};
+