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 da...@apache.org on 2003/10/15 08:11:30 UTC
cvs commit: ws-axis/c/src/wsdd WSDDDeployment.h WSDDDocument.cpp WSDDDocument.h WSDDHandler.h WSDDKeywords.cpp WSDDTransport.cpp
damitha 2003/10/14 23:11:30
Modified: c/src/client/samples/Calculator CalcClient.cpp Point.h
c/src/client/transport/axis AxisTransport.cpp
HttpTransport.cpp Url.cpp
c/src/common AxisConfig.h AxisException.h AxisTime.cpp
AxisTime.h AxisTrace.cpp BasicTypeSerializer.cpp
BasicTypeSerializer.h GDefine.h Handler.h
IMessageData.h Makefile.am MessageData.cpp
Packet.cpp Packet.h Param.cpp Param.h TypeMapping.h
c/src/engine Axis.cpp AxisEngine.h ClientAxisEngine.cpp
HandlerLoader.cpp HandlerPool.h
ServerAxisEngine.cpp SessionScopeHandlerPool.cpp
SharedObject.h
c/src/server/handlers/custom/echoStringHeaderHandler
ESHHandler.cpp EchoStringHeaderHandler.cpp
c/src/server/handlers/custom/loghandler LogAccessCount.cpp
LogHandler.cpp
c/src/server/handlers/custom/simpleauthhandler
SimpleAuth.cpp SimpleAuthorizationHandler.cpp
c/src/server/handlers/global/testhandler1 TestGlobal.h
TestHandler1.cpp
c/src/server/handlers/transport/testhandler2
TestHandler2.cpp TestTransport.cpp
c/src/server/samples/cppservicewrapper CPPServiceWrapper.cpp
c/src/server/samples/simplewebservice/webservice
WebService.cpp WebService.h
c/src/server/samples/simplewebservice/webservicewrapper
WebServiceWrapper.cpp WebServiceWrapper.h
c/src/server/simple_axis_server ServerHelper.h
c/src/soap HeaderBlock.cpp SoapEnvVersions.h SoapFault.h
SoapFaults.h URIMapping.h XMLStreamHandler.cpp
XMLStreamHandler.h
c/src/wcg BeanClass.cpp Deploy.cpp File.cpp Method.cpp
TranslationUnit.cpp TranslationUnit.h Variable.cpp
Variable.h WCGenerator.cpp WSClass.cpp actions.cpp
actions.h cpplex.cpp
c/src/wsdd WSDDDeployment.h WSDDDocument.cpp WSDDDocument.h
WSDDHandler.h WSDDKeywords.cpp WSDDTransport.cpp
Log:
I cleaned and removed causes to warnings produced in build-time with consulation with the
other developers.
Revision Changes Path
1.9 +1 -1 ws-axis/c/src/client/samples/Calculator/CalcClient.cpp
Index: CalcClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/Calculator/CalcClient.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CalcClient.cpp 13 Oct 2003 05:03:13 -0000 1.8
+++ CalcClient.cpp 15 Oct 2003 06:11:27 -0000 1.9
@@ -56,4 +56,4 @@
}
printf("Done\n");
return 0;
-}
\ No newline at end of file
+}
1.4 +1 -1 ws-axis/c/src/client/samples/Calculator/Point.h
Index: Point.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/Calculator/Point.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Point.h 10 Oct 2003 05:13:13 -0000 1.3
+++ Point.h 15 Oct 2003 06:11:27 -0000 1.4
@@ -23,4 +23,4 @@
PointArray points;
}Polygon;
-#endif //__POINT_PARAM_H__INCLUDED_
\ No newline at end of file
+#endif //__POINT_PARAM_H__INCLUDED_
1.6 +3 -2 ws-axis/c/src/client/transport/axis/AxisTransport.cpp
Index: AxisTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/AxisTransport.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AxisTransport.cpp 29 Sep 2003 03:33:52 -0000 1.5
+++ AxisTransport.cpp 15 Oct 2003 06:11:27 -0000 1.6
@@ -58,8 +58,9 @@
* @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
*
*/
-
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#include "AxisTransport.h"
#include "TransportFactory.hpp"
@@ -165,4 +166,4 @@
int AxisTransport::Receive_transport_information(void* pSoapStream)
{
return SUCCESS;
-}
\ No newline at end of file
+}
1.6 +1 -1 ws-axis/c/src/client/transport/axis/HttpTransport.cpp
Index: HttpTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/HttpTransport.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HttpTransport.cpp 30 Sep 2003 09:04:54 -0000 1.5
+++ HttpTransport.cpp 15 Oct 2003 06:11:27 -0000 1.6
@@ -369,4 +369,4 @@
void HttpTransport::ClearAdditionalHeaders()
{
m_AdditionalHeader.clear();
-}
\ No newline at end of file
+}
1.2 +1 -1 ws-axis/c/src/client/transport/axis/Url.cpp
Index: Url.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/Url.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Url.cpp 26 Sep 2003 14:24:28 -0000 1.1
+++ Url.cpp 15 Oct 2003 06:11:27 -0000 1.2
@@ -138,7 +138,7 @@
begpos = pos = 0;
std::string key(":/?");
- while(pos = url.find_first_of(key, begpos))
+ while((pos = url.find_first_of(key, begpos)))
{
if(pos == std::string::npos) // only host name found
{
1.8 +1 -1 ws-axis/c/src/common/AxisConfig.h
Index: AxisConfig.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfig.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AxisConfig.h 11 Oct 2003 14:47:15 -0000 1.7
+++ AxisConfig.h 15 Oct 2003 06:11:27 -0000 1.8
@@ -26,4 +26,4 @@
char m_sWsddFilePath[CONFBUFFSIZE];
char m_sAxisLogPath[CONFBUFFSIZE];
};
-#endif
\ No newline at end of file
+#endif
1.10 +1 -1 ws-axis/c/src/common/AxisException.h
Index: AxisException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisException.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AxisException.h 26 Sep 2003 15:02:32 -0000 1.9
+++ AxisException.h 15 Oct 2003 06:11:27 -0000 1.10
@@ -101,4 +101,4 @@
string m_sMessage;
};
-#endif
\ No newline at end of file
+#endif
1.6 +55 -56 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AxisTime.cpp 9 Sep 2003 12:53:00 -0000 1.5
+++ AxisTime.cpp 15 Oct 2003 06:11:27 -0000 1.6
@@ -73,13 +73,10 @@
m_TMUTC = ntime;
}
-AxisTime::AxisTime(time_t m_Time)
-{
- if(m_Time != NULL)
- {
- tm* pTMUTC = gmtime(&m_Time);
+AxisTime::AxisTime(time_t pTime)
+{
+ tm* pTMUTC = gmtime(&pTime);
memcpy(&m_TMUTC, pTMUTC, sizeof(tm));
- }
}
AxisTime::~AxisTime()
@@ -96,7 +93,7 @@
void AxisTime::setValue(XSDTYPE type, uParamValue Value)
{
m_Type = type;
- if(type = XSD_DURATION)
+ if(type == XSD_DURATION)
{
m_Duration = Value.lDuration;
}
@@ -182,6 +179,7 @@
strftime(buf1, 80, "%H:%M:%SZ", &tValue);
strXSDDate = buf1;
//AxisUtils::convert(strXSDDate, buf1);
+ default:;
}
@@ -195,7 +193,7 @@
void AxisTime::mkCTime()
{
// AxisChar* endptr;
- int intPos, intPos1, intPos2, intPos3, intPos4, intPos5, intPos6;
+ unsigned int intPos, intPos1, intPos2, intPos3, intPos4, intPos5, intPos6;
AxisChar buff[4];
time_t now;
struct tm result1, result2;
@@ -213,34 +211,34 @@
/*XSD_DURATION is of the format PnYnMnDTnHnMnS*/
intPos1 = m_sValue.find_first_of("Y");
strYears = m_sValue.substr(1,intPos1 - 1);
- intYears = atoi(strYears.c_str());
- //intYears = wcstol(strYears.c_str(), &endptr, 10);
- duration.years = intYears;
+ m_intYears = atoi(strYears.c_str());
+ //m_intYears = wcstol(strYears.c_str(), &endptr, 10);
+ duration.years = m_intYears;
intPos2 = m_sValue.find_first_of("M");
strMonths = m_sValue.substr(intPos1 + 1, intPos2 - intPos1 - 1);
- intMonths = atoi(strMonths.c_str());
- //intMonths = wcstol(strMonths.c_str(), &endptr, 10);
- duration.months = intMonths;
+ m_intMonths = atoi(strMonths.c_str());
+ //m_intMonths = wcstol(strMonths.c_str(), &endptr, 10);
+ duration.months = m_intMonths;
intPos3 = m_sValue.find_first_of("D");
strDays = m_sValue.substr(intPos2 + 1, intPos3 - intPos2 -1);
- intDays = atoi(strDays.c_str());
- //intDays = wcstol(strDays.c_str(), &endptr, 10);
- duration.days = intDays;
+ m_intDays = atoi(strDays.c_str());
+ //m_intDays = wcstol(strDays.c_str(), &endptr, 10);
+ duration.days = m_intDays;
intPos4 = m_sValue.find_first_of("H");
strHours = m_sValue.substr(intPos3 + 1, intPos4 - intPos3 -1);
- intHours = atoi(strHours.c_str());
- //intHours = wcstol(strHours.c_str(), &endptr, 10);
- duration.hours = intHours;
+ m_intHours = atoi(strHours.c_str());
+ //m_intHours = wcstol(strHours.c_str(), &endptr, 10);
+ duration.hours = m_intHours;
intPos5 = m_sValue.find_first_of("M");
strMins = m_sValue.substr(intPos4 + 1, intPos5 - intPos4 -1);
- intMins = atoi(strMins.c_str());
- //intMins = wcstol(strMins.c_str(), &endptr, 10);
- duration.mins = intMins;
+ m_intMins = atoi(strMins.c_str());
+ //m_intMins = wcstol(strMins.c_str(), &endptr, 10);
+ duration.mins = m_intMins;
intPos6 = m_sValue.find_first_of("S");
strSecs = m_sValue.substr(intPos5 + 1, intPos6 - intPos5 -1);
- intSecs = atoi(strSecs.c_str());
- //intSecs = wcstol(strSecs.c_str(), &endptr, 10);
- duration.secs = intSecs;
+ m_intSecs = atoi(strSecs.c_str());
+ //m_intSecs = wcstol(strSecs.c_str(), &endptr, 10);
+ duration.secs = m_intSecs;
break;
@@ -252,10 +250,10 @@
CCYY(-)MM(-)DDThh:mm:ss.ss...+/-<UTC TIME DIFFERENCE>
*/
strYears = m_sValue.substr(0,2);
- intYears = atoi(strYears.c_str()) - 1900;
- //intYears = wcstol(strYears.c_str(), &endptr, 10) - 1900;
- //sprintf((char*)buff,"%d", intYears);
- AxisSprintf(buff, 4, "%d", intYears);
+ m_intYears = atoi(strYears.c_str()) - 1900;
+ //m_intYears = wcstol(strYears.c_str(), &endptr, 10) - 1900;
+ //sprintf((char*)buff,"%d", m_intYears);
+ AxisSprintf(buff, 4, "%d", m_intYears);
strYears = buff;
intPos = m_sValue.find_first_of("-");
/* date is of the format CCYY-MM-DD */
@@ -307,14 +305,14 @@
time_t timeInSecs = mktime(&m_TM);
pTm = localtime(&timeInSecs);
memcpy(&m_TMUTC, pTm, sizeof(tm));
- intHours = atoi(strZone.substr(1,2).c_str());
- //intHours = wcstol(strZone.substr(1,2).c_str(), &endptr, 10);
- intMins = atoi(strZone.substr(3,2).c_str());
- //intMins = wcstol(strZone.substr(3,2).c_str(), &endptr, 10);
- intSecs = intHours * 60 * 60 + intMins * 60;
+ m_intHours = atoi(strZone.substr(1,2).c_str());
+ //m_intHours = wcstol(strZone.substr(1,2).c_str(), &endptr, 10);
+ m_intMins = atoi(strZone.substr(3,2).c_str());
+ //m_intMins = wcstol(strZone.substr(3,2).c_str(), &endptr, 10);
+ m_intSecs = m_intHours * 60 * 60 + m_intMins * 60;
if(strZone.substr(0,1) == "+")
{
- timeInSecs += intSecs;
+ timeInSecs += m_intSecs;
pTm = localtime(&timeInSecs);
memcpy(&m_TM, pTm, sizeof(tm));
time_t t = mktime(&m_TM);
@@ -325,7 +323,7 @@
else if(strZone.substr(0,1) == "-")
{
- timeInSecs -= intSecs;
+ timeInSecs -= m_intSecs;
pTm = localtime(&timeInSecs);
memcpy(&m_TM, pTm, sizeof(tm));
@@ -353,10 +351,10 @@
CCYY(-)MM(-)DD+/-<UTC TIME DIFFERENCE>
*/
strYears = m_sValue.substr(0,2);
- intYears = atoi(strYears.c_str()) - 1900;
- //intYears = wcstol(strYears.c_str(), &endptr, 10) - 1900;
- //sprintf((char*)buff,"%d", intYears);
- AxisSprintf(buff, 4, "%d", intYears);
+ m_intYears = atoi(strYears.c_str()) - 1900;
+ //m_intYears = wcstol(strYears.c_str(), &endptr, 10) - 1900;
+ //sprintf((char*)buff,"%d", m_intYears);
+ AxisSprintf(buff, 4, "%d", m_intYears);
strYears = buff;
intPos = m_sValue.find_first_of("-");
/* date is of the format CCYY-MM-DD */
@@ -394,14 +392,14 @@
time_t timeInSecs = mktime(&m_TM);
pTm = localtime(&timeInSecs);
memcpy(&m_TMUTC, pTm, sizeof(tm));
- intHours = atoi(strZone.substr(1,2).c_str());
- //intHours = wcstol(strZone.substr(1,2).c_str(), &endptr, 10);
- intMins = atoi(strZone.substr(3,2).c_str());
- //intMins = wcstol(strZone.substr(3,2).c_str(), &endptr, 10);
- intSecs = intHours * 60 * 60 + intMins * 60;
+ m_intHours = atoi(strZone.substr(1,2).c_str());
+ //m_intHours = wcstol(strZone.substr(1,2).c_str(), &endptr, 10);
+ m_intMins = atoi(strZone.substr(3,2).c_str());
+ //m_intMins = wcstol(strZone.substr(3,2).c_str(), &endptr, 10);
+ m_intSecs = m_intHours * 60 * 60 + m_intMins * 60;
if(strZone.substr(0,1) == "+")
{
- timeInSecs += intSecs;
+ timeInSecs += m_intSecs;
pTm = localtime(&timeInSecs);
memcpy(&m_TM, pTm, sizeof(tm));
time_t t = mktime(&m_TM);
@@ -411,7 +409,7 @@
}
else if(strZone.substr(0,1) == "-")
{
- timeInSecs -= intSecs;
+ timeInSecs -= m_intSecs;
pTm = localtime(&timeInSecs);
memcpy(&m_TM, pTm, sizeof(tm));
time_t t = mktime(&m_TM);
@@ -463,14 +461,14 @@
time_t timeInSecs = mktime(&m_TM);
pTm = localtime(&timeInSecs);
memcpy(&m_TMUTC, pTm, sizeof(tm));
- intHours = atoi(strZone.substr(1,2).c_str());
- //intHours = wcstol(strZone.substr(1,2).c_str(), &endptr, 10);
- intMins = atoi(strZone.substr(3,2).c_str());
- //intMins = wcstol(strZone.substr(3,2).c_str(), &endptr, 10);
- intSecs = intHours * 60 * 60 + intMins * 60;
+ m_intHours = atoi(strZone.substr(1,2).c_str());
+ //m_intHours = wcstol(strZone.substr(1,2).c_str(), &endptr, 10);
+ m_intMins = atoi(strZone.substr(3,2).c_str());
+ //m_intMins = wcstol(strZone.substr(3,2).c_str(), &endptr, 10);
+ m_intSecs = m_intHours * 60 * 60 + m_intMins * 60;
if(strZone.substr(0,1) == "+")
{
- timeInSecs += intSecs;
+ timeInSecs += m_intSecs;
pTm = localtime(&timeInSecs);
memcpy(&m_TM, pTm, sizeof(tm));
time_t t = mktime(&m_TM);
@@ -480,7 +478,7 @@
}
else if(strZone.substr(0,1) == "-")
{
- timeInSecs -= intSecs;
+ timeInSecs -= m_intSecs;
pTm = localtime(&timeInSecs);
memcpy(&m_TM, pTm, sizeof(tm));
time_t t = mktime(&m_TM);
@@ -499,6 +497,7 @@
}
break;
+ default:;
}
}
@@ -521,4 +520,4 @@
struct tm AxisTime::getTime()
{
return m_TMUTC;
-}
\ No newline at end of file
+}
1.3 +7 -7 ws-axis/c/src/common/AxisTime.h
Index: AxisTime.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTime.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AxisTime.h 4 Sep 2003 06:51:39 -0000 1.2
+++ AxisTime.h 15 Oct 2003 06:11:27 -0000 1.3
@@ -110,12 +110,12 @@
AxisString strHours;
AxisString strMins;
AxisString strSecs;
- int intYears;
- int intMonths;
- int intDays;
- int intHours;
- int intMins;
- int intSecs;
+ int m_intYears;
+ int m_intMonths;
+ int m_intDays;
+ int m_intHours;
+ int m_intMins;
+ int m_intSecs;
AxisString strZone;
uDuration duration;
long m_Duration;
@@ -124,4 +124,4 @@
AxisString strXSDDate;
};
-#endif
\ No newline at end of file
+#endif
1.7 +1 -1 ws-axis/c/src/common/AxisTrace.cpp
Index: AxisTrace.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AxisTrace.cpp 10 Oct 2003 12:47:03 -0000 1.6
+++ AxisTrace.cpp 15 Oct 2003 06:11:27 -0000 1.7
@@ -160,4 +160,4 @@
tracer.trace("damitha");
return 0;
}
-*/
\ No newline at end of file
+*/
1.13 +10 -10 ws-axis/c/src/common/BasicTypeSerializer.cpp
Index: BasicTypeSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/BasicTypeSerializer.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- BasicTypeSerializer.cpp 9 Sep 2003 12:53:00 -0000 1.12
+++ BasicTypeSerializer.cpp 15 Oct 2003 06:11:27 -0000 1.13
@@ -86,7 +86,7 @@
const AxisChar* BasicTypeSerializer::serialize(const AxisChar* sName, int nValue)
{
m_Type = XSD_INT;
- AxisSprintf(m_Buf, 32, "%d", nValue);
+ AxisSprintf(m_Buf, BTS_BUFFSIZE, "%d", nValue);
HelpSerialize(sName, sName);
return m_sSZ.c_str();
}
@@ -94,7 +94,7 @@
const AxisChar* BasicTypeSerializer::serialize(const AxisChar* sName, unsigned int unValue)
{
m_Type = XSD_UNSIGNEDINT;
- AxisSprintf(m_Buf, 32, "%d", unValue);
+ AxisSprintf(m_Buf, BTS_BUFFSIZE, "%d", unValue);
HelpSerialize(sName, sName);
return m_sSZ.c_str();
}
@@ -102,7 +102,7 @@
const AxisChar* BasicTypeSerializer::serialize(const AxisChar* sName, char cValue)
{
m_Type = XSD_BYTE;
- AxisSprintf(m_Buf, 32, "%c", cValue);
+ AxisSprintf(m_Buf, BTS_BUFFSIZE, "%c", cValue);
HelpSerialize(sName, sName);
return m_sSZ.c_str();
}
@@ -110,7 +110,7 @@
const AxisChar* BasicTypeSerializer::serialize(const AxisChar* sName, unsigned char ucValue)
{
m_Type = XSD_UNSIGNEDBYTE;
- AxisSprintf(m_Buf, 32, "%c", ucValue);
+ AxisSprintf(m_Buf, BTS_BUFFSIZE, "%c", ucValue);
HelpSerialize(sName, sName);
return m_sSZ.c_str();
}
@@ -118,7 +118,7 @@
const AxisChar* BasicTypeSerializer::serialize(const AxisChar* sName, short sValue)
{
m_Type = XSD_SHORT;
- AxisSprintf(m_Buf, 32, "%d", sValue);
+ AxisSprintf(m_Buf, BTS_BUFFSIZE, "%d", sValue);
HelpSerialize(sName, sName);
return m_sSZ.c_str();
}
@@ -126,7 +126,7 @@
const AxisChar* BasicTypeSerializer::serialize(const AxisChar* sName, unsigned short usValue)
{
m_Type = XSD_UNSIGNEDSHORT;
- AxisSprintf(m_Buf, 32, "%d", usValue);
+ AxisSprintf(m_Buf, BTS_BUFFSIZE, "%d", usValue);
HelpSerialize(sName, sName);
return m_sSZ.c_str();
}
@@ -134,7 +134,7 @@
const AxisChar* BasicTypeSerializer::serialize(const AxisChar* sName, long lValue, XSDTYPE type)
{
m_Type = type;
- AxisSprintf(m_Buf, 32, "%d", lValue);
+ AxisSprintf(m_Buf, BTS_BUFFSIZE, "%d", lValue);
HelpSerialize(sName, sName);
return m_sSZ.c_str();
}
@@ -142,7 +142,7 @@
const AxisChar* BasicTypeSerializer::serialize(const AxisChar* sName, unsigned long ulValue)
{
m_Type = XSD_UNSIGNEDLONG;
- AxisSprintf(m_Buf, 32, "%d", ulValue);
+ AxisSprintf(m_Buf, BTS_BUFFSIZE, "%d", ulValue);
HelpSerialize(sName, sName);
return m_sSZ.c_str();
}
@@ -150,7 +150,7 @@
const AxisChar* BasicTypeSerializer::serialize(const AxisChar* sName, float fValue)
{
m_Type = XSD_FLOAT;
- AxisSprintf(m_Buf, 32, "%f", fValue);
+ AxisSprintf(m_Buf, BTS_BUFFSIZE, "%f", fValue);
HelpSerialize(sName, sName);
return m_sSZ.c_str();
}
@@ -158,7 +158,7 @@
const AxisChar* BasicTypeSerializer::serialize(const AxisChar* sName, double dValue, XSDTYPE type)
{
m_Type = type;
- AxisSprintf(m_Buf, 32, "%f", dValue);
+ AxisSprintf(m_Buf, BTS_BUFFSIZE, "%f", dValue);
HelpSerialize(sName, sName);
return m_sSZ.c_str();
}
1.14 +2 -1 ws-axis/c/src/common/BasicTypeSerializer.h
Index: BasicTypeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/BasicTypeSerializer.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BasicTypeSerializer.h 5 Sep 2003 10:48:50 -0000 1.13
+++ BasicTypeSerializer.h 15 Oct 2003 06:11:28 -0000 1.14
@@ -72,6 +72,7 @@
#include <string>
using namespace std;
+#define BTS_BUFFSIZE 32
const AxisChar XML_ENTITY_REFERENCE_CAHRS[] = "<>&\"\'";// Entity reference characters
const AxisChar ENCODED_LESSER_STR[] = "<"; // Encoded string for less than character
const AxisChar ENCODED_GREATOR_STR[] = ">"; // Encoded string for greator than character
@@ -113,7 +114,7 @@
AxisString m_sSZ;
AxisString m_AuxStr;
AxisString m_strReturnVal;
- AxisChar m_Buf[32]; //used for numeric to string conversions with sprintf
+ AxisChar m_Buf[BTS_BUFFSIZE]; //used for numeric to string conversions with sprintf
XSDTYPE m_Type; //used to temporarily set the type of item being serialized.
};
1.12 +4 -3 ws-axis/c/src/common/GDefine.h
Index: GDefine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/GDefine.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GDefine.h 6 Oct 2003 12:36:15 -0000 1.11
+++ GDefine.h 15 Oct 2003 06:11:28 -0000 1.12
@@ -60,9 +60,10 @@
* @author Susantha Kumara (skumara@virtusa.com)
*
*/
-
+#ifdef WIN32
#pragma warning (disable : 4786)
#pragma warning (disable : 4530)
+#endif
#if !defined(__GDEFINE_INCLUDED__)
#define __GDEFINE_INCLUDED__
@@ -81,7 +82,7 @@
#ifdef WIN32
#define AxisSprintf(X, Y, Z, W) sprintf(X, Z, W)
-#else //linux
+#else /*linux*/
#define AxisSprintf(X, Y, Z, W) sprintf(X, Z, W)
#endif
@@ -89,4 +90,4 @@
extern void ModuleInitialize();
extern void ModuleUnInitialize();
-#endif //__GDEFINE_INCLUDED__
+#endif /*__GDEFINE_INCLUDED__*/
1.5 +2 -0 ws-axis/c/src/common/Handler.h
Index: Handler.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Handler.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Handler.h 4 Aug 2003 06:36:33 -0000 1.4
+++ Handler.h 15 Oct 2003 06:11:28 -0000 1.5
@@ -1,4 +1,6 @@
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(__HANDLER_INCLUDED__)
#define __HANDLER_INCLUDED__
1.8 +1 -0 ws-axis/c/src/common/IMessageData.h
Index: IMessageData.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/IMessageData.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IMessageData.h 5 Aug 2003 08:18:54 -0000 1.7
+++ IMessageData.h 15 Oct 2003 06:11:28 -0000 1.8
@@ -79,6 +79,7 @@
class IMessageData
{
public:
+ virtual ~IMessageData(){};
virtual int setProperty(string& sName, string& sValue)=0;
virtual string& getProperty(string& sName)=0;
1.10 +2 -1 ws-axis/c/src/common/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am 8 Oct 2003 10:11:38 -0000 1.9
+++ Makefile.am 15 Oct 2003 06:11:28 -0000 1.10
@@ -2,7 +2,8 @@
AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
libcommon_la_SOURCES = Param.cpp TypeMapping.cpp Packet.cpp MessageData.cpp \
BasicTypeSerializer.cpp ArrayBean.cpp AxisTime.cpp \
- GDefine.cpp AxisUtils.cpp AxisTrace.cpp AxisException.cpp AxisConfig.cpp
+ GDefine.cpp AxisUtils.cpp AxisTrace.cpp AxisException.cpp AxisConfig.cpp \
+ AxisSocketUtils.cpp
libcommon_la_LIBADD = -L$(AXISCPP_HOME)/lib -lxerces-c -lstdc++
INCLUDES = -I$(AXISCPP_HOME)/include
1.11 +2 -2 ws-axis/c/src/common/MessageData.cpp
Index: MessageData.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/MessageData.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MessageData.cpp 11 Sep 2003 10:42:47 -0000 1.10
+++ MessageData.cpp 15 Oct 2003 06:11:28 -0000 1.11
@@ -94,9 +94,9 @@
m_pDZ = pDZ;
}
-void MessageData::SetUserName(string& m_sUserName)
+void MessageData::SetUserName(string& sUserName)
{
- m_sUserName = m_sUserName;
+ m_sUserName = sUserName;
}
string& MessageData::GetUserName()
{
1.8 +1 -1 ws-axis/c/src/common/Packet.cpp
Index: Packet.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Packet.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Packet.cpp 22 Sep 2003 05:12:22 -0000 1.7
+++ Packet.cpp 15 Oct 2003 06:11:28 -0000 1.8
@@ -139,4 +139,4 @@
return service;
}
return NULL;
-}
\ No newline at end of file
+}
1.17 +2 -1 ws-axis/c/src/common/Packet.h
Index: Packet.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Packet.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Packet.h 26 Sep 2003 14:05:09 -0000 1.16
+++ Packet.h 15 Oct 2003 06:11:28 -0000 1.17
@@ -59,8 +59,9 @@
* @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
*
*/
-
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(__PACKET_H_INCLUDED__)
#define __PACKET_H_INCLUDED__
1.21 +3 -0 ws-axis/c/src/common/Param.cpp
Index: Param.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Param.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Param.cpp 13 Oct 2003 05:03:14 -0000 1.20
+++ Param.cpp 15 Oct 2003 06:11:28 -0000 1.21
@@ -131,6 +131,7 @@
case XSD_STRING: m_sName = "String"; break;
case XSD_BASE64BINARY: m_sName = "Base64BinaryString"; break;
case XSD_HEXBINARY: m_sName = "HexBinaryString"; break;
+ default:;
}
}
@@ -195,6 +196,7 @@
case XSD_INTEGER: m_sName = "Integer";
m_Value.lValue = lValue;
break;
+ default:;
}
}
@@ -221,6 +223,7 @@
case XSD_DECIMAL: m_sName = "Decimal";
m_Value.dValue = dValue;
break;
+ default:;
}
/*m_sName = "Double";
m_Value.dValue = dValue;
1.17 +2 -0 ws-axis/c/src/common/Param.h
Index: Param.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Param.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Param.h 13 Oct 2003 05:03:14 -0000 1.16
+++ Param.h 15 Oct 2003 06:11:28 -0000 1.17
@@ -64,7 +64,9 @@
// Param.h: interface for the Param class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(AFX_PARAM_H__351B13BB_5D03_40C5_93F5_56D17295A8BD__INCLUDED_)
#define AFX_PARAM_H__351B13BB_5D03_40C5_93F5_56D17295A8BD__INCLUDED_
1.7 +2 -0 ws-axis/c/src/common/TypeMapping.h
Index: TypeMapping.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/TypeMapping.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TypeMapping.h 9 Sep 2003 12:53:00 -0000 1.6
+++ TypeMapping.h 15 Oct 2003 06:11:28 -0000 1.7
@@ -63,7 +63,9 @@
// TypeMapping.h: interface for the TypeMapping class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(AFX_TYPEMAPPING_H__B09703CE_154D_400E_A4E6_ED01901B33A0__INCLUDED_)
#define AFX_TYPEMAPPING_H__B09703CE_154D_400E_A4E6_ED01901B33A0__INCLUDED_
1.25 +3 -2 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Axis.cpp 10 Oct 2003 12:47:03 -0000 1.24
+++ Axis.cpp 15 Oct 2003 06:11:28 -0000 1.25
@@ -58,8 +58,9 @@
* @author Susantha Kumara (skumara@virtusa.com)
*
*/
-
+#ifdef WIN32
#pragma warning (disable : 4503)
+#endif
#ifdef WIN32
#include <Windows.h> //for Sleep(0);
@@ -300,4 +301,4 @@
//un synchronized read-only global variables.
delete g_pWSDDDeployment;
delete g_pConfig;
-}
\ No newline at end of file
+}
1.9 +2 -1 ws-axis/c/src/engine/AxisEngine.h
Index: AxisEngine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngine.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AxisEngine.h 6 Oct 2003 12:36:15 -0000 1.8
+++ AxisEngine.h 15 Oct 2003 06:11:28 -0000 1.9
@@ -60,8 +60,9 @@
* @author Susantha Kumara (skumara@virtusa.com)
*
*/
-
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(__AXISENGINE_INCLUDED__)
#define __AXISENGINE_INCLUDED__
1.6 +2 -2 ws-axis/c/src/engine/ClientAxisEngine.cpp
Index: ClientAxisEngine.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/ClientAxisEngine.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClientAxisEngine.cpp 10 Oct 2003 05:13:13 -0000 1.5
+++ ClientAxisEngine.cpp 15 Oct 2003 06:11:28 -0000 1.6
@@ -31,7 +31,7 @@
int ClientAxisEngine::Process(Ax_soapstream* pSoap)
{
int Status;
- const WSDDService* pService = NULL;
+ //const WSDDService* pService = NULL;
if (!pSoap) return FAIL;
m_pSoap = pSoap;
@@ -78,7 +78,7 @@
{
enum AE_LEVEL {AE_START=1, AE_TRH, AE_GLH, AE_SERH, AE_SERV};
int Status = FAIL;
- int level = AE_START;
+ //int level = AE_START;
/*
No Client side handlers for now. Therefore returns SUCCESS
*/
1.13 +1 -1 ws-axis/c/src/engine/HandlerLoader.cpp
Index: HandlerLoader.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/HandlerLoader.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HandlerLoader.cpp 10 Oct 2003 12:47:03 -0000 1.12
+++ HandlerLoader.cpp 15 Oct 2003 06:11:28 -0000 1.13
@@ -136,7 +136,7 @@
HandlerInformation* pHandlerInfo = NULL;
if (m_HandlerInfoList.find(nLibId) == m_HandlerInfoList.end())
{
- HandlerInformation* pHandlerInfo = new HandlerInformation();
+ pHandlerInfo = new HandlerInformation();
pHandlerInfo->m_sLib = g_pWSDDDeployment->GetLibName(nLibId);
if (pHandlerInfo->m_sLib.empty())
{
1.4 +2 -0 ws-axis/c/src/engine/HandlerPool.h
Index: HandlerPool.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/HandlerPool.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HandlerPool.h 1 Sep 2003 07:28:28 -0000 1.3
+++ HandlerPool.h 15 Oct 2003 06:11:28 -0000 1.4
@@ -64,7 +64,9 @@
// HandlerPool.h: interface for the HandlerPool class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4503)
+#endif
#if !defined(AFX_HANDLERPOOL_H__6C2A4C96_7115_43C6_9EFA_CDAC9247D109__INCLUDED_)
#define AFX_HANDLERPOOL_H__6C2A4C96_7115_43C6_9EFA_CDAC9247D109__INCLUDED_
1.7 +1 -1 ws-axis/c/src/engine/ServerAxisEngine.cpp
Index: ServerAxisEngine.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/ServerAxisEngine.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServerAxisEngine.cpp 10 Oct 2003 12:47:03 -0000 1.6
+++ ServerAxisEngine.cpp 15 Oct 2003 06:11:28 -0000 1.7
@@ -29,7 +29,7 @@
int ServerAxisEngine::Process(Ax_soapstream* soap)
{
- int Status;
+ int Status = 0;
AXIS_TRY
AXISTRACE1("ServerAxisEngine::Process");
const WSDDService* pService = NULL;
1.4 +2 -0 ws-axis/c/src/engine/SessionScopeHandlerPool.cpp
Index: SessionScopeHandlerPool.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/SessionScopeHandlerPool.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionScopeHandlerPool.cpp 27 Aug 2003 12:16:35 -0000 1.3
+++ SessionScopeHandlerPool.cpp 15 Oct 2003 06:11:28 -0000 1.4
@@ -61,7 +61,9 @@
// SessionScopeHandlerPool.cpp: implementation of the SessionScopeHandlerPool class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4503)
+#endif
#include "SessionScopeHandlerPool.h"
#include "HandlerLoader.h"
1.8 +2 -0 ws-axis/c/src/engine/SharedObject.h
Index: SharedObject.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/SharedObject.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SharedObject.h 8 Sep 2003 11:50:43 -0000 1.7
+++ SharedObject.h 15 Oct 2003 06:11:28 -0000 1.8
@@ -61,7 +61,9 @@
// SharedObject.h: interface for the SharedObject class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(AFX_SHAREDOBJECT_H__0805D25C_2F7E_4B19_BECE_0A8BFE9F0830__INCLUDED_)
#define AFX_SHAREDOBJECT_H__0805D25C_2F7E_4B19_BECE_0A8BFE9F0830__INCLUDED_
1.4 +1 -1 ws-axis/c/src/server/handlers/custom/echoStringHeaderHandler/ESHHandler.cpp
Index: ESHHandler.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/echoStringHeaderHandler/ESHHandler.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ESHHandler.cpp 2 Oct 2003 06:06:15 -0000 1.3
+++ ESHHandler.cpp 15 Oct 2003 06:11:28 -0000 1.4
@@ -120,7 +120,7 @@
strTemp = "EchoStringHeaderHandlerPr1.id";
size_t nSize = strlen(pIMsg->getProperty(strTemp).c_str()) + 30;
- sHeaderVal = malloc(nSize);
+ sHeaderVal = (char*) malloc(nSize);
strcpy(sHeaderVal, pIMsg->getProperty(strTemp).c_str());
realloc(sHeaderVal, 30);
strcpy(sHeaderVal," After Append by Handler");
1.2 +1 -1 ws-axis/c/src/server/handlers/custom/echoStringHeaderHandler/EchoStringHeaderHandler.cpp
Index: EchoStringHeaderHandler.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/echoStringHeaderHandler/EchoStringHeaderHandler.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EchoStringHeaderHandler.cpp 5 Aug 2003 12:50:37 -0000 1.1
+++ EchoStringHeaderHandler.cpp 15 Oct 2003 06:11:28 -0000 1.2
@@ -100,4 +100,4 @@
return FAIL;
}
-}
\ No newline at end of file
+}
1.4 +1 -1 ws-axis/c/src/server/handlers/custom/loghandler/LogAccessCount.cpp
Index: LogAccessCount.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/loghandler/LogAccessCount.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogAccessCount.cpp 10 Oct 2003 12:47:03 -0000 1.3
+++ LogAccessCount.cpp 15 Oct 2003 06:11:29 -0000 1.4
@@ -94,4 +94,4 @@
return FAIL;
}
-}
\ No newline at end of file
+}
1.8 +1 -1 ws-axis/c/src/server/handlers/custom/loghandler/LogHandler.cpp
Index: LogHandler.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/loghandler/LogHandler.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LogHandler.cpp 10 Oct 2003 12:47:03 -0000 1.7
+++ LogHandler.cpp 15 Oct 2003 06:11:29 -0000 1.8
@@ -169,4 +169,4 @@
//do any finalizatoin
return SUCCESS;
-}
\ No newline at end of file
+}
1.3 +1 -1 ws-axis/c/src/server/handlers/custom/simpleauthhandler/SimpleAuth.cpp
Index: SimpleAuth.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/simpleauthhandler/SimpleAuth.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleAuth.cpp 4 Sep 2003 06:51:40 -0000 1.2
+++ SimpleAuth.cpp 15 Oct 2003 06:11:29 -0000 1.3
@@ -92,4 +92,4 @@
return FAIL;
}
-}
\ No newline at end of file
+}
1.6 +7 -5 ws-axis/c/src/server/handlers/custom/simpleauthhandler/SimpleAuthorizationHandler.cpp
Index: SimpleAuthorizationHandler.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/simpleauthhandler/SimpleAuthorizationHandler.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleAuthorizationHandler.cpp 2 Oct 2003 06:06:16 -0000 1.5
+++ SimpleAuthorizationHandler.cpp 15 Oct 2003 06:11:29 -0000 1.6
@@ -84,18 +84,18 @@
{
// AXISTRACE1("SimpleAuthorizationHandler::Invoke(IMessageData* md)");
string sValue = GetOption("AllowByDefault");
- AXISTRACE2("sValue :", sValue);
+ AXISTRACE2("sValue :", sValue.c_str());
int intIsAllowed = atoi(sValue.c_str());
if(0 == intIsAllowed)
{
return SUCCESS;
}
m_sAuthUser = md->GetUserName();
- AXISTRACE2("m_sAuthUser:",m_sAuthUser);
+ AXISTRACE2("m_sAuthUser:",m_sAuthUser.c_str());
if(!m_sAuthUser.empty())
{
string sAllowedRolesFileName = GetOption("AllowedRoles");
- AXISTRACE2("sAllowedRolesFileName:",sAllowedRolesFileName);
+ AXISTRACE2("sAllowedRolesFileName:",sAllowedRolesFileName.c_str());
ifstream fin(sAllowedRolesFileName.c_str()); // open for reading
string sLine = "";
char buff[512];
@@ -104,7 +104,7 @@
fin.getline(buff, 512);
sLine = buff;
m_AllowedRoles.push_back(sLine);
- AXISTRACE2("line read is:", sLine);
+ AXISTRACE2("line read is:", sLine.c_str());
}
m_itCurrentRole = m_AllowedRoles.begin();
@@ -128,7 +128,9 @@
}catch(...)
{
return FAIL;
- }
+ }
+
+ return SUCCESS;
}
void SimpleAuthorizationHandler::OnFault(IMessageData* mc)
1.5 +3 -1 ws-axis/c/src/server/handlers/global/testhandler1/TestGlobal.h
Index: TestGlobal.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/global/testhandler1/TestGlobal.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestGlobal.h 4 Sep 2003 06:51:40 -0000 1.4
+++ TestGlobal.h 15 Oct 2003 06:11:29 -0000 1.5
@@ -66,7 +66,9 @@
#pragma once
#endif // _MSC_VER > 1000
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#include "../../../../common/Handler.h"
@@ -87,4 +89,4 @@
};
-#endif // !defined(TESTGLOBAL_H__INCLUDED_)
\ No newline at end of file
+#endif // !defined(TESTGLOBAL_H__INCLUDED_)
1.4 +1 -1 ws-axis/c/src/server/handlers/global/testhandler1/TestHandler1.cpp
Index: TestHandler1.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/global/testhandler1/TestHandler1.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestHandler1.cpp 4 Sep 2003 06:51:40 -0000 1.3
+++ TestHandler1.cpp 15 Oct 2003 06:11:29 -0000 1.4
@@ -93,4 +93,4 @@
return FAIL;
}
-}
\ No newline at end of file
+}
1.3 +1 -1 ws-axis/c/src/server/handlers/transport/testhandler2/TestHandler2.cpp
Index: TestHandler2.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/transport/testhandler2/TestHandler2.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestHandler2.cpp 4 Sep 2003 06:51:40 -0000 1.2
+++ TestHandler2.cpp 15 Oct 2003 06:11:29 -0000 1.3
@@ -92,4 +92,4 @@
return FAIL;
}
-}
\ No newline at end of file
+}
1.7 +1 -1 ws-axis/c/src/server/handlers/transport/testhandler2/TestTransport.cpp
Index: TestTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/transport/testhandler2/TestTransport.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestTransport.cpp 2 Oct 2003 06:06:16 -0000 1.6
+++ TestTransport.cpp 15 Oct 2003 06:11:29 -0000 1.7
@@ -126,4 +126,4 @@
//do any finalizatoin
return SUCCESS;
-}
\ No newline at end of file
+}
1.10 +1 -1 ws-axis/c/src/server/samples/cppservicewrapper/CPPServiceWrapper.cpp
Index: CPPServiceWrapper.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/cppservicewrapper/CPPServiceWrapper.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CPPServiceWrapper.cpp 13 Oct 2003 05:03:14 -0000 1.9
+++ CPPServiceWrapper.cpp 15 Oct 2003 06:11:29 -0000 1.10
@@ -1,4 +1,4 @@
-//This file is automatically generated by the Axis C++ Wrapper Class Generator
+ //This file is automatically generated by the Axis C++ Wrapper Class Generator
//Web service wrapper class's implementation generated by Axis WCG
#include "CPPServiceWrapper.hpp"
1.2 +4 -17 ws-axis/c/src/server/samples/simplewebservice/webservice/WebService.cpp
Index: WebService.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/simplewebservice/webservice/WebService.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebService.cpp 12 Sep 2003 12:28:42 -0000 1.1
+++ WebService.cpp 15 Oct 2003 06:11:29 -0000 1.2
@@ -97,19 +97,9 @@
return a*a;
}
-int* WebService::EchoIntArray(int size, int array[],int * retsize)
+IntArray WebService::EchoIntArray(IntArray Array)
{
- int * retarr = new int[size*2];
-
- for(int i=0;i<2;i++)
- {
- for(int j=0;j<size;j++)
- {
- retarr[j + i*size] = array[j];
- }
- }
- *retsize = size*2;
- return retarr;
+ return Array;
}
Point* WebService::AddPoint(Point* p1, Point* p2)
@@ -120,12 +110,9 @@
return pNew;
}
-Point* WebService::EchoPointArray(int size, Point array[], int*retsize)
+PointArray WebService::EchoPointArray(PointArray Array)
{
- Point* pNew = new Point[size];
- memcpy(pNew, array, sizeof(Point)*size);
- *retsize = size;
- return pNew;
+ return Array;
}
1.3 +14 -2 ws-axis/c/src/server/samples/simplewebservice/webservice/WebService.h
Index: WebService.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/simplewebservice/webservice/WebService.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebService.h 17 Sep 2003 05:10:57 -0000 1.2
+++ WebService.h 15 Oct 2003 06:11:29 -0000 1.3
@@ -79,17 +79,29 @@
int y;
};
+typedef struct PointArrayTag
+{
+ Point* m_Array;
+ int m_Size;
+} PointArray;
+
+typedef struct IntArrayTag
+{
+ int* m_Array;
+ int m_Size;
+} IntArray;
+
class WebService
{
public:
WebService();
virtual ~WebService();
public:
- int* EchoIntArray(int size, int array[], int* retsize);
+ IntArray EchoIntArray(IntArray Array);
string Echo(string msg); // exposed web service method
int Add(int a, int b); // exposed web service method
Point* AddPoint(Point* p1, Point* p2);
- Point* EchoPointArray(int size, Point array[], int*retsize);
+ PointArray EchoPointArray(PointArray Array);
private:
int xxx(int a); // not a web service method.
};
1.6 +96 -39 ws-axis/c/src/server/samples/simplewebservice/webservicewrapper/WebServiceWrapper.cpp
Index: WebServiceWrapper.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/simplewebservice/webservicewrapper/WebServiceWrapper.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebServiceWrapper.cpp 29 Sep 2003 03:45:28 -0000 1.5
+++ WebServiceWrapper.cpp 15 Oct 2003 06:11:29 -0000 1.6
@@ -66,11 +66,6 @@
//////////////////////////////////////////////////////////////////////
#include "WebServiceWrapper.h"
-#include "../../../../common/IWrapperSoapDeSerializer.h"
-#include "../../../../common/IWrapperSoapSerializer.h"
-#include "../../../../common/ISoapMethod.h"
-#include "../../../../common/IParam.h"
-#include "../../../../common/IArrayBean.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -81,11 +76,19 @@
int Axis_DeSerialize_Point(Point* p, IWrapperSoapDeSerializer *pDZ)
{
- p->x = pDZ->GetParam()->GetInt();
- p->y = pDZ->GetParam()->GetInt();
+ p->x = pDZ->GetInt();
+ p->y = pDZ->GetInt();
return SUCCESS;
}
+void* Axis_Create_Point(bool bArray = false, int nSize=0)
+{
+ if (bArray && (nSize > 0))
+ return new Point[nSize];
+ else
+ return new Point;
+}
+
void Axis_Delete_Point(Point* p, bool bArray = false, int nSize=0)
{
if (bArray)
@@ -156,7 +159,7 @@
return 0;
}
-int webservicewrapper::SetResponseMethod(IMessageData* mc, const AxisChar* name)
+/*int webservicewrapper::SetResponseMethod(IMessageData* mc, const AxisChar* name)
{
IWrapperSoapSerializer* pIWSz = NULL;
mc->getSoapSerializer(&pIWSz);
@@ -166,49 +169,50 @@
pMethod->setPrefix("m");
pMethod->setUri("http://www.opensource.lk");
return SUCCESS;
-}
+} */
// Methods that wraps actual web methods
int webservicewrapper::Echo(IMessageData* mc)
{
- SetResponseMethod(mc, "EchoResponse");
+ //SetResponseMethod(mc, "EchoResponse");
IWrapperSoapDeSerializer* pIWrapperSoapDeSerializer;
mc->getSoapDeSerializer(&pIWrapperSoapDeSerializer);
- IParam *param1 = pIWrapperSoapDeSerializer->GetParam();
+ //IParam *param1 = pIWrapperSoapDeSerializer->GetParam();
//We know that parameter 1 should be an string
- AxisString str = param1->GetString();
+ AxisString str = pIWrapperSoapDeSerializer->GetString();
//Call actual web service method with appropriate parameters
AxisString strRet = pWs->Echo(str);
IWrapperSoapSerializer* pIWSz;
mc->getSoapSerializer(&pIWSz);
- IParam* pRetParam = pIWSz->AddOutputParam(strRet.c_str());
- pRetParam->SetName("EchoReturn");
- return SUCCESS;
+ //IParam* pRetParam = pIWSz->AddOutputParam(strRet.c_str());
+ //pRetParam->SetName("EchoReturn");
+ //return SUCCESS;
+ return pIWSz->AddOutputParam("EchoReturn", strRet);;
}
int webservicewrapper::Add(IMessageData* mc)
{
- SetResponseMethod(mc, "AddResponse");
- IWrapperSoapDeSerializer* pIWrapperSoapDeSerializer;
+ //SetResponseMethod(mc, "AddResponse");
+ IWrapperSoapDeSerializer* pIWrapperSoapDeSerializer = NULL;
mc->getSoapDeSerializer(&pIWrapperSoapDeSerializer);
- IParam *param1 = pIWrapperSoapDeSerializer->GetParam();
- IParam *param2 = pIWrapperSoapDeSerializer->GetParam();
+ //IParam *param1 = pIWrapperSoapDeSerializer->GetParam();
+ //IParam *param2 = pIWrapperSoapDeSerializer->GetParam();
//Convert parameters to actual types
- int i1 = param1->GetInt();
- int i2 = param2->GetInt();
+ int i1 = pIWrapperSoapDeSerializer->GetInt();
+ int i2 = pIWrapperSoapDeSerializer->GetInt();
//Call actual web service method with appropriate parameters
int ret = pWs->Add(i1, i2);
- IWrapperSoapSerializer* pIWSz;
+ IWrapperSoapSerializer* pIWSz = NULL;
mc->getSoapSerializer(&pIWSz);
- IParam* pRetParam = pIWSz->AddOutputParam(ret);
- pRetParam->SetName("AddReturn");
- return SUCCESS;
+ //IParam* pRetParam = pIWSz->AddOutputParam(ret);
+ //pRetParam->SetName("AddReturn");
+ return pIWSz->AddOutputParam("AddReturn", ret);
}
void webservicewrapper::OnFault(IMessageData* mc)
{
}
-
+/*
int webservicewrapper::EchoIntArray(IMessageData *mc)
{
SetResponseMethod(mc, "EchoIntArrayResponse");
@@ -232,6 +236,26 @@
// IParam* pRetParam = pIWSz->AddOutputParam(XSD_ARRAY, value);
// pRetParam->SetName("EchoIntArrayReturn");
return SUCCESS;
+}*/
+
+int webservicewrapper::EchoIntArray(IMessageData* mc)
+{
+ IWrapperSoapSerializer* pIWSSZ = NULL;
+ mc->getSoapSerializer(&pIWSSZ);
+ if (!pIWSSZ) return FAIL;
+ IWrapperSoapDeSerializer* pIWSDZ = NULL;
+ mc->getSoapDeSerializer(&pIWSDZ);
+ if (!pIWSDZ) return FAIL;
+ pIWSSZ->createSoapMethod("EchoIntArrayResponse", pIWSSZ->getNewNamespacePrefix(), "http://www.opensource.lk/WebService");
+
+ //we expect a IntArray now
+ Axis_Array inArray = pIWSDZ->GetArray(XSD_INT);
+
+ IntArray outArray = pWs->EchoIntArray((IntArray&)inArray);
+
+ return pIWSSZ->AddOutputParam("EchoIntArrayReturn", (Axis_Array*)(&outArray),
+ (void*) Axis_Serialize_Point, (void*) Axis_Delete_Point, (void*) Axis_GetSize_Point,
+ Axis_TypeName_Point, Axis_URI_Point);
}
int webservicewrapper::AddPoint(IMessageData *mc)
@@ -242,29 +266,40 @@
IWrapperSoapDeSerializer* pIWSDZ = NULL;
mc->getSoapDeSerializer(&pIWSDZ);
if (!pIWSDZ) return FAIL;
- SetResponseMethod(mc, "AddPointResponse");
+ //SetResponseMethod(mc, "AddPointResponse");
+
+ //IParam *param0 = pIWSDZ->GetParam();
+ //Point* v0 = new Point();
- IParam *param0 = pIWSDZ->GetParam();
- Point* v0 = new Point();
+ //param0->SetUserType(v0, (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_Point, (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_Point);
+ //pIWSDZ->Deserialize(param0,0);
- param0->SetUserType(v0, (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_Point, (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_Point);
- pIWSDZ->Deserialize(param0,0);
+ //IParam *param1 = pIWSDZ->GetParam();
+ //Point* v1 = new Point();
- IParam *param1 = pIWSDZ->GetParam();
- Point* v1 = new Point();
+ //param1->SetUserType(v1, (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_Point, (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_Point);
+ //pIWSDZ->Deserialize(param1,0);
- param1->SetUserType(v1, (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_Point, (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_Point);
- pIWSDZ->Deserialize(param1,0);
+ pIWSSZ->createSoapMethod("AddPointResponse", pIWSSZ->getNewNamespacePrefix(), "http://www.opensource.lk/WebService");
+ Point* v0 = (Point*)pIWSDZ->GetObject((void*) (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_Point,
+ (void*) (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_Point, (void*) (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_Point,
+ Axis_TypeName_Point, Axis_URI_Point);
+
+ Point* v1 = (Point*)pIWSDZ->GetObject((void*) (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_Point,
+ (void*) (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_Point, (void*) (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_Point,
+ Axis_TypeName_Point, Axis_URI_Point);
+
//Call actual web service method with appropriate parameters
Point* ret = pWs->AddPoint(v0, v1);
- IParam* pRetParam = pIWSSZ->AddOutputParam(ret, (void*) Axis_Serialize_Point, (void*) Axis_Delete_Point);
- pRetParam->SetName("AddPointReturn");
- return SUCCESS;
+ //IParam* pRetParam = pIWSSZ->AddOutputParam(ret, (void*) Axis_Serialize_Point, (void*) Axis_Delete_Point);
+ //pRetParam->SetName("AddPointReturn");
+ //return SUCCESS;
+ return pIWSSZ->AddOutputParam("AddPointReturn", ret, (void*)Axis_Serialize_Point, (void*)Axis_Delete_Point);
}
-int webservicewrapper::EchoPointArray(IMessageData *mc)
+/*int webservicewrapper::EchoPointArray(IMessageData *mc)
{
SetResponseMethod(mc, "EchoPointArrayResponse");
IWrapperSoapDeSerializer* pIWrapperSoapDeSerializer;
@@ -285,5 +320,27 @@
IParam* pRetParam = pIWSz->AddOutputParam(pAb);
pRetParam->SetName("EchoPointArrayReturn");
return SUCCESS;
+}*/
+
+int webservicewrapper::EchoPointArray(IMessageData* mc)
+{
+ IWrapperSoapSerializer* pIWSSZ = NULL;
+ mc->getSoapSerializer(&pIWSSZ);
+ if (!pIWSSZ) return FAIL;
+ IWrapperSoapDeSerializer* pIWSDZ = NULL;
+ mc->getSoapDeSerializer(&pIWSDZ);
+ if (!pIWSDZ) return FAIL;
+ pIWSSZ->createSoapMethod("EchoPointArrayResponse", pIWSSZ->getNewNamespacePrefix(), "http://www.opensource.lk/WebService");
+
+ //we expect a PointArray now
+ Axis_Array inArray = pIWSDZ->GetArray((void*) (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_Point,
+ (void*) (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_Point, (void*) (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_Point,
+ (void*) (AXIS_OBJECT_SIZE_FUNCT)Axis_GetSize_Point, Axis_TypeName_Point, Axis_URI_Point);
+
+ PointArray outArray = pWs->EchoPointArray((PointArray&)inArray);
+
+ return pIWSSZ->AddOutputParam("EchoPointArrayReturn", (Axis_Array*)(&outArray),
+ (void*) Axis_Serialize_Point, (void*) Axis_Delete_Point, (void*) Axis_GetSize_Point,
+ Axis_TypeName_Point, Axis_URI_Point);
}
1.4 +5 -0 ws-axis/c/src/server/samples/simplewebservice/webservicewrapper/WebServiceWrapper.h
Index: WebServiceWrapper.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/simplewebservice/webservicewrapper/WebServiceWrapper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebServiceWrapper.h 18 Sep 2003 06:28:07 -0000 1.3
+++ WebServiceWrapper.h 15 Oct 2003 06:11:29 -0000 1.4
@@ -72,6 +72,11 @@
#include "../../../../common/WrapperClassHandler.h"
#include "../../../../common/IMessageData.h"
#include "../../../../common/GDefine.h"
+#include "../../../../common/IWrapperSoapDeSerializer.h"
+#include "../../../../common/IWrapperSoapSerializer.h"
+#include "../../../../common/ISoapMethod.h"
+#include "../../../../common/IParam.h"
+#include "../../../../common/IArrayBean.h"
class webservicewrapper : public WrapperClassHandler
{
1.4 +1 -1 ws-axis/c/src/server/simple_axis_server/ServerHelper.h
Index: ServerHelper.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/simple_axis_server/ServerHelper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServerHelper.h 1 Oct 2003 08:04:30 -0000 1.3
+++ ServerHelper.h 15 Oct 2003 06:11:29 -0000 1.4
@@ -70,4 +70,4 @@
int getSeperatedHTTPParts(string sClientReqStream, string& sHTTPHeaders, string& sHTTPBody);
-#endif // !defined(AFX_SERVERHELPER_H__INCLUDED_)
\ No newline at end of file
+#endif // !defined(AFX_SERVERHELPER_H__INCLUDED_)
1.5 +2 -46 ws-axis/c/src/soap/HeaderBlock.cpp
Index: HeaderBlock.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/HeaderBlock.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HeaderBlock.cpp 27 Aug 2003 12:16:36 -0000 1.4
+++ HeaderBlock.cpp 15 Oct 2003 06:11:29 -0000 1.5
@@ -162,50 +162,6 @@
return iStatus;
}
-/*
-int HeaderBlock::serialize(string& sSerialized)
-{
- /*
- *In the code we don't look whether the m_prefix is available or
- * not. Instead directly insert it. The reason is that the SOAP
- * 1.1 spec says that "All immediate child elements of the SOAP
- * Header element MUST be namespace-qualified".
- */
-
- /*int iStatus= SUCCESS;
-
- do {
- if(isSerializable()) {
-
- sSerialized= sSerialized + "<" + m_prefix + ":" + m_localname +
- " xmlns:"+ m_prefix +"=\""+ m_uri+ "\"";
-
- iStatus= attrSerialize(sSerialized);
- if(iStatus==FAIL) {
- break;
- }
-
- sSerialized= sSerialized + ">";
-
- iStatus= serializeChildren(sSerialized);
- if(iStatus==FAIL) {
- break;
- }
-
- sSerialized= sSerialized + "</"+ m_prefix + ":"+ m_localname+ ">";
-
- // sSerialized= sSerialized + ">" + m_value + "</"+ m_prefix +
- // ":"+ m_localname+ ">";
-
- } else {
- iStatus= FAIL;
- }
- } while(0);
-
- return iStatus;
-}
-*/
-
int HeaderBlock::attrSerialize(SoapSerializer& pSZ)
{
int iStatus= SUCCESS;
@@ -247,7 +203,7 @@
bool HeaderBlock::isSerializable()
{
- //bool blnStatus= true;\
+ //bool blnStatus= true;
//return blnStatus;
@@ -336,7 +292,7 @@
BasicNode* HeaderBlock::createChild(NODE_TYPE eNODE_TYPE)
{
- BasicNode* pBasicNode;
+ BasicNode* pBasicNode = NULL;
if(eNODE_TYPE==CHARACTER_NODE) {
pBasicNode = new CharacterElement();
1.6 +3 -1 ws-axis/c/src/soap/SoapEnvVersions.h
Index: SoapEnvVersions.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapEnvVersions.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SoapEnvVersions.h 5 Sep 2003 10:48:51 -0000 1.5
+++ SoapEnvVersions.h 15 Oct 2003 06:11:29 -0000 1.6
@@ -64,7 +64,9 @@
// SoapEnvVersions.h:
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#ifndef __SOAPENVVERSIONS_H_INCLUDED___
#define __SOAPENVVERSIONS_H_INCLUDED___
@@ -167,4 +169,4 @@
}
};
-#endif //__SOAPENVVERSIONS_H_INCLUDED___
\ No newline at end of file
+#endif //__SOAPENVVERSIONS_H_INCLUDED___
1.8 +2 -0 ws-axis/c/src/soap/SoapFault.h
Index: SoapFault.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapFault.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SoapFault.h 27 Sep 2003 08:33:28 -0000 1.7
+++ SoapFault.h 15 Oct 2003 06:11:29 -0000 1.8
@@ -64,7 +64,9 @@
// SoapFault.h: interface for the SoapFault class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(AFX_SOAPFAULT_H__1E4329DF_59B2_4C55_971D_4B84B0FED7FF__INCLUDED_)
#define AFX_SOAPFAULT_H__1E4329DF_59B2_4C55_971D_4B84B0FED7FF__INCLUDED_
1.7 +1 -1 ws-axis/c/src/soap/SoapFaults.h
Index: SoapFaults.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapFaults.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SoapFaults.h 26 Sep 2003 07:29:32 -0000 1.6
+++ SoapFaults.h 15 Oct 2003 06:11:29 -0000 1.7
@@ -141,4 +141,4 @@
/*SF_WEBSERVICEFAILED*/ {"Server", "Webservice failed", "none", ""}
};
-#endif //__SOAPFAULTS_H_INCLUDED___
\ No newline at end of file
+#endif //__SOAPFAULTS_H_INCLUDED___
1.7 +2 -0 ws-axis/c/src/soap/URIMapping.h
Index: URIMapping.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/URIMapping.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- URIMapping.h 9 Sep 2003 12:53:01 -0000 1.6
+++ URIMapping.h 15 Oct 2003 06:11:29 -0000 1.7
@@ -63,7 +63,9 @@
// URIMapping.h: interface for the URIMapping class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(AFX_URIMAPPING_H__D5B347DD_E7B0_4C76_BCB2_A7C73CFE367D__INCLUDED_)
#define AFX_URIMAPPING_H__D5B347DD_E7B0_4C76_BCB2_A7C73CFE367D__INCLUDED_
1.17 +2 -2 ws-axis/c/src/soap/XMLStreamHandler.cpp
Index: XMLStreamHandler.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/XMLStreamHandler.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XMLStreamHandler.cpp 10 Oct 2003 05:13:14 -0000 1.16
+++ XMLStreamHandler.cpp 15 Oct 2003 06:11:29 -0000 1.17
@@ -271,7 +271,7 @@
AxisChar* pchar = new AxisChar[nLen];
if (XMLString::transcode(chars, pchar, nLen-1))
{
- CharacterElement* pCharacterElement = new CharacterElement(pchar);
+ pCharacterElement = new CharacterElement(pchar);
}
delete pchar;
}
@@ -279,7 +279,7 @@
{
if (XMLString::transcode(chars, m_Buffer, TRANSCODE_BUFFER_SIZE-1))
{
- CharacterElement* pCharacterElement = new CharacterElement(m_Buffer);
+ pCharacterElement = new CharacterElement(m_Buffer);
}
}
if (pCharacterElement)
1.8 +3 -2 ws-axis/c/src/soap/XMLStreamHandler.h
Index: XMLStreamHandler.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/XMLStreamHandler.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLStreamHandler.h 11 Sep 2003 12:24:47 -0000 1.7
+++ XMLStreamHandler.h 15 Oct 2003 06:11:29 -0000 1.8
@@ -60,8 +60,9 @@
* @author Susantha Kumara (skumara@virtusa.com)
*
*/
-
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(__XMLSTREAMHANDLER_H_INCLUDED__)
#define __XMLSTREAMHANDLER_H_INCLUDED__
@@ -158,4 +159,4 @@
void SetParamType(const Attributes &attrs);
};
-#endif
\ No newline at end of file
+#endif
1.10 +2 -0 ws-axis/c/src/wcg/BeanClass.cpp
Index: BeanClass.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/BeanClass.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BeanClass.cpp 5 Sep 2003 10:48:51 -0000 1.9
+++ BeanClass.cpp 15 Oct 2003 06:11:29 -0000 1.10
@@ -64,7 +64,9 @@
// BeanClass.cpp: implementation of the BeanClass class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#include "BeanClass.h"
1.8 +1 -1 ws-axis/c/src/wcg/Deploy.cpp
Index: Deploy.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/Deploy.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Deploy.cpp 12 Sep 2003 09:31:43 -0000 1.7
+++ Deploy.cpp 15 Oct 2003 06:11:29 -0000 1.8
@@ -241,7 +241,7 @@
int error = 0;
if (filename)
{
- if (yyin = fopen( filename, "r" ))
+ if ((yyin = fopen( filename, "r" )))
{
error = yyparse();
if ( error ) { fclose(yyin); return 1;}
1.3 +2 -0 ws-axis/c/src/wcg/File.cpp
Index: File.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/File.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- File.cpp 18 Jul 2003 13:33:51 -0000 1.2
+++ File.cpp 15 Oct 2003 06:11:29 -0000 1.3
@@ -1,7 +1,9 @@
// File.cpp: implementation of the File class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#include "File.h"
1.11 +2 -0 ws-axis/c/src/wcg/Method.cpp
Index: Method.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/Method.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Method.cpp 11 Sep 2003 10:42:48 -0000 1.10
+++ Method.cpp 15 Oct 2003 06:11:29 -0000 1.11
@@ -63,7 +63,9 @@
// Method.cpp: implementation of the Method class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#include "Method.h"
1.7 +3 -0 ws-axis/c/src/wcg/TranslationUnit.cpp
Index: TranslationUnit.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/TranslationUnit.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TranslationUnit.cpp 2 Sep 2003 12:03:50 -0000 1.6
+++ TranslationUnit.cpp 15 Oct 2003 06:11:29 -0000 1.7
@@ -64,7 +64,9 @@
// TranslationUnit.cpp: implementation of the TranslationUnit class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#include "TranslationUnit.h"
#include "File.h"
@@ -322,4 +324,5 @@
}
m_pWSClass->GenerateOperationsInBinding(file, sServiceName, nBinding, nStyle, sURI);
file << "</binding>" << endl;
+ return 0;
}
1.6 +2 -0 ws-axis/c/src/wcg/TranslationUnit.h
Index: TranslationUnit.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/TranslationUnit.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TranslationUnit.h 2 Sep 2003 12:03:50 -0000 1.5
+++ TranslationUnit.h 15 Oct 2003 06:11:29 -0000 1.6
@@ -1,4 +1,6 @@
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
/* -*- C++ -*- */
/*
* The Apache Software License, Version 1.1
1.9 +6 -0 ws-axis/c/src/wcg/Variable.cpp
Index: Variable.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/Variable.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Variable.cpp 5 Sep 2003 10:48:51 -0000 1.8
+++ Variable.cpp 15 Oct 2003 06:11:29 -0000 1.9
@@ -66,7 +66,9 @@
// Variable.cpp: implementation of the Variable class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#include "Variable.h"
@@ -287,6 +289,8 @@
file << "<element name=\"" << m_VarName << "\" type=\"";
if (m_Type != VAR_USER) file << "xsd:" << m_TypeName << "\" />" << endl;
else file << "xsdl:" << m_TypeName << "\" />" << endl;
+
+ return 0;
}
int Variable::GenerateWSDLPartInMessage(File &file, bool bInput)
@@ -304,4 +308,6 @@
file << "\" type=\"";
if (m_Type != VAR_USER) file << "xsd:" << m_TypeName << "\" />" << endl;
else file << "xsdl:" << m_TypeName << "\" />" << endl;
+
+ return 0;
}
1.8 +2 -0 ws-axis/c/src/wcg/Variable.h
Index: Variable.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/Variable.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Variable.h 2 Sep 2003 12:03:50 -0000 1.7
+++ Variable.h 15 Oct 2003 06:11:29 -0000 1.8
@@ -65,7 +65,9 @@
// Variable.h: interface for the Variable class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(AFX_VARIABLE_H__F9272406_BB8F_4151_8346_E033DDDDA468__INCLUDED_)
#define AFX_VARIABLE_H__F9272406_BB8F_4151_8346_E033DDDDA468__INCLUDED_
1.3 +3 -1 ws-axis/c/src/wcg/WCGenerator.cpp
Index: WCGenerator.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/WCGenerator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WCGenerator.cpp 18 Jul 2003 13:31:44 -0000 1.2
+++ WCGenerator.cpp 15 Oct 2003 06:11:29 -0000 1.3
@@ -1,7 +1,9 @@
// WCGenerator.cpp: implementation of the WCGenerator class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#include "WCGenerator.h"
@@ -50,4 +52,4 @@
hf.GenerateWrapperClassDef();
return 0;
}
-*/
\ No newline at end of file
+*/
1.9 +2 -0 ws-axis/c/src/wcg/WSClass.cpp
Index: WSClass.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/WSClass.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WSClass.cpp 5 Sep 2003 10:48:51 -0000 1.8
+++ WSClass.cpp 15 Oct 2003 06:11:29 -0000 1.9
@@ -63,7 +63,9 @@
// WSClass.cpp: implementation of the WSClass class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#include "WSClass.h"
1.6 +4 -2 ws-axis/c/src/wcg/actions.cpp
Index: actions.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/actions.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- actions.cpp 2 Sep 2003 12:03:50 -0000 1.5
+++ actions.cpp 15 Oct 2003 06:11:29 -0000 1.6
@@ -1,4 +1,6 @@
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#include <iostream>
#include <string>
@@ -58,8 +60,8 @@
void add_member_declaration(string_list* decl_specs, member_declarator_list* member_decl_list)
{
- int nVarType;
- int nConvVarType;
+ //int nVarType;
+ //int nConvVarType;
unsigned char nQualifier = 0;
Variable Var;
bool bIsCtor = false; //
1.4 +2 -0 ws-axis/c/src/wcg/actions.h
Index: actions.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/actions.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- actions.h 2 Sep 2003 12:03:50 -0000 1.3
+++ actions.h 15 Oct 2003 06:11:29 -0000 1.4
@@ -1,4 +1,6 @@
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#ifndef __ACTIONS_H_INCLUDED__
#define __ACTIONS_H_INCLUDED__
1.6 +3 -1 ws-axis/c/src/wcg/cpplex.cpp
Index: cpplex.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/cpplex.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpplex.cpp 2 Sep 2003 12:03:50 -0000 1.5
+++ cpplex.cpp 15 Oct 2003 06:11:29 -0000 1.6
@@ -1,4 +1,6 @@
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#line 2 "cpplex.cpp"
/* A lexical scanner generated by flex */
1.9 +2 -0 ws-axis/c/src/wsdd/WSDDDeployment.h
Index: WSDDDeployment.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDeployment.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WSDDDeployment.h 4 Oct 2003 17:22:52 -0000 1.8
+++ WSDDDeployment.h 15 Oct 2003 06:11:30 -0000 1.9
@@ -64,7 +64,9 @@
// WSDDDeployment.h: interface for the WSDDDeployment class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(AFX_WSDDDEPLOYMENT_H__2B3E0205_06F3_47C1_8D9C_479CBFB8ACC2__INCLUDED_)
#define AFX_WSDDDEPLOYMENT_H__2B3E0205_06F3_47C1_8D9C_479CBFB8ACC2__INCLUDED_
1.19 +7 -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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WSDDDocument.cpp 10 Oct 2003 12:47:03 -0000 1.18
+++ WSDDDocument.cpp 15 Oct 2003 06:11:30 -0000 1.19
@@ -149,6 +149,8 @@
m_lev0 = WSDD_DEPLOYMENT;
break;
break;
+
+ default:;
}
}
else // inside a requestFlow or responseFlow elements
@@ -273,6 +275,7 @@
//unknown attribute
}
break;
+ default:;
}
}
}
@@ -281,7 +284,7 @@
{
AxisXMLString sName, sValue, sType;
const AxisXMLCh *name, *value, *type;
- bool locked;
+ //bool locked;
AxisXMLString Localname, Value;
for (int i = 0; i < attrs.getLength(); i++)
{
@@ -351,6 +354,8 @@
m_pHandler->AddParameter(name, value);
}
break;
+
+ default:;
}
}
@@ -491,6 +496,7 @@
ProcessAttributes(WSDD_RESFLOW, attrs);
}
break;
+ default:;
}
}
else // inside a requestFlow or responseFlow elements
1.8 +3 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WSDDDocument.h 11 Sep 2003 12:24:47 -0000 1.7
+++ WSDDDocument.h 15 Oct 2003 06:11:30 -0000 1.8
@@ -61,8 +61,9 @@
* @author Suasntha Kumara (skumara@virtusa.com, susantha@opensource.lk)
*
*/
-
+#ifdef WIN32
#pragma warning(disable : 4786)
+#endif
#if !defined(__WSDDDOCUMENTS_H_INCLUDED__)
#define __WSDDDOCUMENTS_H_INCLUDED__
@@ -125,4 +126,4 @@
void endPrefixMapping(const XMLCh* const prefix);
};
-#endif //__WSDDDOCUMENTS_H_INCLUDED__
\ No newline at end of file
+#endif //__WSDDDOCUMENTS_H_INCLUDED__
1.9 +2 -0 ws-axis/c/src/wsdd/WSDDHandler.h
Index: WSDDHandler.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDHandler.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WSDDHandler.h 5 Sep 2003 10:48:51 -0000 1.8
+++ WSDDHandler.h 15 Oct 2003 06:11:30 -0000 1.9
@@ -64,7 +64,9 @@
// WSDDHandler.h: interface for the WSDDHandler class.
//
//////////////////////////////////////////////////////////////////////
+#ifdef WIN32
#pragma warning (disable : 4786)
+#endif
#if !defined(AFX_WSDDHANDLER_H__51DC7642_033D_443B_9D97_5825C38B23DB__INCLUDED_)
#define AFX_WSDDHANDLER_H__51DC7642_033D_443B_9D97_5825C38B23DB__INCLUDED_
1.4 +1 -1 ws-axis/c/src/wsdd/WSDDKeywords.cpp
Index: WSDDKeywords.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDKeywords.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSDDKeywords.cpp 11 Sep 2003 12:24:47 -0000 1.3
+++ WSDDKeywords.cpp 15 Oct 2003 06:11:30 -0000 1.4
@@ -80,4 +80,4 @@
AX_DELETE(kw_smtp);
m_bInit = false;
}
-}
\ No newline at end of file
+}
1.4 +1 -1 ws-axis/c/src/wsdd/WSDDTransport.cpp
Index: WSDDTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDTransport.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSDDTransport.cpp 9 Sep 2003 12:53:01 -0000 1.3
+++ WSDDTransport.cpp 15 Oct 2003 06:11:30 -0000 1.4
@@ -80,7 +80,7 @@
WSDDTransport::~WSDDTransport()
{
map<AXIS_PROTOCOL_TYPE, WSDDHandlerList>::iterator iter;
- WSDDHandlerList * hl = NULL;
+ //WSDDHandlerList * hl = NULL;
WSDDHandlerList::iterator iter2;
if(m_RequestHandlers)
{