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 sa...@apache.org on 2004/07/28 16:21:23 UTC
cvs commit: ws-axis/c/src/xml/xerces SoapBinInputStream.h
sanjaya 2004/07/28 07:21:23
Modified: c/src/common Tag: NamespaceTesting_branch AdminUtils.cpp
AdminUtils.h ArrayBean.cpp ArrayBean.h
AxisConfig.cpp AxisConfig.h AxisConfigException.cpp
AxisConfigException.h AxisFile.h
AxisGenException.cpp AxisMessage.cpp AxisMessage.h
AxisTime.cpp AxisTime.h AxisTrace.cpp AxisTrace.h
AxisUtils.cpp AxisUtils.h BasicTypeSerializer.cpp
BasicTypeSerializer.h IAdminUtils.h IArrayBean.h
IDeployerUtils.h ISoapMethod.h MessageData.cpp
MessageData.h Packet.cpp Param.cpp Param.h
TypeMapping.cpp
c/src/engine Tag: NamespaceTesting_branch
AppScopeHandlerPool.cpp AppScopeHandlerPool.h
Axis.cpp AxisEngine.cpp AxisEngine.h
AxisEngineException.cpp AxisEngineException.h
DeserializerPool.cpp DeserializerPool.h
HandlerChain.cpp HandlerChain.h HandlerLoader.cpp
HandlerLoader.h HandlerPool.cpp HandlerPool.h
RequestScopeHandlerPool.cpp
RequestScopeHandlerPool.h SOAPTransportFactory.cpp
SOAPTransportFactory.h SerializerPool.cpp
SerializerPool.h SessionScopeHandlerPool.cpp
SessionScopeHandlerPool.h SharedObject.cpp
SharedObject.h XMLParserFactory.cpp
XMLParserFactory.h
c/src/engine/client Tag: NamespaceTesting_branch Call.cpp
ClientAxisEngine.cpp ClientAxisEngine.h
c/src/engine/server Tag: NamespaceTesting_branch
ServerAxisEngine.cpp ServerAxisEngine.h
c/src/server/apache Tag: NamespaceTesting_branch
ApacheTransport.h
c/src/server/apache2 Tag: NamespaceTesting_branch
Apache2Transport.h
c/src/soap Tag: NamespaceTesting_branch Attribute.cpp
AxisSoapException.cpp AxisSoapException.h
BasicNode.cpp CharacterElement.cpp
CharacterElement.h ComplexElement.cpp
ComplexElement.h HeaderBlock.cpp HeaderBlock.h
SoapBody.cpp SoapBody.h SoapDeSerializer.cpp
SoapDeSerializer.h SoapEnvelope.cpp SoapEnvelope.h
SoapFault.cpp SoapFault.h SoapHeader.cpp
SoapHeader.h SoapKeywordMapping.cpp
SoapKeywordMapping.h SoapMethod.cpp SoapMethod.h
SoapSerializer.cpp SoapSerializer.h URIMapping.cpp
URIMapping.h
c/src/transport Tag: NamespaceTesting_branch SOAPTransport.h
c/src/transport/axis Tag: NamespaceTesting_branch
AxisTransport.h AxisTransportException.h
HttpTransport.hpp
c/src/wsdd Tag: NamespaceTesting_branch
AxisWsddException.cpp AxisWsddException.h
WSDDDeployment.cpp WSDDDeployment.h
WSDDDocument.cpp WSDDDocument.h WSDDHandler.cpp
WSDDHandler.h WSDDKeywords.cpp WSDDKeywords.h
WSDDService.cpp WSDDService.h WSDDTransport.cpp
WSDDTransport.h
c/src/xml Tag: NamespaceTesting_branch AxisParseException.h
XMLParser.h
c/src/xml/xerces Tag: NamespaceTesting_branch
SoapBinInputStream.h
Log:
namespace changes and related changes on the branch
"NamespaceTesting_branch"
Revision Changes Path
No revision
No revision
1.4.12.1 +5 -1 ws-axis/c/src/common/AdminUtils.cpp
Index: AdminUtils.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AdminUtils.cpp,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -u -r1.4 -r1.4.12.1
--- AdminUtils.cpp 6 Jul 2004 14:16:44 -0000 1.4
+++ AdminUtils.cpp 28 Jul 2004 14:21:01 -0000 1.4.12.1
@@ -18,7 +18,9 @@
#include "AdminUtils.h"
#include "../wsdd/WSDDDeployment.h"
-extern WSDDDeployment* g_pWSDDDeployment;
+extern AXIS_CPP_NAMESPACE_PREFIX WSDDDeployment* g_pWSDDDeployment;
+
+AXIS_CPP_NAMESPACE_START
AdminUtils::AdminUtils()
{
@@ -34,3 +36,5 @@
{
return g_pWSDDDeployment->updateWSDD(wsdd);
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.1.12.1 +5 -0 ws-axis/c/src/common/AdminUtils.h
Index: AdminUtils.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AdminUtils.h,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -r1.1 -r1.1.12.1
--- AdminUtils.h 6 Jul 2004 14:16:44 -0000 1.1
+++ AdminUtils.h 28 Jul 2004 14:21:01 -0000 1.1.12.1
@@ -37,6 +37,9 @@
* @brief This class contains the Server side administration
* functionalities
*/
+
+AXIS_CPP_NAMESPACE_START
+
class AdminUtils : public IAdminUtils
{
public:
@@ -53,6 +56,8 @@
*/
int updateWSDD(AxisChar* wsdd);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.25.12.1 +3 -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.25
retrieving revision 1.25.12.1
diff -u -r1.25 -r1.25.12.1
--- ArrayBean.cpp 6 Jul 2004 14:16:44 -0000 1.25
+++ ArrayBean.cpp 28 Jul 2004 14:21:01 -0000 1.25.12.1
@@ -25,6 +25,7 @@
#include "BasicTypeSerializer.h"
#include "../engine/AxisEngine.h"
+AXIS_CPP_NAMESPACE_START
ArrayBean::ArrayBean()
{
@@ -396,3 +397,5 @@
m_value.sta = NULL;
}
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.14.12.1 +5 -0 ws-axis/c/src/common/ArrayBean.h
Index: ArrayBean.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/ArrayBean.h,v
retrieving revision 1.14
retrieving revision 1.14.12.1
diff -u -r1.14 -r1.14.12.1
--- ArrayBean.h 6 Jul 2004 14:16:44 -0000 1.14
+++ ArrayBean.h 28 Jul 2004 14:21:01 -0000 1.14.12.1
@@ -24,6 +24,9 @@
#include "BasicTypeSerializer.h"
#include <list>
+
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
/**
@@ -63,5 +66,7 @@
void SetUri (const AxisChar* sURI);
void RemoveArrayPointer ();
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.41.2.1 +4 -0 ws-axis/c/src/common/AxisConfig.cpp
Index: AxisConfig.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfig.cpp,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -u -r1.41 -r1.41.2.1
--- AxisConfig.cpp 27 Jul 2004 03:31:16 -0000 1.41
+++ AxisConfig.cpp 28 Jul 2004 14:21:01 -0000 1.41.2.1
@@ -28,6 +28,8 @@
#include <stdio.h>
#include <string.h>
+AXIS_CPP_NAMESPACE_START
+
AxisConfig::AxisConfig ()
{
m_pcAxisHome = 0;
@@ -179,3 +181,5 @@
}
*/
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.10.12.1 +6 -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.10
retrieving revision 1.10.12.1
diff -u -r1.10 -r1.10.12.1
--- AxisConfig.h 6 Jul 2004 14:16:44 -0000 1.10
+++ AxisConfig.h 28 Jul 2004 14:21:01 -0000 1.10.12.1
@@ -26,7 +26,7 @@
#define __AXIS_AXISCONFIG_H_OF_AXIS_INCLUDED__
#define CONFBUFFSIZE 256
-
+#include <axis/server/GDefine.h>
/**
* @class AxisConfig
* @brief class for taking configuration parameters.
@@ -56,6 +56,8 @@
AXCONF_LAST
};
+AXIS_CPP_NAMESPACE_START
+
class AxisConfig
{
public:
@@ -87,5 +89,8 @@
void setValue(int valuelength, g_axconfig valueindex, char* value);
};
+
+AXIS_CPP_NAMESPACE_END
+
#endif
1.12.12.1 +5 -0 ws-axis/c/src/common/AxisConfigException.cpp
Index: AxisConfigException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfigException.cpp,v
retrieving revision 1.12
retrieving revision 1.12.12.1
diff -u -r1.12 -r1.12.12.1
--- AxisConfigException.cpp 6 Jul 2004 14:16:44 -0000 1.12
+++ AxisConfigException.cpp 28 Jul 2004 14:21:02 -0000 1.12.12.1
@@ -25,6 +25,9 @@
* Default when no parameter passed. When thrown with no parameter
* more general SERVER_CONFIG_EXCEPTION is assumed.
*/
+
+AXIS_CPP_NAMESPACE_START
+
AxisConfigException::AxisConfigException()
{
processException(SERVER_CONFIG_EXCEPTION);
@@ -120,3 +123,5 @@
{
return m_iExceptionCode;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.4.12.1 +5 -0 ws-axis/c/src/common/AxisConfigException.h
Index: AxisConfigException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfigException.h,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -u -r1.4 -r1.4.12.1
--- AxisConfigException.h 6 Jul 2004 14:16:44 -0000 1.4
+++ AxisConfigException.h 28 Jul 2004 14:21:02 -0000 1.4.12.1
@@ -23,6 +23,9 @@
#include <string>
#include <axis/server/AxisException.h>
+
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
class STORAGE_CLASS_INFO AxisConfigException :public AxisException
@@ -48,6 +51,8 @@
string m_sMessage;
int m_iExceptionCode;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.1.12.1 +6 -0 ws-axis/c/src/common/AxisFile.h
Index: AxisFile.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisFile.h,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -r1.1 -r1.1.12.1
--- AxisFile.h 6 Jul 2004 14:16:44 -0000 1.1
+++ AxisFile.h 28 Jul 2004 14:21:02 -0000 1.1.12.1
@@ -43,6 +43,9 @@
*
* @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
*/
+
+AXIS_CPP_NAMESPACE_START
+
class AxisFile
{
public:
@@ -123,5 +126,8 @@
private:
FILE* pFILEFile;
};
+
+AXIS_CPP_NAMESPACE_END
+
#endif
1.5.12.1 +5 -1 ws-axis/c/src/common/AxisGenException.cpp
Index: AxisGenException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisGenException.cpp,v
retrieving revision 1.5
retrieving revision 1.5.12.1
diff -u -r1.5 -r1.5.12.1
--- AxisGenException.cpp 6 Jul 2004 14:16:44 -0000 1.5
+++ AxisGenException.cpp 28 Jul 2004 14:21:02 -0000 1.5.12.1
@@ -21,7 +21,10 @@
#include <axis/AxisGenException.h>
#include <exception>
-using namespace std;
+
+AXIS_CPP_NAMESPACE_START
+
+//using namespace std;
AxisGenException::AxisGenException (const int iExceptionCode)
{
@@ -121,3 +124,4 @@
return m_iExceptionCode;
}
+AXIS_CPP_NAMESPACE_END
1.7.12.1 +3 -0 ws-axis/c/src/common/AxisMessage.cpp
Index: AxisMessage.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisMessage.cpp,v
retrieving revision 1.7
retrieving revision 1.7.12.1
diff -u -r1.7 -r1.7.12.1
--- AxisMessage.cpp 6 Jul 2004 14:16:44 -0000 1.7
+++ AxisMessage.cpp 28 Jul 2004 14:21:02 -0000 1.7.12.1
@@ -20,6 +20,8 @@
#include "AxisMessage.h"
+AXIS_CPP_NAMESPACE_START
+
const string& AxisMessage::getMessage(int iExceptionCode)
{
switch(iExceptionCode)
@@ -194,3 +196,4 @@
return m_sMessage;
}
+AXIS_CPP_NAMESPACE_END
1.1.12.1 +4 -0 ws-axis/c/src/common/AxisMessage.h
Index: AxisMessage.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisMessage.h,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -r1.1 -r1.1.12.1
--- AxisMessage.h 6 Jul 2004 14:16:44 -0000 1.1
+++ AxisMessage.h 28 Jul 2004 14:21:02 -0000 1.1.12.1
@@ -28,6 +28,8 @@
#include <string>
#include <axis/server/AxisException.h>
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
class AxisMessage
@@ -42,6 +44,8 @@
string m_sMessage;
int m_iExceptionCode;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.24.4.1 +4 -0 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.24
retrieving revision 1.24.4.1
diff -u -r1.24 -r1.24.4.1
--- AxisTime.cpp 23 Jul 2004 14:04:40 -0000 1.24
+++ AxisTime.cpp 28 Jul 2004 14:21:02 -0000 1.24.4.1
@@ -25,6 +25,8 @@
#define TIMEBUFFSIZE 80
+AXIS_CPP_NAMESPACE_START
+
AxisTime::AxisTime ()
{
@@ -582,3 +584,5 @@
}
*/
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.7.12.1 +5 -0 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.7
retrieving revision 1.7.12.1
diff -u -r1.7 -r1.7.12.1
--- AxisTime.h 6 Jul 2004 14:16:44 -0000 1.7
+++ AxisTime.h 28 Jul 2004 14:21:03 -0000 1.7.12.1
@@ -47,6 +47,9 @@
*
* @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
*/
+
+AXIS_CPP_NAMESPACE_START
+
class AxisTime
{
public:
@@ -98,6 +101,8 @@
AxisString strXSDDuration;
AxisString strXSDDate;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.28.12.1 +4 -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.28
retrieving revision 1.28.12.1
diff -u -r1.28 -r1.28.12.1
--- AxisTrace.cpp 6 Jul 2004 14:16:44 -0000 1.28
+++ AxisTrace.cpp 28 Jul 2004 14:21:03 -0000 1.28.12.1
@@ -27,8 +27,9 @@
#include "AxisConfig.h"
-extern AxisConfig* g_pConfig;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisConfig* g_pConfig;
+AXIS_CPP_NAMESPACE_START
using namespace std;
@@ -265,3 +266,5 @@
return 0;
}
*/
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.8.12.1 +4 -0 ws-axis/c/src/common/AxisTrace.h
Index: AxisTrace.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.h,v
retrieving revision 1.8
retrieving revision 1.8.12.1
diff -u -r1.8 -r1.8.12.1
--- AxisTrace.h 6 Jul 2004 14:16:44 -0000 1.8
+++ AxisTrace.h 28 Jul 2004 14:21:04 -0000 1.8.12.1
@@ -51,6 +51,8 @@
* @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
*/
+AXIS_CPP_NAMESPACE_START
+
class AxisTrace
{
public:
@@ -175,6 +177,8 @@
};
/* static AxisTrace tracer; */
+
+AXIS_CPP_NAMESPACE_END
#endif
1.16.14.1 +4 -0 ws-axis/c/src/common/AxisUtils.cpp
Index: AxisUtils.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisUtils.cpp,v
retrieving revision 1.16
retrieving revision 1.16.14.1
diff -u -r1.16 -r1.16.14.1
--- AxisUtils.cpp 26 Apr 2004 04:04:36 -0000 1.16
+++ AxisUtils.cpp 28 Jul 2004 14:21:04 -0000 1.16.14.1
@@ -24,6 +24,8 @@
#include "AxisUtils.h"
#include <axis/server/GDefine.h>
+AXIS_CPP_NAMESPACE_START
+
AxisXMLCh AxisUtils::m_Buffer[CONVERT_BUFFER_SIZE];
AxisUtils::AxisUtils ()
@@ -126,3 +128,5 @@
return NULL;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.14.14.1 +5 -0 ws-axis/c/src/common/AxisUtils.h
Index: AxisUtils.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisUtils.h,v
retrieving revision 1.14
retrieving revision 1.14.14.1
diff -u -r1.14 -r1.14.14.1
--- AxisUtils.h 26 Apr 2004 04:04:36 -0000 1.14
+++ AxisUtils.h 28 Jul 2004 14:21:04 -0000 1.14.14.1
@@ -32,6 +32,9 @@
@author Susantha Kumara (skumara@virtusa.com)
@author Roshan Weerasuriya (roshan@jkcs.slt.lk, roshan@opensource.lk)
*/
+
+AXIS_CPP_NAMESPACE_START
+
class AxisUtils
{
friend class TypeMapping;
@@ -94,5 +97,7 @@
static AxisXMLCh m_Buffer[CONVERT_BUFFER_SIZE];
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.28.10.1 +4 -0 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.28
retrieving revision 1.28.10.1
diff -u -r1.28 -r1.28.10.1
--- BasicTypeSerializer.cpp 22 Jul 2004 04:29:22 -0000 1.28
+++ BasicTypeSerializer.cpp 28 Jul 2004 14:21:04 -0000 1.28.10.1
@@ -25,6 +25,8 @@
#include "../soap/apr_base64.h"
#include "../soap/HexCoder.h"
+AXIS_CPP_NAMESPACE_START
+
BasicTypeSerializer::BasicTypeSerializer ()
{
m_sSZ = "";
@@ -387,3 +389,5 @@
*/
return m_strReturnVal;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.16.12.1 +9 -4 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.16
retrieving revision 1.16.12.1
diff -u -r1.16 -r1.16.12.1
--- BasicTypeSerializer.h 6 Jul 2004 14:16:44 -0000 1.16
+++ BasicTypeSerializer.h 28 Jul 2004 14:21:05 -0000 1.16.12.1
@@ -51,12 +51,15 @@
*
* @author Susantha Kumara (skumara@virtusa.com)
*/
+
+AXIS_CPP_NAMESPACE_START
+
class BasicTypeSerializer
{
public:
BasicTypeSerializer();
virtual ~BasicTypeSerializer();
- const AxisString& getEntityReferenced(const AxisString& str);
+ const std::AxisString& getEntityReferenced(const std::AxisString& str);
const AxisChar* serializeAsElement(const AxisChar* pName,
const void* pValue, XSDTYPE type);
const AxisChar* serializeAsAttribute(const AxisChar* pName,
@@ -76,15 +79,17 @@
AMPERSAND_CHAR = L'&' /* Ampersand character */
};
private:
- AxisString m_sSZ;
- AxisString m_AuxStr;
- AxisString m_strReturnVal;
+ std::AxisString m_sSZ;
+ std::AxisString m_AuxStr;
+ std::AxisString m_strReturnVal;
AxisChar m_Buf[BTS_BUFFSIZE];
/* used for numeric to string conversions with sprintf */
AxisTime m_AxisTime;
/* Current Serialization Style */
AXIS_BINDING_STYLE m_nStyle;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.1.12.1 +5 -0 ws-axis/c/src/common/IAdminUtils.h
Index: IAdminUtils.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/IAdminUtils.h,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -r1.1 -r1.1.12.1
--- IAdminUtils.h 6 Jul 2004 14:16:44 -0000 1.1
+++ IAdminUtils.h 28 Jul 2004 14:21:05 -0000 1.1.12.1
@@ -39,6 +39,9 @@
* functionalities
* @author Suasntha Kumara (skumara@virtusa.com, susantha@opensource.lk)
*/
+
+AXIS_CPP_NAMESPACE_START
+
class IAdminUtils
{
public:
@@ -54,6 +57,8 @@
*/
virtual int updateWSDD(AxisChar* wsdd)=0;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.10.14.1 +4 -0 ws-axis/c/src/common/IArrayBean.h
Index: IArrayBean.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/IArrayBean.h,v
retrieving revision 1.10
retrieving revision 1.10.14.1
diff -u -r1.10 -r1.10.14.1
--- IArrayBean.h 26 Apr 2004 04:04:36 -0000 1.10
+++ IArrayBean.h 28 Jul 2004 14:21:05 -0000 1.10.14.1
@@ -29,6 +29,8 @@
* @author Susantha Kumara (skumara@virtusa.com)
*/
+AXIS_CPP_NAMESPACE_START
+
class IArrayBean
{
public:
@@ -44,5 +46,7 @@
virtual void SetTypeName (const AxisChar* sName) = 0;
virtual void SetUri (const AxisChar* sURI) = 0;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.6.14.1 +4 -0 ws-axis/c/src/common/IDeployerUtils.h
Index: IDeployerUtils.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/IDeployerUtils.h,v
retrieving revision 1.6
retrieving revision 1.6.14.1
diff -u -r1.6 -r1.6.14.1
--- IDeployerUtils.h 26 Apr 2004 04:04:36 -0000 1.6
+++ IDeployerUtils.h 28 Jul 2004 14:21:05 -0000 1.6.14.1
@@ -30,6 +30,8 @@
* @author Roshan Weerasuriya (roshan@jkcs.slt.lk, roshan@opensource.lk)
*/
+AXIS_CPP_NAMESPACE_START
+
class IDeployerUtils
{
public:
@@ -41,5 +43,7 @@
{
};
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.10.14.1 +5 -0 ws-axis/c/src/common/ISoapMethod.h
Index: ISoapMethod.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/ISoapMethod.h,v
retrieving revision 1.10
retrieving revision 1.10.14.1
diff -u -r1.10 -r1.10.14.1
--- ISoapMethod.h 26 Apr 2004 04:04:36 -0000 1.10
+++ ISoapMethod.h 28 Jul 2004 14:21:05 -0000 1.10.14.1
@@ -20,6 +20,9 @@
#define AXIS_SOAPMETHODBASE_H__OF_AXIS_INCLUDED_
#include <string>
+
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
/*
* @class ISoapMethod
@@ -39,5 +42,7 @@
{
};
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.25.2.1 +5 -1 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.25
retrieving revision 1.25.2.1
diff -u -r1.25 -r1.25.2.1
--- MessageData.cpp 26 Jul 2004 13:32:20 -0000 1.25
+++ MessageData.cpp 28 Jul 2004 14:21:05 -0000 1.25.2.1
@@ -24,8 +24,11 @@
#include "IDeployerUtils.h"
#include "../wsdd/WSDDDeployment.h"
+extern AXIS_CPP_NAMESPACE_PREFIX WSDDDeployment* g_pWSDDDeployment;
+
+AXIS_CPP_NAMESPACE_START
+
const AxisChar* MessageData::m_pachBlankPropertyValue = "";
-extern WSDDDeployment* g_pWSDDDeployment;
IMessageDataFunctions IMessageData::ms_VFtable;
AdminUtils MessageData::m_AdminUtil;
@@ -177,3 +180,4 @@
{
*pIAdminUtils = &m_AdminUtil;
}
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.15.2.1 +5 -0 ws-axis/c/src/common/MessageData.h
Index: MessageData.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/MessageData.h,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- MessageData.h 26 Jul 2004 13:32:20 -0000 1.15
+++ MessageData.h 28 Jul 2004 14:21:05 -0000 1.15.2.1
@@ -36,6 +36,9 @@
}
};
+AXIS_CPP_NAMESPACE_START
+using namespace std;
+
class MessageData : public IMessageData
{
public:
@@ -81,6 +84,8 @@
map <AxisChar*, AxisChar*, ltstr> m_Properties;
static const AxisChar* m_pachBlankPropertyValue;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.13.16.1 +2 -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.13
retrieving revision 1.13.16.1
diff -u -r1.13 -r1.13.16.1
--- Packet.cpp 8 Apr 2004 06:27:59 -0000 1.13
+++ Packet.cpp 28 Jul 2004 14:21:05 -0000 1.13.16.1
@@ -24,7 +24,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <axis/server/AxisTrace.h>
-extern AxisTrace* g_pAT;
+
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
extern "C"
{
1.37.12.1 +4 -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.37
retrieving revision 1.37.12.1
diff -u -r1.37 -r1.37.12.1
--- Param.cpp 6 Jul 2004 14:16:44 -0000 1.37
+++ Param.cpp 28 Jul 2004 14:21:05 -0000 1.37.12.1
@@ -28,6 +28,8 @@
#include "AxisUtils.h"
#include <axis/server/AxisUserAPI.h>
+AXIS_CPP_NAMESPACE_START
+
int AxisEngine::m_bServer;
@@ -370,3 +372,5 @@
m_TypeName = "";
m_URI = "";
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.21.12.1 +4 -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.21
retrieving revision 1.21.12.1
diff -u -r1.21 -r1.21.12.1
--- Param.h 6 Jul 2004 14:16:44 -0000 1.21
+++ Param.h 28 Jul 2004 14:21:05 -0000 1.21.12.1
@@ -23,6 +23,8 @@
#include <axis/server/IParam.h>
+AXIS_CPP_NAMESPACE_START
+
class ArrayBean;
/*
* @class Param
@@ -61,6 +63,8 @@
AXIS_OBJECT_DELETE_FUNCT pDelFunct);
void setName(const AxisChar* sName);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.15.4.1 +9 -3 ws-axis/c/src/common/TypeMapping.cpp
Index: TypeMapping.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/TypeMapping.cpp,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -u -r1.15 -r1.15.4.1
--- TypeMapping.cpp 23 Jul 2004 14:04:40 -0000 1.15
+++ TypeMapping.cpp 28 Jul 2004 14:21:05 -0000 1.15.4.1
@@ -24,11 +24,15 @@
#include "AxisUtils.h"
#define __TRC(X) AxisUtils::Convert(X)
+AXIS_CPP_NAMESPACE_START
+using namespace std;
+
#if !defined( AIX ) && !defined( __OS400__ )
-map < const AxisXMLString, XSDTYPE >
- TypeMapping::m_sTypeMap;
+std::map < const std::AxisXMLString, XSDTYPE >
+ AXIS_CPP_NAMESPACE_PREFIX TypeMapping::m_sTypeMap;
#else
-map < AxisXMLString, XSDTYPE > TypeMapping::m_sTypeMap;
+std::map < std::AxisXMLString, XSDTYPE >
+ AXIS_CPP_NAMESPACE_PREFIX TypeMapping::m_sTypeMap;
#endif
volatile bool TypeMapping::m_bInit = false;
@@ -85,3 +89,5 @@
}
return XSD_UNKNOWN;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
No revision
No revision
1.15.12.1 +6 -2 ws-axis/c/src/engine/AppScopeHandlerPool.cpp
Index: AppScopeHandlerPool.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AppScopeHandlerPool.cpp,v
retrieving revision 1.15
retrieving revision 1.15.12.1
diff -u -r1.15 -r1.15.12.1
--- AppScopeHandlerPool.cpp 15 Jul 2004 11:27:00 -0000 1.15
+++ AppScopeHandlerPool.cpp 28 Jul 2004 14:21:09 -0000 1.15.12.1
@@ -24,9 +24,11 @@
#include "HandlerLoader.h"
#include <axis/server/AxisException.h>
#include "../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
-extern HandlerLoader* g_pHandlerLoader;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX HandlerLoader* g_pHandlerLoader;
+
+AXIS_CPP_NAMESPACE_START
/* this class does not do the object level blocking. Instead expects the
* thread level blocking and waiting by the caller thread.
@@ -100,3 +102,5 @@
unlock ();
return AXIS_SUCCESS;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.8.14.1 +4 -0 ws-axis/c/src/engine/AppScopeHandlerPool.h
Index: AppScopeHandlerPool.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AppScopeHandlerPool.h,v
retrieving revision 1.8
retrieving revision 1.8.14.1
diff -u -r1.8 -r1.8.14.1
--- AppScopeHandlerPool.h 26 Apr 2004 04:04:36 -0000 1.8
+++ AppScopeHandlerPool.h 28 Jul 2004 14:21:09 -0000 1.8.14.1
@@ -26,6 +26,8 @@
#include <list>
#include <string>
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
/*
@@ -47,5 +49,7 @@
int getInstance (BasicHandler** pHandler, int nLibId);
int putInstance (BasicHandler* pHandler, int nLibId);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.64.12.1 +2 -0 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.64
retrieving revision 1.64.12.1
diff -u -r1.64 -r1.64.12.1
--- Axis.cpp 6 Jul 2004 14:16:45 -0000 1.64
+++ Axis.cpp 28 Jul 2004 14:21:09 -0000 1.64.12.1
@@ -61,6 +61,8 @@
#include "SOAPTransportFactory.h"
#include "XMLParserFactory.h"
+AXIS_CPP_NAMESPACE_USE
+
#define BYTESTOREAD 64
// The relative location of the wsdl files hardcoded
#define WSDLDIRECTORY "/wsdls/"
1.31.12.1 +8 -4 ws-axis/c/src/engine/AxisEngine.cpp
Index: AxisEngine.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngine.cpp,v
retrieving revision 1.31
retrieving revision 1.31.12.1
diff -u -r1.31 -r1.31.12.1
--- AxisEngine.cpp 6 Jul 2004 14:16:45 -0000 1.31
+++ AxisEngine.cpp 28 Jul 2004 14:21:09 -0000 1.31.12.1
@@ -25,13 +25,15 @@
#include "DeserializerPool.h"
#include "SerializerPool.h"
#include "../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
-extern DeserializerPool* g_pDeserializerPool;
-extern SerializerPool* g_pSerializerPool;
-extern HandlerPool* g_pHandlerPool;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX DeserializerPool* g_pDeserializerPool;
+extern AXIS_CPP_NAMESPACE_PREFIX SerializerPool* g_pSerializerPool;
+extern AXIS_CPP_NAMESPACE_PREFIX HandlerPool* g_pHandlerPool;
// extern WSDDDeployment* g_pWSDDDeployment;
+AXIS_CPP_NAMESPACE_START
+
AxisEngine::AxisEngine ()
{
m_pSZ = NULL;
@@ -115,3 +117,5 @@
return Status;
return Status;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.11.12.1 +4 -0 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.11
retrieving revision 1.11.12.1
diff -u -r1.11 -r1.11.12.1
--- AxisEngine.h 6 Jul 2004 14:16:45 -0000 1.11
+++ AxisEngine.h 28 Jul 2004 14:21:10 -0000 1.11.12.1
@@ -41,6 +41,8 @@
* @author Susantha Kumara (skumara@virtusa.com)
*/
+AXIS_CPP_NAMESPACE_START
+
class AxisEngine
{
protected:
@@ -68,6 +70,8 @@
virtual int initializeHandlers(string& sSessionId,
AXIS_PROTOCOL_TYPE protocol);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.13.12.1 +4 -0 ws-axis/c/src/engine/AxisEngineException.cpp
Index: AxisEngineException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngineException.cpp,v
retrieving revision 1.13
retrieving revision 1.13.12.1
diff -u -r1.13 -r1.13.12.1
--- AxisEngineException.cpp 6 Jul 2004 14:16:45 -0000 1.13
+++ AxisEngineException.cpp 28 Jul 2004 14:21:10 -0000 1.13.12.1
@@ -25,6 +25,9 @@
* Default when no parameter passed. When thrown with no parameter
* more general SERVER_ENGINE_EXCEPTION is assumed.
*/
+
+AXIS_CPP_NAMESPACE_START
+
AxisEngineException::AxisEngineException()
{
processException(SERVER_ENGINE_EXCEPTION);
@@ -150,3 +153,4 @@
return m_iExceptionCode;
}
+AXIS_CPP_NAMESPACE_END
1.3.12.1 +5 -0 ws-axis/c/src/engine/AxisEngineException.h
Index: AxisEngineException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngineException.h,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -r1.3 -r1.3.12.1
--- AxisEngineException.h 6 Jul 2004 14:16:45 -0000 1.3
+++ AxisEngineException.h 28 Jul 2004 14:21:10 -0000 1.3.12.1
@@ -23,6 +23,9 @@
#include <string>
#include <axis/server/AxisException.h>
+
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
class STORAGE_CLASS_INFO AxisEngineException :public AxisException
@@ -49,6 +52,8 @@
string m_sMessage;
int m_iExceptionCode;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.13.12.1 +9 -1 ws-axis/c/src/engine/DeserializerPool.cpp
Index: DeserializerPool.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/DeserializerPool.cpp,v
retrieving revision 1.13
retrieving revision 1.13.12.1
diff -u -r1.13 -r1.13.12.1
--- DeserializerPool.cpp 6 Jul 2004 14:16:45 -0000 1.13
+++ DeserializerPool.cpp 28 Jul 2004 14:21:10 -0000 1.13.12.1
@@ -21,7 +21,13 @@
#include "DeserializerPool.h"
#include "../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
+
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+
+AXIS_CPP_NAMESPACE_START
+
+using namespace std;
+
DeserializerPool::DeserializerPool ()
{
@@ -77,3 +83,5 @@
unlock ();
return AXIS_SUCCESS;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.10.12.1 +4 -0 ws-axis/c/src/engine/DeserializerPool.h
Index: DeserializerPool.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/DeserializerPool.h,v
retrieving revision 1.10
retrieving revision 1.10.12.1
diff -u -r1.10 -r1.10.12.1
--- DeserializerPool.h 6 Jul 2004 14:16:45 -0000 1.10
+++ DeserializerPool.h 28 Jul 2004 14:21:10 -0000 1.10.12.1
@@ -29,6 +29,8 @@
#include <axis/server/GDefine.h>
#include <list>
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
/**
@class DeserializerPool
@@ -48,5 +50,7 @@
int getInstance (IWrapperSoapDeSerializer** ppDZ);
int putInstance (IWrapperSoapDeSerializer* pDZ);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.17.12.1 +7 -1 ws-axis/c/src/engine/HandlerChain.cpp
Index: HandlerChain.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/HandlerChain.cpp,v
retrieving revision 1.17
retrieving revision 1.17.12.1
diff -u -r1.17 -r1.17.12.1
--- HandlerChain.cpp 6 Jul 2004 14:16:45 -0000 1.17
+++ HandlerChain.cpp 28 Jul 2004 14:21:10 -0000 1.17.12.1
@@ -22,7 +22,11 @@
#include "HandlerChain.h"
#include "../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
+
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+
+AXIS_CPP_NAMESPACE_START
+
HandlerChain::HandlerChain ()
{
@@ -111,3 +115,5 @@
m_HandlerList.clear ();
return AXIS_SUCCESS;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.8.12.1 +5 -0 ws-axis/c/src/engine/HandlerChain.h
Index: HandlerChain.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/HandlerChain.h,v
retrieving revision 1.8
retrieving revision 1.8.12.1
diff -u -r1.8 -r1.8.12.1
--- HandlerChain.h 6 Jul 2004 14:16:45 -0000 1.8
+++ HandlerChain.h 28 Jul 2004 14:21:10 -0000 1.8.12.1
@@ -25,6 +25,9 @@
* @brief interface for the HandlerChain class.
* @author Susantha Kumara (skumara@virtusa.com)
*/
+
+AXIS_CPP_NAMESPACE_START
+
class HandlerChain : public HandlerBase
{
friend class HandlerPool;
@@ -51,6 +54,8 @@
list<ChainItem> m_HandlerList;
list<ChainItem>::iterator m_itCurrHandler;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.29.12.1 +6 -2 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.29
retrieving revision 1.29.12.1
diff -u -r1.29 -r1.29.12.1
--- HandlerLoader.cpp 15 Jul 2004 11:27:00 -0000 1.29
+++ HandlerLoader.cpp 28 Jul 2004 14:21:10 -0000 1.29.12.1
@@ -28,9 +28,11 @@
#include "../common/AxisUtils.h"
#include "../wsdd/WSDDDeployment.h"
#include "../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
-extern WSDDDeployment* g_pWSDDDeployment;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX WSDDDeployment* g_pWSDDDeployment;
+
+AXIS_CPP_NAMESPACE_START
HandlerLoader::HandlerLoader ()
{
@@ -245,3 +247,5 @@
//return SERVER_ENGINE_HANDLERCREATIONFAILED;
}
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.14.12.1 +6 -2 ws-axis/c/src/engine/HandlerLoader.h
Index: HandlerLoader.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/HandlerLoader.h,v
retrieving revision 1.14
retrieving revision 1.14.12.1
diff -u -r1.14 -r1.14.12.1
--- HandlerLoader.h 6 Jul 2004 14:16:45 -0000 1.14
+++ HandlerLoader.h 28 Jul 2004 14:21:10 -0000 1.14.12.1
@@ -34,9 +34,13 @@
#define CREATE_FUNCTION "GetClassInstance"
#define DELETE_FUNCTION "DestroyInstance"
+AXIS_CPP_NAMESPACE_START
+
typedef int (* CREATE_OBJECT) (BasicHandler** inst);
typedef int (* DELETE_OBJECT) (BasicHandler* inst);
+AXIS_CPP_NAMESPACE_END
+
#if defined(USE_LTDL)
#include <ltdl.h>
#define DLHandler lt_dlhandle
@@ -68,7 +72,7 @@
*
* @author Susantha Kumara (skumara@virtusa.com)
*/
-
+AXIS_CPP_NAMESPACE_START
class HandlerLoader:protected SharedObject
{
private:
@@ -100,6 +104,6 @@
int loadLib (HandlerInformation* pHandlerInfo);
int unloadLib (HandlerInformation* pHandlerInfo);
};
-
+AXIS_CPP_NAMESPACE_END
#endif
1.29.12.1 +9 -5 ws-axis/c/src/engine/HandlerPool.cpp
Index: HandlerPool.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/HandlerPool.cpp,v
retrieving revision 1.29
retrieving revision 1.29.12.1
diff -u -r1.29 -r1.29.12.1
--- HandlerPool.cpp 6 Jul 2004 14:16:45 -0000 1.29
+++ HandlerPool.cpp 28 Jul 2004 14:21:11 -0000 1.29.12.1
@@ -27,12 +27,14 @@
#include "../wsdd/WSDDDeployment.h"
#include <axis/server/AxisException.h>
#include "../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
-extern AppScopeHandlerPool* g_pAppScopeHandlerPool;
-extern RequestScopeHandlerPool* g_pRequestScopeHandlerPool;
-extern SessionScopeHandlerPool* g_pSessionScopeHandlerPool;
-extern WSDDDeployment* g_pWSDDDeployment;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX AppScopeHandlerPool* g_pAppScopeHandlerPool;
+extern AXIS_CPP_NAMESPACE_PREFIX RequestScopeHandlerPool* g_pRequestScopeHandlerPool;
+extern AXIS_CPP_NAMESPACE_PREFIX SessionScopeHandlerPool* g_pSessionScopeHandlerPool;
+extern AXIS_CPP_NAMESPACE_PREFIX WSDDDeployment* g_pWSDDDeployment;
+
+AXIS_CPP_NAMESPACE_START
HandlerPool::HandlerPool ()
{
@@ -358,3 +360,5 @@
poolHandler (sSessionId, pHandler, pHandlerInfo->getScope (),
pHandlerInfo->getLibId ());
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.10.12.1 +4 -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.10
retrieving revision 1.10.12.1
diff -u -r1.10 -r1.10.12.1
--- HandlerPool.h 6 Jul 2004 14:16:45 -0000 1.10
+++ HandlerPool.h 28 Jul 2004 14:21:11 -0000 1.10.12.1
@@ -33,6 +33,8 @@
#include <list>
#include <string>
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
/*
* @class HandlerPool
@@ -76,5 +78,7 @@
private:
list <HandlerChain*>m_ChainStore;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.10.14.1 +4 -1 ws-axis/c/src/engine/RequestScopeHandlerPool.cpp
Index: RequestScopeHandlerPool.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/RequestScopeHandlerPool.cpp,v
retrieving revision 1.10
retrieving revision 1.10.14.1
diff -u -r1.10 -r1.10.14.1
--- RequestScopeHandlerPool.cpp 26 Apr 2004 04:04:36 -0000 1.10
+++ RequestScopeHandlerPool.cpp 28 Jul 2004 14:21:11 -0000 1.10.14.1
@@ -23,8 +23,9 @@
#include "RequestScopeHandlerPool.h"
#include "HandlerLoader.h"
+extern AXIS_CPP_NAMESPACE_PREFIX HandlerLoader* g_pHandlerLoader;
-extern HandlerLoader* g_pHandlerLoader;
+AXIS_CPP_NAMESPACE_START
RequestScopeHandlerPool::RequestScopeHandlerPool ()
{
@@ -95,3 +96,5 @@
unlock ();
return AXIS_SUCCESS;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.8.14.1 +4 -0 ws-axis/c/src/engine/RequestScopeHandlerPool.h
Index: RequestScopeHandlerPool.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/RequestScopeHandlerPool.h,v
retrieving revision 1.8
retrieving revision 1.8.14.1
diff -u -r1.8 -r1.8.14.1
--- RequestScopeHandlerPool.h 26 Apr 2004 04:04:36 -0000 1.8
+++ RequestScopeHandlerPool.h 28 Jul 2004 14:21:11 -0000 1.8.14.1
@@ -25,6 +25,8 @@
#include <list>
#include <string>
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
/*
* @class RequestScopeHandlerPool
@@ -45,5 +47,7 @@
int getInstance (BasicHandler** pHandler, int nLibId);
int putInstance (BasicHandler* pHandler, int nLibId);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.10.12.1 +5 -2 ws-axis/c/src/engine/SOAPTransportFactory.cpp
Index: SOAPTransportFactory.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/SOAPTransportFactory.cpp,v
retrieving revision 1.10
retrieving revision 1.10.12.1
diff -u -r1.10 -r1.10.12.1
--- SOAPTransportFactory.cpp 15 Jul 2004 11:27:00 -0000 1.10
+++ SOAPTransportFactory.cpp 28 Jul 2004 14:21:11 -0000 1.10.12.1
@@ -28,8 +28,10 @@
#include "AxisEngineException.h"
#include "../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
-extern AxisConfig* g_pConfig;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisConfig* g_pConfig;
+
+AXIS_CPP_NAMESPACE_START
const char* SOAPTransportFactory::m_pcLibraryPath = 0;
DLHandler SOAPTransportFactory::m_LibHandler = 0;
@@ -139,3 +141,4 @@
return AXIS_SUCCESS;
}
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.2.14.1 +4 -0 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.2
retrieving revision 1.2.14.1
diff -u -r1.2 -r1.2.14.1
--- SOAPTransportFactory.h 25 May 2004 03:47:33 -0000 1.2
+++ SOAPTransportFactory.h 28 Jul 2004 14:21:12 -0000 1.2.14.1
@@ -42,6 +42,8 @@
#define DLHandler void*
#endif
+AXIS_CPP_NAMESPACE_START
+
class SOAPTransport;
typedef int (* CREATE_OBJECT1) (SOAPTransport** inst);
@@ -82,6 +84,8 @@
static DELETE_OBJECT1 m_Delete;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.15.12.1 +7 -1 ws-axis/c/src/engine/SerializerPool.cpp
Index: SerializerPool.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/SerializerPool.cpp,v
retrieving revision 1.15
retrieving revision 1.15.12.1
diff -u -r1.15 -r1.15.12.1
--- SerializerPool.cpp 6 Jul 2004 14:16:45 -0000 1.15
+++ SerializerPool.cpp 28 Jul 2004 14:21:12 -0000 1.15.12.1
@@ -21,7 +21,11 @@
#include "SerializerPool.h"
#include "../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
+
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+
+AXIS_CPP_NAMESPACE_START
+
SerializerPool::SerializerPool ()
{
@@ -74,3 +78,5 @@
unlock ();
return AXIS_SUCCESS;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.10.12.1 +4 -0 ws-axis/c/src/engine/SerializerPool.h
Index: SerializerPool.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/SerializerPool.h,v
retrieving revision 1.10
retrieving revision 1.10.12.1
diff -u -r1.10 -r1.10.12.1
--- SerializerPool.h 6 Jul 2004 14:16:45 -0000 1.10
+++ SerializerPool.h 28 Jul 2004 14:21:12 -0000 1.10.12.1
@@ -29,6 +29,8 @@
#include <axis/server/GDefine.h>
#include <list>
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
/*
* @class SerializerPool
@@ -49,5 +51,7 @@
int getInstance (IWrapperSoapSerializer** ppSZ);
int putInstance (IWrapperSoapSerializer* pSZ);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.11.14.1 +5 -1 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.11
retrieving revision 1.11.14.1
diff -u -r1.11 -r1.11.14.1
--- SessionScopeHandlerPool.cpp 26 Apr 2004 04:04:36 -0000 1.11
+++ SessionScopeHandlerPool.cpp 28 Jul 2004 14:21:12 -0000 1.11.14.1
@@ -27,7 +27,9 @@
#include "HandlerLoader.h"
-extern HandlerLoader* g_pHandlerLoader;
+extern AXIS_CPP_NAMESPACE_PREFIX HandlerLoader* g_pHandlerLoader;
+
+AXIS_CPP_NAMESPACE_START
SessionScopeHandlerPool::SessionScopeHandlerPool ()
{
@@ -154,3 +156,5 @@
* to SESSIONLESSHANDLERS
*/
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.8.14.1 +4 -0 ws-axis/c/src/engine/SessionScopeHandlerPool.h
Index: SessionScopeHandlerPool.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/SessionScopeHandlerPool.h,v
retrieving revision 1.8
retrieving revision 1.8.14.1
diff -u -r1.8 -r1.8.14.1
--- SessionScopeHandlerPool.h 26 Apr 2004 04:04:36 -0000 1.8
+++ SessionScopeHandlerPool.h 28 Jul 2004 14:21:12 -0000 1.8.14.1
@@ -29,6 +29,8 @@
#include <list>
#include <string>
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
/*
* @class SessionScopeHandlerPool
@@ -52,5 +54,7 @@
int nLibId);
void endSession (string &sSessionId);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.9.14.1 +4 -0 ws-axis/c/src/engine/SharedObject.cpp
Index: SharedObject.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/SharedObject.cpp,v
retrieving revision 1.9
retrieving revision 1.9.14.1
diff -u -r1.9 -r1.9.14.1
--- SharedObject.cpp 10 May 2004 12:02:59 -0000 1.9
+++ SharedObject.cpp 28 Jul 2004 14:21:12 -0000 1.9.14.1
@@ -21,6 +21,8 @@
#include "SharedObject.h"
+AXIS_CPP_NAMESPACE_START
+
SharedObject::SharedObject ()
{
m_bLocked = false;
@@ -67,3 +69,5 @@
m_bLocked = false;
return 0;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.13.14.1 +5 -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.13
retrieving revision 1.13.14.1
diff -u -r1.13 -r1.13.14.1
--- SharedObject.h 26 Apr 2004 04:04:36 -0000 1.13
+++ SharedObject.h 28 Jul 2004 14:21:12 -0000 1.13.14.1
@@ -36,6 +36,9 @@
* @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
*
*/
+
+AXIS_CPP_NAMESPACE_START
+
class SharedObject
{
public:
@@ -51,5 +54,7 @@
pthread_mutex_t *mut;
#endif
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.14.12.1 +4 -2 ws-axis/c/src/engine/XMLParserFactory.cpp
Index: XMLParserFactory.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/XMLParserFactory.cpp,v
retrieving revision 1.14
retrieving revision 1.14.12.1
diff -u -r1.14 -r1.14.12.1
--- XMLParserFactory.cpp 15 Jul 2004 11:27:00 -0000 1.14
+++ XMLParserFactory.cpp 28 Jul 2004 14:21:12 -0000 1.14.12.1
@@ -28,9 +28,10 @@
#include "AxisEngineException.h"
#include "../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisConfig* g_pConfig;
-extern AxisConfig* g_pConfig;
+AXIS_CPP_NAMESPACE_START
const char* XMLParserFactory::m_pcLibraryPath = 0;
DLHandler XMLParserFactory::m_LibHandler = 0;
@@ -140,3 +141,4 @@
return AXIS_SUCCESS;
}
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.3.12.1 +2 -2 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.3
retrieving revision 1.3.12.1
diff -u -r1.3 -r1.3.12.1
--- XMLParserFactory.h 6 Jul 2004 14:16:45 -0000 1.3
+++ XMLParserFactory.h 28 Jul 2004 14:21:12 -0000 1.3.12.1
@@ -45,7 +45,7 @@
typedef int (* CREATE_OBJECT2) (XMLParser** inst);
typedef int (* DELETE_OBJECT2) (XMLParser* inst);
-
+AXIS_CPP_NAMESPACE_START
class XMLParserFactory
{
public:
@@ -83,6 +83,6 @@
static DELETE_OBJECT2 m_Delete;
};
-
+AXIS_CPP_NAMESPACE_END
#endif
No revision
No revision
1.52.12.1 +2 -0 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.52
retrieving revision 1.52.12.1
diff -u -r1.52 -r1.52.12.1
--- Call.cpp 6 Jul 2004 14:16:46 -0000 1.52
+++ Call.cpp 28 Jul 2004 14:21:14 -0000 1.52.12.1
@@ -39,6 +39,8 @@
extern "C" int initialize_module (int bServer);
+AXIS_CPP_NAMESPACE_USE
+
bool CallBase::bInitialized = false;
CallFunctions CallBase::ms_VFtable;
1.14.12.1 +6 -3 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.14
retrieving revision 1.14.12.1
diff -u -r1.14 -r1.14.12.1
--- ClientAxisEngine.cpp 15 Jul 2004 11:27:00 -0000 1.14
+++ ClientAxisEngine.cpp 28 Jul 2004 14:21:14 -0000 1.14.12.1
@@ -20,11 +20,12 @@
#include "../HandlerPool.h"
#include <axis/server/AxisException.h>
#include "../../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
-extern WSDDDeployment* g_pWSDDDeployment;
-extern HandlerPool* g_pHandlerPool;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX WSDDDeployment* g_pWSDDDeployment;
+extern AXIS_CPP_NAMESPACE_PREFIX HandlerPool* g_pHandlerPool;
+AXIS_CPP_NAMESPACE_START
ClientAxisEngine::ClientAxisEngine ()
{
@@ -224,3 +225,5 @@
{
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.8.12.1 +2 -1 ws-axis/c/src/engine/client/ClientAxisEngine.h
Index: ClientAxisEngine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/ClientAxisEngine.h,v
retrieving revision 1.8
retrieving revision 1.8.12.1
diff -u -r1.8 -r1.8.12.1
--- ClientAxisEngine.h 6 Jul 2004 14:16:46 -0000 1.8
+++ ClientAxisEngine.h 28 Jul 2004 14:21:14 -0000 1.8.12.1
@@ -26,6 +26,7 @@
*
* @author Susantha Kumara (skumara@virtusa.com)
*/
+AXIS_CPP_NAMESPACE_START
class ClientAxisEngine:public AxisEngine
{
public:
@@ -39,5 +40,5 @@
private:
SOAPTransport* m_pSoap;
};
-
+AXIS_CPP_NAMESPACE_END
#endif
No revision
No revision
1.21.12.1 +6 -3 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.21
retrieving revision 1.21.12.1
diff -u -r1.21 -r1.21.12.1
--- ServerAxisEngine.cpp 15 Jul 2004 11:27:00 -0000 1.21
+++ ServerAxisEngine.cpp 28 Jul 2004 14:21:15 -0000 1.21.12.1
@@ -24,11 +24,12 @@
#include "../HandlerPool.h"
#include "../../common/AxisMessage.h"
#include "../../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
-extern HandlerPool* g_pHandlerPool;
-extern WSDDDeployment* g_pWSDDDeployment;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX HandlerPool* g_pHandlerPool;
+extern AXIS_CPP_NAMESPACE_PREFIX WSDDDeployment* g_pWSDDDeployment;
+AXIS_CPP_NAMESPACE_START
ServerAxisEngine::ServerAxisEngine ()
{
@@ -516,3 +517,5 @@
return AXIS_SUCCESS;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.9.12.1 +5 -0 ws-axis/c/src/engine/server/ServerAxisEngine.h
Index: ServerAxisEngine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/server/ServerAxisEngine.h,v
retrieving revision 1.9
retrieving revision 1.9.12.1
diff -u -r1.9 -r1.9.12.1
--- ServerAxisEngine.h 6 Jul 2004 14:16:46 -0000 1.9
+++ ServerAxisEngine.h 28 Jul 2004 14:21:15 -0000 1.9.12.1
@@ -30,6 +30,9 @@
*
* @author Susantha Kumara (skumara@virtusa.com)
*/
+
+AXIS_CPP_NAMESPACE_START
+
class ServerAxisEngine:public AxisEngine
{
private:
@@ -56,5 +59,7 @@
virtual int invoke(MessageData* pMsg);
virtual void onFault(MessageData* pMsg);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
No revision
No revision
1.5.12.1 +2 -0 ws-axis/c/src/server/apache/ApacheTransport.h
Index: ApacheTransport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache/ApacheTransport.h,v
retrieving revision 1.5
retrieving revision 1.5.12.1
diff -u -r1.5 -r1.5.12.1
--- ApacheTransport.h 20 Jul 2004 03:48:12 -0000 1.5
+++ ApacheTransport.h 28 Jul 2004 14:21:15 -0000 1.5.12.1
@@ -45,6 +45,8 @@
#include "../../transport/SOAPTransport.h"
#include <string.h>
+AXIS_CPP_NAMESPACE_USE
+
class ApacheTransport : public SOAPTransport
{
public:
No revision
No revision
1.6.12.1 +2 -0 ws-axis/c/src/server/apache2/Apache2Transport.h
Index: Apache2Transport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache2/Apache2Transport.h,v
retrieving revision 1.6
retrieving revision 1.6.12.1
diff -u -r1.6 -r1.6.12.1
--- Apache2Transport.h 21 Jul 2004 05:31:42 -0000 1.6
+++ Apache2Transport.h 28 Jul 2004 14:21:15 -0000 1.6.12.1
@@ -47,6 +47,8 @@
#include <string.h>
#endif
+AXIS_CPP_NAMESPACE_USE
+
class Apache2Transport : public SOAPTransport
{
public:
No revision
No revision
1.21.2.1 +4 -0 ws-axis/c/src/soap/Attribute.cpp
Index: Attribute.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/Attribute.cpp,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- Attribute.cpp 26 Jul 2004 13:43:48 -0000 1.21
+++ Attribute.cpp 28 Jul 2004 14:21:15 -0000 1.21.2.1
@@ -41,6 +41,8 @@
#include <axis/server/GDefine.h>
#include "SoapSerializer.h"
+AXIS_CPP_NAMESPACE_START
+
AttributeFunctions Attribute::ms_VFtable;
bool Attribute::bInitialized = false;
@@ -215,3 +217,5 @@
m_prefix= prefix;
m_value= value;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.13.12.1 +4 -0 ws-axis/c/src/soap/AxisSoapException.cpp
Index: AxisSoapException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/AxisSoapException.cpp,v
retrieving revision 1.13
retrieving revision 1.13.12.1
diff -u -r1.13 -r1.13.12.1
--- AxisSoapException.cpp 6 Jul 2004 14:16:46 -0000 1.13
+++ AxisSoapException.cpp 28 Jul 2004 14:21:15 -0000 1.13.12.1
@@ -25,6 +25,9 @@
* Default when no parameter passed. When thrown with no parameter
* more general SERVER_SOAP_EXCEPTION is assumed.
*/
+
+AXIS_CPP_NAMESPACE_START
+
AxisSoapException::AxisSoapException()
{
processException(SERVER_SOAP_EXCEPTION);
@@ -132,3 +135,4 @@
return m_iExceptionCode;
}
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.4.12.1 +5 -0 ws-axis/c/src/soap/AxisSoapException.h
Index: AxisSoapException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/AxisSoapException.h,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -u -r1.4 -r1.4.12.1
--- AxisSoapException.h 6 Jul 2004 14:16:46 -0000 1.4
+++ AxisSoapException.h 28 Jul 2004 14:21:15 -0000 1.4.12.1
@@ -23,6 +23,9 @@
#include <string>
#include <axis/server/AxisException.h>
+
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
class STORAGE_CLASS_INFO AxisSoapException :public AxisException
@@ -49,6 +52,8 @@
string m_sMessage;
int m_iExceptionCode;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.7.14.1 +4 -0 ws-axis/c/src/soap/BasicNode.cpp
Index: BasicNode.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/BasicNode.cpp,v
retrieving revision 1.7
retrieving revision 1.7.14.1
diff -u -r1.7 -r1.7.14.1
--- BasicNode.cpp 1 Jun 2004 06:42:18 -0000 1.7
+++ BasicNode.cpp 28 Jul 2004 14:21:15 -0000 1.7.14.1
@@ -35,6 +35,9 @@
#include <axis/server/BasicNode.h>
+
+AXIS_CPP_NAMESPACE_START
+
BasicNode::BasicNode():m_pachValue(NULL)
{}
@@ -63,3 +66,4 @@
free(m_pachValue);
}
+AXIS_CPP_NAMESPACE_END
1.16.12.1 +4 -0 ws-axis/c/src/soap/CharacterElement.cpp
Index: CharacterElement.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/CharacterElement.cpp,v
retrieving revision 1.16
retrieving revision 1.16.12.1
diff -u -r1.16 -r1.16.12.1
--- CharacterElement.cpp 6 Jul 2004 14:16:46 -0000 1.16
+++ CharacterElement.cpp 28 Jul 2004 14:21:16 -0000 1.16.12.1
@@ -42,6 +42,8 @@
#include "SoapSerializer.h"
#include <axis/server/GDefine.h>
+AXIS_CPP_NAMESPACE_START
+
CharacterElement::CharacterElement():BasicNode( NULL, CHARACTER_NODE)
{
}
@@ -106,3 +108,5 @@
}
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.7.12.1 +5 -0 ws-axis/c/src/soap/CharacterElement.h
Index: CharacterElement.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/CharacterElement.h,v
retrieving revision 1.7
retrieving revision 1.7.12.1
diff -u -r1.7 -r1.7.12.1
--- CharacterElement.h 6 Jul 2004 14:16:46 -0000 1.7
+++ CharacterElement.h 28 Jul 2004 14:21:16 -0000 1.7.12.1
@@ -42,6 +42,9 @@
* @author Roshan Weerasuriya (roshan@opensource.lk, roshanw@jkcsworld.com)
* @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*/
+
+AXIS_CPP_NAMESPACE_START
+
class CharacterElement : public BasicNode
{
public:
@@ -181,5 +184,7 @@
*/
virtual ~CharacterElement();
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.18.12.1 +4 -0 ws-axis/c/src/soap/ComplexElement.cpp
Index: ComplexElement.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/ComplexElement.cpp,v
retrieving revision 1.18
retrieving revision 1.18.12.1
diff -u -r1.18 -r1.18.12.1
--- ComplexElement.cpp 6 Jul 2004 14:16:46 -0000 1.18
+++ ComplexElement.cpp 28 Jul 2004 14:21:16 -0000 1.18.12.1
@@ -46,6 +46,8 @@
#include "SoapSerializer.h"
#include <axis/server/GDefine.h>
+AXIS_CPP_NAMESPACE_START
+
ComplexElement::ComplexElement()
{
m_pachPrefix = '\0';
@@ -366,3 +368,5 @@
{
return iNoOfChildren;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.12.14.1 +4 -0 ws-axis/c/src/soap/ComplexElement.h
Index: ComplexElement.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/ComplexElement.h,v
retrieving revision 1.12
retrieving revision 1.12.14.1
diff -u -r1.12 -r1.12.14.1
--- ComplexElement.h 13 Jun 2004 14:20:17 -0000 1.12
+++ ComplexElement.h 28 Jul 2004 14:21:16 -0000 1.12.14.1
@@ -45,6 +45,8 @@
#include <list>
#include <axis/server/BasicNode.h>
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
/**
@@ -178,5 +180,7 @@
AxisChar* m_pachLocalName;
AxisChar* m_pachURI;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.28.2.1 +4 -0 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.28
retrieving revision 1.28.2.1
diff -u -r1.28 -r1.28.2.1
--- HeaderBlock.cpp 26 Jul 2004 13:43:48 -0000 1.28
+++ HeaderBlock.cpp 28 Jul 2004 14:21:16 -0000 1.28.2.1
@@ -60,6 +60,8 @@
#include "CharacterElement.h"
#include <axis/server/Attribute.h>
+AXIS_CPP_NAMESPACE_START
+
HeaderBlockFunctions IHeaderBlock::ms_VFtable;
bool IHeaderBlock::bInitialized = false;
@@ -710,3 +712,5 @@
return NULL;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.12.2.1 +8 -3 ws-axis/c/src/soap/HeaderBlock.h
Index: HeaderBlock.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/HeaderBlock.h,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- HeaderBlock.h 26 Jul 2004 13:43:48 -0000 1.12
+++ HeaderBlock.h 28 Jul 2004 14:21:16 -0000 1.12.2.1
@@ -18,8 +18,13 @@
#if !defined(_HEADERBLOCK_H____OF_AXIS_INCLUDED_)
#define _HEADERBLOCK_H____OF_AXIS_INCLUDED_
-class BasicNode;
#include <axis/server/IHeaderBlock.h>
+#include <string>
+
+AXIS_CPP_NAMESPACE_START
+
+using namespace std;
+class BasicNode;
/*
* @class BasicNode
@@ -63,9 +68,7 @@
* Added doxygen comments to help autobuild API docs
*/
-#include <string>
-using namespace std;
class HeaderBlock : public IHeaderBlock
{
@@ -382,6 +385,8 @@
int serialize(SoapSerializer& pSZ);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.25.12.1 +7 -1 ws-axis/c/src/soap/SoapBody.cpp
Index: SoapBody.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapBody.cpp,v
retrieving revision 1.25
retrieving revision 1.25.12.1
diff -u -r1.25 -r1.25.12.1
--- SoapBody.cpp 6 Jul 2004 14:16:46 -0000 1.25
+++ SoapBody.cpp 28 Jul 2004 14:21:16 -0000 1.25.12.1
@@ -41,7 +41,11 @@
#include <axis/server/GDefine.h>
#include <axis/server/Attribute.h>
#include "../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
+
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+
+AXIS_CPP_NAMESPACE_START
+
SoapBody::SoapBody()
{
@@ -148,6 +152,8 @@
return iStatus;
}
+
+AXIS_CPP_NAMESPACE_END
#ifdef UNIT_TESTING_ON
int SoapBody::initializeForTesting()
1.13.14.1 +4 -0 ws-axis/c/src/soap/SoapBody.h
Index: SoapBody.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapBody.h,v
retrieving revision 1.13
retrieving revision 1.13.14.1
diff -u -r1.13 -r1.13.14.1
--- SoapBody.h 14 Jun 2004 08:00:46 -0000 1.13
+++ SoapBody.h 28 Jul 2004 14:21:16 -0000 1.13.14.1
@@ -21,6 +21,8 @@
#include "SoapFault.h"
#include <axis/server/SoapEnvVersions.h>
+AXIS_CPP_NAMESPACE_START
+
class Attribute;
/*
@@ -84,5 +86,7 @@
virtual ~SoapBody();
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.76.10.1 +5 -1 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.76
retrieving revision 1.76.10.1
diff -u -r1.76 -r1.76.10.1
--- SoapDeSerializer.cpp 23 Jul 2004 05:53:05 -0000 1.76
+++ SoapDeSerializer.cpp 28 Jul 2004 14:21:16 -0000 1.76.10.1
@@ -64,7 +64,10 @@
#include <list>
-extern AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+
+AXIS_CPP_NAMESPACE_START
+
#define INITIAL_ARRAY_SIZE 1
@@ -3351,3 +3354,4 @@
}
}
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.17.12.1 +5 -1 ws-axis/c/src/soap/SoapDeSerializer.h
Index: SoapDeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.h,v
retrieving revision 1.17
retrieving revision 1.17.12.1
diff -u -r1.17 -r1.17.12.1
--- SoapDeSerializer.h 6 Jul 2004 14:16:46 -0000 1.17
+++ SoapDeSerializer.h 28 Jul 2004 14:21:16 -0000 1.17.12.1
@@ -21,13 +21,15 @@
#include "HeaderBlock.h"
#include "../xml/XMLParser.h"
+AXIS_CPP_NAMESPACE_START
+
class SoapFault;
class SoapMethod;
class SoapBody;
class SoapEnvelope;
class SoapHeader;
class IHeaderBlock;
-
+using namespace std;
/*
* @class SoapDeSerializer
* @brief interface for the SoapDeSerializer class.
@@ -212,6 +214,8 @@
xsd__base64Binary decodeFromBase64Binary(const AxisChar* pValue);
xsd__hexBinary decodeFromHexBinary(const AxisChar* pValue);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.22.12.1 +5 -1 ws-axis/c/src/soap/SoapEnvelope.cpp
Index: SoapEnvelope.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapEnvelope.cpp,v
retrieving revision 1.22
retrieving revision 1.22.12.1
diff -u -r1.22 -r1.22.12.1
--- SoapEnvelope.cpp 6 Jul 2004 14:16:46 -0000 1.22
+++ SoapEnvelope.cpp 28 Jul 2004 14:21:16 -0000 1.22.12.1
@@ -29,8 +29,10 @@
#include <stdio.h>
#include "../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+
+AXIS_CPP_NAMESPACE_START
SoapEnvelope::SoapEnvelope()
{
@@ -291,6 +293,8 @@
}
return AXIS_SUCCESS;
}
+
+AXIS_CPP_NAMESPACE_END
#ifdef UNIT_TESTING_ON
int SoapEnvelope::initializeForTesting(SOAP_VERSION eSoapVersion)
1.13.12.1 +4 -0 ws-axis/c/src/soap/SoapEnvelope.h
Index: SoapEnvelope.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapEnvelope.h,v
retrieving revision 1.13
retrieving revision 1.13.12.1
diff -u -r1.13 -r1.13.12.1
--- SoapEnvelope.h 6 Jul 2004 14:16:46 -0000 1.13
+++ SoapEnvelope.h 28 Jul 2004 14:21:16 -0000 1.13.12.1
@@ -28,6 +28,8 @@
* @author Roshan Weerasuriya (roshan@jkcs.slt.lk)
*/
+AXIS_CPP_NAMESPACE_START
+
class SoapEnvelope
{
friend class SoapSerializer;
@@ -62,5 +64,7 @@
SoapEnvelope();
virtual ~SoapEnvelope();
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.35.12.1 +6 -2 ws-axis/c/src/soap/SoapFault.cpp
Index: SoapFault.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapFault.cpp,v
retrieving revision 1.35
retrieving revision 1.35.12.1
diff -u -r1.35 -r1.35.12.1
--- SoapFault.cpp 6 Jul 2004 14:16:46 -0000 1.35
+++ SoapFault.cpp 28 Jul 2004 14:21:16 -0000 1.35.12.1
@@ -47,8 +47,11 @@
#include <axis/server/GDefine.h>
#include "../common/AxisTrace.h"
#include "../common/AxisConfig.h"
-extern AxisTrace* g_pAT;
-extern AxisConfig* g_pConfig;
+
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisConfig* g_pConfig;
+
+AXIS_CPP_NAMESPACE_START
volatile bool SoapFault::m_bInit = false;
@@ -410,3 +413,4 @@
return false;
}
+AXIS_CPP_NAMESPACE_END
1.6.12.1 +7 -2 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.6
retrieving revision 1.6.12.1
diff -u -r1.6 -r1.6.12.1
--- SoapFault.h 6 Jul 2004 14:16:46 -0000 1.6
+++ SoapFault.h 28 Jul 2004 14:21:16 -0000 1.6.12.1
@@ -25,8 +25,6 @@
#include <axis/ISoapFault.h>
#include "../common/Param.h"
#include <axis/server/SoapEnvVersions.h>
-class SoapSerializer;
-class SoapDeSerializer;
#include <string>
#include <map>
@@ -67,6 +65,11 @@
* "SOAP_VERSION eSoapVersion" to the "serialize" method.
*/
+AXIS_CPP_NAMESPACE_START
+
+class SoapSerializer;
+class SoapDeSerializer;
+
class SoapFault : public ISoapFault
{
friend class SoapFaultsTestCase;
@@ -149,6 +152,8 @@
bool m_bIsSimpleDetail;
static volatile bool m_bInit;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.23.2.1 +4 -0 ws-axis/c/src/soap/SoapHeader.cpp
Index: SoapHeader.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapHeader.cpp,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- SoapHeader.cpp 26 Jul 2004 13:58:49 -0000 1.23
+++ SoapHeader.cpp 28 Jul 2004 14:21:16 -0000 1.23.2.1
@@ -36,6 +36,8 @@
#include <axis/server/Attribute.h>
#include "HeaderBlock.h"
+AXIS_CPP_NAMESPACE_START
+
SoapHeader::SoapHeader()
{
@@ -263,3 +265,5 @@
tmpIHeaderBlock = *m_itHeaderBlocks;
return tmpIHeaderBlock;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.9.2.1 +3 -1 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.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- SoapHeader.h 26 Jul 2004 13:58:49 -0000 1.9
+++ SoapHeader.h 28 Jul 2004 14:21:16 -0000 1.9.2.1
@@ -55,6 +55,8 @@
HEADER_LEVEL=0, HEADER_BLOCK_LEVEL, HEADER_BLOCK_INSIDE_LEVEL
} HEADER_LEVELS;
+AXIS_CPP_NAMESPACE_START
+
class SoapHeader : public ISoapHeader
{
private:
@@ -144,6 +146,6 @@
*/
virtual ~SoapHeader();
};
-
+AXIS_CPP_NAMESPACE_END
#endif
1.9.14.1 +3 -1 ws-axis/c/src/soap/SoapKeywordMapping.cpp
Index: SoapKeywordMapping.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapKeywordMapping.cpp,v
retrieving revision 1.9
retrieving revision 1.9.14.1
diff -u -r1.9 -r1.9.14.1
--- SoapKeywordMapping.cpp 10 May 2004 11:16:33 -0000 1.9
+++ SoapKeywordMapping.cpp 28 Jul 2004 14:21:16 -0000 1.9.14.1
@@ -23,6 +23,8 @@
#include <axis/server/Attribute.h>
#include "../common/AxisUtils.h"
+AXIS_CPP_NAMESPACE_START
+
//map<int, SoapKeywordStruct> SoapKeywordMapping::m_Map;
SoapKeywordStruct SoapKeywordMapping::m_Map[VERSION_LAST];
volatile bool SoapKeywordMapping::m_bInit = false;
@@ -92,4 +94,4 @@
{
return m_Map[nVersion];
}
-
+AXIS_CPP_NAMESPACE_END
1.9.14.1 +5 -2 ws-axis/c/src/soap/SoapKeywordMapping.h
Index: SoapKeywordMapping.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapKeywordMapping.h,v
retrieving revision 1.9
retrieving revision 1.9.14.1
diff -u -r1.9 -r1.9.14.1
--- SoapKeywordMapping.h 10 May 2004 11:16:33 -0000 1.9
+++ SoapKeywordMapping.h 28 Jul 2004 14:21:16 -0000 1.9.14.1
@@ -23,6 +23,8 @@
using namespace std;
+AXIS_CPP_NAMESPACE_START
+
struct SoapKeywordStruct
{
const AxisXMLCh* pchNamespaceUri;
@@ -32,12 +34,13 @@
const Attribute* pXsi;
const Attribute* pXsd;
};
-
+AXIS_CPP_NAMESPACE_END
/*
* @class SoapKeywordMapping
* @brief interface for the SoapKeywordMapping class.
* @author Susantha Kumara (skumara@virtusa.com)
*/
+AXIS_CPP_NAMESPACE_START
class SoapKeywordMapping
{
public:
@@ -52,5 +55,5 @@
static const SoapKeywordStruct& map(int nVersion);
static void uninitialize();
};
-
+AXIS_CPP_NAMESPACE_END
#endif
1.24.14.1 +3 -0 ws-axis/c/src/soap/SoapMethod.cpp
Index: SoapMethod.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapMethod.cpp,v
retrieving revision 1.24
retrieving revision 1.24.14.1
diff -u -r1.24 -r1.24.14.1
--- SoapMethod.cpp 14 Jun 2004 08:00:46 -0000 1.24
+++ SoapMethod.cpp 28 Jul 2004 14:21:17 -0000 1.24.14.1
@@ -24,6 +24,7 @@
#include <axis/server/Attribute.h>
#include <axis/server/GDefine.h>
+AXIS_CPP_NAMESPACE_START
SoapMethod::SoapMethod()
{
@@ -281,6 +282,8 @@
return AXIS_SUCCESS;
}
+
+AXIS_CPP_NAMESPACE_END
#ifdef UNIT_TESTING_ON
int SoapMethod::initializeForTesting()
1.20.12.1 +4 -0 ws-axis/c/src/soap/SoapMethod.h
Index: SoapMethod.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapMethod.h,v
retrieving revision 1.20
retrieving revision 1.20.12.1
diff -u -r1.20 -r1.20.12.1
--- SoapMethod.h 6 Jul 2004 14:16:46 -0000 1.20
+++ SoapMethod.h 28 Jul 2004 14:21:17 -0000 1.20.12.1
@@ -23,6 +23,8 @@
#include "SoapSerializer.h"
#include <list>
+AXIS_CPP_NAMESPACE_START
+
class Attribute;
using namespace std;
@@ -94,5 +96,7 @@
SoapMethod();
virtual ~SoapMethod();
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.65.2.1 +7 -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.65
retrieving revision 1.65.2.1
diff -u -r1.65 -r1.65.2.1
--- SoapSerializer.cpp 26 Jul 2004 13:58:49 -0000 1.65
+++ SoapSerializer.cpp 28 Jul 2004 14:21:17 -0000 1.65.2.1
@@ -40,8 +40,11 @@
#include "../common/AxisTrace.h"
#include "../common/AxisConfig.h"
-extern AxisTrace* g_pAT;
-extern AxisConfig* g_pConfig;
+
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisConfig* g_pConfig;
+
+AXIS_CPP_NAMESPACE_START
/* Following values should come from axis configuration files. */
#define INITIAL_SERIALIZE_BUFFER_SIZE 1024
@@ -942,3 +945,5 @@
{
return m_pSoapEnvelope->m_pSoapHeader->getNextHeaderBlock();
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.24.2.1 +4 -0 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.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- SoapSerializer.h 26 Jul 2004 13:58:49 -0000 1.24
+++ SoapSerializer.h 28 Jul 2004 14:21:17 -0000 1.24.2.1
@@ -23,6 +23,8 @@
#include "../common/BasicTypeSerializer.h"
#include <axis/server/WSDDDefines.h>
+AXIS_CPP_NAMESPACE_START
+
class SoapEnvelope;
class SoapHeader;
class SoapMethod;
@@ -197,6 +199,8 @@
int addOutputAnyObject(AnyType* pAnyObject);
int serializeAnyObject(AnyType* pAnyObject);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.10.14.1 +5 -0 ws-axis/c/src/soap/URIMapping.cpp
Index: URIMapping.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/URIMapping.cpp,v
retrieving revision 1.10
retrieving revision 1.10.14.1
diff -u -r1.10 -r1.10.14.1
--- URIMapping.cpp 26 Apr 2004 04:04:38 -0000 1.10
+++ URIMapping.cpp 28 Jul 2004 14:21:17 -0000 1.10.14.1
@@ -24,6 +24,9 @@
#define __TRC(X) AxisUtils::Convert(X)
+AXIS_CPP_NAMESPACE_START
+
+using namespace std;
map<AxisXMLString, URITYPE> URIMapping::m_sURIMap;
volatile bool URIMapping::m_bInit = false;
@@ -60,3 +63,5 @@
}
return URI_UNKNOWN;
}
+
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.12.14.1 +4 -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.12
retrieving revision 1.12.14.1
diff -u -r1.12 -r1.12.14.1
--- URIMapping.h 26 Apr 2004 04:04:38 -0000 1.12
+++ URIMapping.h 28 Jul 2004 14:21:17 -0000 1.12.14.1
@@ -26,6 +26,8 @@
#include <string>
#include <axis/server/GDefine.h>
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
/*
@@ -45,5 +47,7 @@
virtual ~URIMapping();
static URITYPE map(const AxisXMLCh* uri);
};
+
+AXIS_CPP_NAMESPACE_END
#endif
No revision
No revision
1.1.12.1 +7 -0 ws-axis/c/src/transport/SOAPTransport.h
Index: SOAPTransport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/SOAPTransport.h,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -r1.1 -r1.1.12.1
--- SOAPTransport.h 6 Jul 2004 14:16:47 -0000 1.1
+++ SOAPTransport.h 28 Jul 2004 14:21:20 -0000 1.1.12.1
@@ -53,6 +53,9 @@
* @brief Interface of the input/output stream of Axis transport. ISOAPTransport is
* derived from this interface
*/
+
+AXIS_CPP_NAMESPACE_START
+
class AxisIOStream
{
public:
@@ -137,6 +140,8 @@
* @brief Interface of any Axis transport layer.
*
*/
+AXIS_CPP_NAMESPACE_END
+AXIS_CPP_NAMESPACE_START
class SOAPTransport : public AxisIOStream
{
public:
@@ -342,6 +347,8 @@
AXIS_ENGINE_CALLBACK_RELEASE_SEND_BUFFER m_pReleaseBufferCallback;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
No revision
No revision
1.11.12.1 +2 -0 ws-axis/c/src/transport/axis/AxisTransport.h
Index: AxisTransport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/AxisTransport.h,v
retrieving revision 1.11
retrieving revision 1.11.12.1
diff -u -r1.11 -r1.11.12.1
--- AxisTransport.h 6 Jul 2004 14:16:47 -0000 1.11
+++ AxisTransport.h 28 Jul 2004 14:21:20 -0000 1.11.12.1
@@ -37,6 +37,8 @@
#include "Sender.hpp"
#include "Receiver.hpp"
+AXIS_CPP_NAMESPACE_USE
+
class AxisTransport : public SOAPTransport
{
public:
1.3.12.1 +2 -0 ws-axis/c/src/transport/axis/AxisTransportException.h
Index: AxisTransportException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/AxisTransportException.h,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -r1.3 -r1.3.12.1
--- AxisTransportException.h 6 Jul 2004 14:16:47 -0000 1.3
+++ AxisTransportException.h 28 Jul 2004 14:21:20 -0000 1.3.12.1
@@ -25,6 +25,8 @@
#include <axis/server/AxisException.h>
using namespace std;
+AXIS_CPP_NAMESPACE_USE
+
class STORAGE_CLASS_INFO AxisTransportException :public AxisException
{
1.9.12.1 +2 -1 ws-axis/c/src/transport/axis/HttpTransport.hpp
Index: HttpTransport.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/HttpTransport.hpp,v
retrieving revision 1.9
retrieving revision 1.9.12.1
diff -u -r1.9 -r1.9.12.1
--- HttpTransport.hpp 6 Jul 2004 14:16:47 -0000 1.9
+++ HttpTransport.hpp 28 Jul 2004 14:21:20 -0000 1.9.12.1
@@ -44,8 +44,9 @@
#include "SecureChannel.hpp"
#endif
#include "../../common/AxisTrace.h"
-extern AxisTrace* g_pAT;
#include "AxisTransportException.h"
+
+extern AxisTrace* g_pAT;
/*
* Implements HTTP transport as SOAP-Envelop carrier, for sending/receiving
No revision
No revision
1.12.12.1 +4 -0 ws-axis/c/src/wsdd/AxisWsddException.cpp
Index: AxisWsddException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/AxisWsddException.cpp,v
retrieving revision 1.12
retrieving revision 1.12.12.1
diff -u -r1.12 -r1.12.12.1
--- AxisWsddException.cpp 6 Jul 2004 14:16:48 -0000 1.12
+++ AxisWsddException.cpp 28 Jul 2004 14:21:20 -0000 1.12.12.1
@@ -25,6 +25,9 @@
* Default when no parameter passed. When thrown with no parameter
* more general SERVER_WSDD_EXCEPTION is assumed.
*/
+
+AXIS_CPP_NAMESPACE_START
+
AxisWsddException::AxisWsddException()
{
processException(SERVER_WSDD_EXCEPTION);
@@ -125,3 +128,4 @@
return m_iExceptionCode;
}
+AXIS_CPP_NAMESPACE_END
\ No newline at end of file
1.4.12.1 +5 -0 ws-axis/c/src/wsdd/AxisWsddException.h
Index: AxisWsddException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/AxisWsddException.h,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -u -r1.4 -r1.4.12.1
--- AxisWsddException.h 6 Jul 2004 14:16:48 -0000 1.4
+++ AxisWsddException.h 28 Jul 2004 14:21:20 -0000 1.4.12.1
@@ -23,6 +23,9 @@
#include <string>
#include <axis/server/AxisException.h>
+
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
class STORAGE_CLASS_INFO AxisWsddException :public AxisException
@@ -50,6 +53,8 @@
string m_sMessage;
int m_iExceptionCode;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.38.12.1 +5 -2 ws-axis/c/src/wsdd/WSDDDeployment.cpp
Index: WSDDDeployment.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDeployment.cpp,v
retrieving revision 1.38
retrieving revision 1.38.12.1
diff -u -r1.38 -r1.38.12.1
--- WSDDDeployment.cpp 15 Jul 2004 11:27:00 -0000 1.38
+++ WSDDDeployment.cpp 28 Jul 2004 14:21:21 -0000 1.38.12.1
@@ -27,7 +27,10 @@
#include "../common/AxisTrace.h"
#include "AxisWsddException.h"
-extern AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+
+AXIS_CPP_NAMESPACE_START
+
WSDDDeployment::WSDDDeployment()
{
@@ -346,4 +349,4 @@
m_DeplType = nType;
}
-
+AXIS_CPP_NAMESPACE_END
1.20.12.1 +9 -4 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.20
retrieving revision 1.20.12.1
diff -u -r1.20 -r1.20.12.1
--- WSDDDeployment.h 6 Jul 2004 14:16:48 -0000 1.20
+++ WSDDDeployment.h 28 Jul 2004 14:21:21 -0000 1.20.12.1
@@ -27,9 +27,12 @@
#include <list>
+enum DEPLOYMENTTYPE {DT_DEPLOYMENT, DT_UNDEPLOYMENT};
+
+AXIS_CPP_NAMESPACE_START
+
using namespace std;
-enum DEPLOYMENTTYPE {DT_DEPLOYMENT, DT_UNDEPLOYMENT};
/*
* @class WSDDDeployment
* @brief interface for the WSDDDeployment class.
@@ -67,11 +70,13 @@
WSDDHandlerList* m_GlobalRequestHandlers;
WSDDHandlerList* m_GlobalResponseHandlers;
WSDDTransport* m_pTransportHandlers;
- map<AxisString, int>* m_pLibNameIdMap;
- AxisString m_sAux;
- string m_sWSDDPath;
+ std::map<std::AxisString, int>* m_pLibNameIdMap;
+ std::AxisString m_sAux;
+ std::string m_sWSDDPath;
DEPLOYMENTTYPE m_DeplType;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.35.12.1 +4 -2 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.35
retrieving revision 1.35.12.1
diff -u -r1.35 -r1.35.12.1
--- WSDDDocument.cpp 6 Jul 2004 14:16:48 -0000 1.35
+++ WSDDDocument.cpp 28 Jul 2004 14:21:21 -0000 1.35.12.1
@@ -26,7 +26,9 @@
#define NAMESPACESEPARATOR 0x03 /* Heart */
#define FILEBUFFSIZE 1024
-extern AxisTrace* g_pAT;
+extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+
+AXIS_CPP_NAMESPACE_START
WSDDDocument::WSDDDocument(map<AxisString, int>* pLibNameIdMap)
{
@@ -671,6 +673,6 @@
}
}
-
+AXIS_CPP_NAMESPACE_END
1.19.12.1 +5 -0 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.19
retrieving revision 1.19.12.1
diff -u -r1.19 -r1.19.12.1
--- WSDDDocument.h 6 Jul 2004 14:16:48 -0000 1.19
+++ WSDDDocument.h 28 Jul 2004 14:21:21 -0000 1.19.12.1
@@ -47,6 +47,9 @@
* @author Sanjaya Sinharage(sanjaya@opensource.lk)
* @author Suasntha Kumara (skumara@virtusa.com, susantha@opensource.lk)
*/
+
+AXIS_CPP_NAMESPACE_START
+
class WSDDDocument
{
@@ -108,6 +111,8 @@
AxisChar m_Buffer[TRANSCODE_BUFFER_SIZE];
/* used to transcode 'XMLCh' to AxisChar */
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.16.12.1 +2 -1 ws-axis/c/src/wsdd/WSDDHandler.cpp
Index: WSDDHandler.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDHandler.cpp,v
retrieving revision 1.16
retrieving revision 1.16.12.1
diff -u -r1.16 -r1.16.12.1
--- WSDDHandler.cpp 6 Jul 2004 14:16:48 -0000 1.16
+++ WSDDHandler.cpp 28 Jul 2004 14:21:21 -0000 1.16.12.1
@@ -21,6 +21,7 @@
#include "WSDDHandler.h"
+AXIS_CPP_NAMESPACE_START
WSDDHandler::WSDDHandler()
{
@@ -135,4 +136,4 @@
for (int x=0; x<count; x++) *this << "\t";
}
-
+AXIS_CPP_NAMESPACE_END
1.11.12.1 +4 -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.11
retrieving revision 1.11.12.1
diff -u -r1.11 -r1.11.12.1
--- WSDDHandler.h 6 Jul 2004 14:16:48 -0000 1.11
+++ WSDDHandler.h 28 Jul 2004 14:21:21 -0000 1.11.12.1
@@ -40,6 +40,8 @@
* @author Susantha Kumara (skumara@virtusa.com)
*/
+AXIS_CPP_NAMESPACE_START
+
class WSDDHandler
{
public:
@@ -72,6 +74,8 @@
};
typedef list<WSDDHandler*> WSDDHandlerList;
+
+AXIS_CPP_NAMESPACE_END
#endif
1.13.14.1 +6 -2 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.13
retrieving revision 1.13.14.1
diff -u -r1.13 -r1.13.14.1
--- WSDDKeywords.cpp 26 Apr 2004 04:04:39 -0000 1.13
+++ WSDDKeywords.cpp 28 Jul 2004 14:21:21 -0000 1.13.14.1
@@ -19,7 +19,6 @@
#define __TRC(X) AxisUtils::ToAxisXMLCh(X)
-volatile bool WSDDKeywords::m_bInit = false;
#define AX_DELETE(X) delete const_cast<AxisXMLCh*>(X)
@@ -47,6 +46,11 @@
const AxisXMLCh* kw_smtp;
const AxisXMLCh* kw_desc;
+AXIS_CPP_NAMESPACE_START
+
+volatile bool WSDDKeywords::m_bInit = false;
+
+
WSDDKeywords::WSDDKeywords()
{
initialize();
@@ -97,4 +101,4 @@
}
}
-
+AXIS_CPP_NAMESPACE_END
1.7.14.1 +5 -0 ws-axis/c/src/wsdd/WSDDKeywords.h
Index: WSDDKeywords.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDKeywords.h,v
retrieving revision 1.7
retrieving revision 1.7.14.1
diff -u -r1.7 -r1.7.14.1
--- WSDDKeywords.h 26 Apr 2004 04:04:39 -0000 1.7
+++ WSDDKeywords.h 28 Jul 2004 14:21:21 -0000 1.7.14.1
@@ -47,6 +47,9 @@
* @brief interface for the WSDDKeywords class.
* @author Suasntha Kumara (skumara@virtusa.com, susantha@opensource.lk)
*/
+
+AXIS_CPP_NAMESPACE_START
+
class WSDDKeywords
{
public:
@@ -57,6 +60,8 @@
private:
static volatile bool m_bInit;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
1.22.12.1 +2 -2 ws-axis/c/src/wsdd/WSDDService.cpp
Index: WSDDService.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDService.cpp,v
retrieving revision 1.22
retrieving revision 1.22.12.1
diff -u -r1.22 -r1.22.12.1
--- WSDDService.cpp 6 Jul 2004 14:16:48 -0000 1.22
+++ WSDDService.cpp 28 Jul 2004 14:21:21 -0000 1.22.12.1
@@ -23,7 +23,7 @@
#include "WSDDService.h"
#include "../common/AxisTrace.h"
-
+AXIS_CPP_NAMESPACE_START
WSDDService::WSDDService()
{
@@ -243,4 +243,4 @@
return 0;
}
-
+AXIS_CPP_NAMESPACE_END
1.9.12.1 +5 -0 ws-axis/c/src/wsdd/WSDDService.h
Index: WSDDService.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDService.h,v
retrieving revision 1.9
retrieving revision 1.9.12.1
diff -u -r1.9 -r1.9.12.1
--- WSDDService.h 6 Jul 2004 14:16:48 -0000 1.9
+++ WSDDService.h 28 Jul 2004 14:21:21 -0000 1.9.12.1
@@ -25,6 +25,9 @@
* @brief interface for the WSDDService class.
* @author Susantha Kumara (skumara@virtusa.com)
*/
+
+AXIS_CPP_NAMESPACE_START
+
class WSDDService : public WSDDHandler
{
public:
@@ -54,6 +57,8 @@
};
typedef map<AxisString, WSDDService*> WSDDServiceMap;
+
+AXIS_CPP_NAMESPACE_END
#endif
1.12.14.1 +2 -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.12
retrieving revision 1.12.14.1
diff -u -r1.12 -r1.12.14.1
--- WSDDTransport.cpp 26 Apr 2004 04:04:39 -0000 1.12
+++ WSDDTransport.cpp 28 Jul 2004 14:21:21 -0000 1.12.14.1
@@ -21,7 +21,7 @@
#include "../wsdd/WSDDTransport.h"
-
+AXIS_CPP_NAMESPACE_START
WSDDTransport::WSDDTransport()
{
@@ -182,3 +182,4 @@
return AXIS_SUCCESS;
}
+AXIS_CPP_NAMESPACE_END
1.11.12.1 +7 -0 ws-axis/c/src/wsdd/WSDDTransport.h
Index: WSDDTransport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDTransport.h,v
retrieving revision 1.11
retrieving revision 1.11.12.1
diff -u -r1.11 -r1.11.12.1
--- WSDDTransport.h 6 Jul 2004 14:16:48 -0000 1.11
+++ WSDDTransport.h 28 Jul 2004 14:21:21 -0000 1.11.12.1
@@ -25,6 +25,11 @@
* @brief interface for the WSDDTransport class.
* @author Susantha Kumara (skumara@virtusa.com)
*/
+
+AXIS_CPP_NAMESPACE_START
+
+using namespace std;
+
class WSDDTransport
{
public:
@@ -42,6 +47,8 @@
map<AXIS_PROTOCOL_TYPE, WSDDHandlerList>* m_RequestHandlers;
map<AXIS_PROTOCOL_TYPE, WSDDHandlerList>* m_ResponseHandlers;
};
+
+AXIS_CPP_NAMESPACE_END
#endif
No revision
No revision
1.1.12.1 +2 -0 ws-axis/c/src/xml/AxisParseException.h
Index: AxisParseException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/AxisParseException.h,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -r1.1 -r1.1.12.1
--- AxisParseException.h 6 Jul 2004 14:16:48 -0000 1.1
+++ AxisParseException.h 28 Jul 2004 14:21:22 -0000 1.1.12.1
@@ -25,6 +25,8 @@
#include <axis/server/AxisException.h>
using namespace std;
+AXIS_CPP_NAMESPACE_USE
+
class STORAGE_CLASS_INFO AxisParseException :public AxisException
{
1.1.12.1 +2 -0 ws-axis/c/src/xml/XMLParser.h
Index: XMLParser.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/XMLParser.h,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -r1.1 -r1.1.12.1
--- XMLParser.h 6 Jul 2004 14:16:48 -0000 1.1
+++ XMLParser.h 28 Jul 2004 14:21:22 -0000 1.1.12.1
@@ -31,6 +31,8 @@
#include <axis/server/GDefine.h>
+AXIS_CPP_NAMESPACE_USE
+
/**
* @class XMLParser
* @brief Interface that any parser wrapper should implement in order to be
No revision
No revision
1.2.12.1 +1 -0 ws-axis/c/src/xml/xerces/SoapBinInputStream.h
Index: SoapBinInputStream.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/xerces/SoapBinInputStream.h,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -r1.2 -r1.2.12.1
--- SoapBinInputStream.h 6 Jul 2004 14:16:48 -0000 1.2
+++ SoapBinInputStream.h 28 Jul 2004 14:21:22 -0000 1.2.12.1
@@ -24,6 +24,7 @@
#include "../../transport/SOAPTransport.h"
XERCES_CPP_NAMESPACE_USE
+AXIS_CPP_NAMESPACE_USE
class SoapBinInputStream : public BinInputStream
{