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 10:17:30 UTC
cvs commit: ws-axis/c/src/wsdd WSDDDocument.cpp
damitha 2004/05/25 01:17:30
Modified: c/include/axis/server AxisException.h
c/samples/server/rpcfault MathOpsWrapper.cpp
c/src/common ArrayBean.cpp
c/src/engine/server ServerAxisEngine.cpp
c/src/soap SoapDeSerializer.cpp
c/src/transport/axis Receiver.hpp
c/src/wsdd WSDDDocument.cpp
Log:
Revision Changes Path
1.13 +1 -0 ws-axis/c/include/axis/server/AxisException.h
Index: AxisException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisException.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AxisException.h 24 May 2004 05:44:19 -0000 1.12
+++ AxisException.h 25 May 2004 08:17:30 -0000 1.13
@@ -148,6 +148,7 @@
AXISC_SERVICE_THROWN_EXCEPTION,
AXISC_UNKNOWN_ELEMENT_EXCEPTION,
AXISC_NODEVALUE_MISMATCH_EXCEPTION,
+ AXISC_READCONF_EXCEPTION,
/*
* This FAULT_LAST is not used as a fault code, but instead is used
1.6 +2 -1 ws-axis/c/samples/server/rpcfault/MathOpsWrapper.cpp
Index: MathOpsWrapper.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/rpcfault/MathOpsWrapper.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MathOpsWrapper.cpp 24 May 2004 05:44:19 -0000 1.5
+++ MathOpsWrapper.cpp 25 May 2004 08:17:30 -0000 1.6
@@ -87,7 +87,8 @@
}
catch(AxisDivByZeroException& e)
{
- pIWSSZ->createSoapFault("SOAPStructFault", "http://soapinterop.org/"); SOAPStructFault* objFault = (SOAPStructFault*)pIWSDZ->
+ pIWSSZ->createSoapFault("SOAPStructFault", "http://soapinterop.org/");
+ SOAPStructFault* objFault = (SOAPStructFault*)pIWSDZ->
getCmplxObject((void*)Axis_DeSerialize_SOAPStructFault,
(void*)Axis_Create_SOAPStructFault, (void*)Axis_Delete_SOAPStructFault,
"faultstruct", Axis_URI_SOAPStructFault);
1.24 +1 -0 ws-axis/c/src/common/ArrayBean.cpp
Index: ArrayBean.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/ArrayBean.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ArrayBean.cpp 26 Apr 2004 04:04:36 -0000 1.23
+++ ArrayBean.cpp 25 May 2004 08:17:30 -0000 1.24
@@ -348,6 +348,7 @@
p++;
}
}
+ default:
break;
}
/* restore Serializer's style after array serialization is finished */
1.16 +2 -2 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ServerAxisEngine.cpp 25 May 2004 03:47:33 -0000 1.15
+++ ServerAxisEngine.cpp 25 May 2004 08:17:30 -0000 1.16
@@ -156,7 +156,7 @@
{
m_pSZ->setSoapVersion (SOAP_VER_1_2);
AXISTRACE1("SOAP_VERSIONMISMATCH", CRITICAL);
- THROW_AXIS_EXCEPTION(SOAP_VERSIONMISMATCH);
+ THROW_AXIS_SOAP_EXCEPTION(SOAP_VERSIONMISMATCH);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SOAP_VERSIONMISMATCH));
break; // do .. while(0)
}
@@ -408,7 +408,7 @@
if (m_pDZ->isAnyMustUnderstandHeadersLeft ())
{
AXISTRACE1("SOAP_MUSTUNDERSTAND", CRITICAL);
- THROW_AXIS_EXCEPTION(SOAP_MUSTUNDERSTAND);
+ THROW_AXIS_SOAP_EXCEPTION(SOAP_MUSTUNDERSTAND);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SOAP_MUSTUNDERSTAND));
break; // do .. while (0)
}
1.51 +4 -5 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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- SoapDeSerializer.cpp 25 May 2004 03:47:33 -0000 1.50
+++ SoapDeSerializer.cpp 25 May 2004 08:17:30 -0000 1.51
@@ -83,12 +83,12 @@
if (0 == strcmp(m_pNode->m_pchNameOrValue,
SoapKeywordMapping::map(SOAP_VER_1_2).pchWords[SKW_ENVELOPE]))
{
- SoapEnvelope* m_pEnv = new SoapEnvelope();
+ SoapEnvelope* m_pEnvl = new SoapEnvelope();
/* set all attributes of SoapEnvelope */
pAttr = new Attribute();
pAttr->setValue(m_pNode->m_pchNamespace);
- m_pEnv->addNamespaceDecl(pAttr);
+ m_pEnvl->addNamespaceDecl(pAttr);
if (0 == strcmp(m_pNode->m_pchNamespace,
SoapKeywordMapping::map(SOAP_VER_1_1).pchNamespaceUri))
@@ -112,11 +112,11 @@
pAttr->setLocalName(m_pNode->m_pchAttributes[i]);
pAttr->setUri(m_pNode->m_pchAttributes[i+1]);
pAttr->setValue(m_pNode->m_pchAttributes[i+2]);
- m_pEnv->addAttribute(pAttr);
+ m_pEnvl->addAttribute(pAttr);
}
m_pNode = NULL; /* This is to indicate that node is identified
* and used */
- return m_pEnv;
+ return m_pEnvl;
}
return NULL;
}
@@ -287,7 +287,6 @@
int SoapDeSerializer::checkMessageBody(const AxisChar* pName,
const AxisChar* pNamespace)
{
- int iResult;
/* check and skip the soap body tag */
if (AXIS_SUCCESS != getBody()) return AXIS_FAIL;
if (!m_pNode) m_pNode = m_pParser->next();
1.4 +1 -1 ws-axis/c/src/transport/axis/Receiver.hpp
Index: Receiver.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Receiver.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Receiver.hpp 9 Apr 2004 06:20:55 -0000 1.3
+++ Receiver.hpp 25 May 2004 08:17:30 -0000 1.4
@@ -41,12 +41,12 @@
private:
const char* m_pMsg;
- Transport *m_pTrChannel;
unsigned int m_RecvPort;
int m_MsgSize;
int m_BytesRead;
+ Transport *m_pTrChannel;
};
#endif
1.33 +5 -1 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- WSDDDocument.cpp 25 May 2004 03:47:34 -0000 1.32
+++ WSDDDocument.cpp 25 May 2004 08:17:30 -0000 1.33
@@ -153,6 +153,8 @@
case END_ELEMENT:
endElement(pNode);
break;
+ default:
+ break;
}
}
XMLParserFactory::destroyParserObject(pParser);
@@ -197,6 +199,8 @@
case END_ELEMENT:
endElement(pNode);
break;
+ default:
+ break;
}
}
XMLParserFactory::destroyParserObject(pParser);
@@ -498,7 +502,7 @@
void WSDDDocument::addAllowedRolesToService(const AxisXMLCh* pcValue)
{
AxisString sValue = pcValue;
- int prepos = 0, pos = 0;
+ unsigned int prepos = 0, pos = 0;
if (sValue.find('*') == AxisString::npos)
{
do