axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject cvs commit: ws-axis/c/src/soap XMLSimpleHandler.cpp Makefile.am XMLStreamHandler.cpp
Date Tue, 02 Dec 2003 11:42:00 GMT
damitha     2003/12/02 03:42:00

  Modified:    c/src    Tag: CWrapperSupport Makefile.am
               c/src/client/samples/CalculatorC Tag: CWrapperSupport
                        CalcClientC.c Calculator.c
               c/src/common Tag: CWrapperSupport Makefile.am
               c/src/engine Tag: CWrapperSupport Axis.cpp Makefile.am
                        ServerAxisEngine.cpp
               c/src/server/samples/cservicewrapper Tag: CWrapperSupport
                        CServiceWrapper.c
               c/src/soap Tag: CWrapperSupport Makefile.am
                        XMLStreamHandler.cpp
  Added:       c/src/soap Tag: CWrapperSupport XMLSimpleHandler.cpp
  Log:
  
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.3.4.1   +3 -3      ws-axis/c/src/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/Makefile.am,v
  retrieving revision 1.3
  retrieving revision 1.3.4.1
  diff -u -r1.3 -r1.3.4.1
  --- Makefile.am	12 Sep 2003 09:26:18 -0000	1.3
  +++ Makefile.am	2 Dec 2003 11:42:00 -0000	1.3.4.1
  @@ -1,8 +1,8 @@
   lib_LTLIBRARIES = libaxiscpp_mod.la
   SUBDIRS = common engine server soap wsdd xml
  -AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
  +AM_CPPFLAGS = -Wall
   libaxiscpp_mod_la_SOURCES =	
  -libaxiscpp_mod_la_LIBADD   = ./common/libcommon.la ./engine/libengine.la ./server/apache/libapache.la
./soap/libsoap.la ./wsdd/libwsdd.la ./xml/libxml.la -L$(AXISCPP_HOME)/lib/xerces-c -lxerces-c
-ldl -lstdc++
  +libaxiscpp_mod_la_LIBADD   = ./common/libcommon.la ./engine/libengine.la ./server/apache/libapache.la
./soap/libsoap.la ./wsdd/libwsdd.la ./xml/libxml.la -L$(AXISCPP_HOME)/lib/arabica -lArabica
-ldl -lstdc++
   
  -#LDADD = -L$(XERCES_HOME)/lib -lxerces-c -ldl -lstdc++
  +#LDADD = -L$(XERCES_HOME)/lib/arabica -lArabica -ldl -lstdc++
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  No                   revision
  No                   revision
  1.1.4.5   +1 -0      ws-axis/c/src/client/samples/CalculatorC/CalcClientC.c
  
  Index: CalcClientC.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/samples/CalculatorC/CalcClientC.c,v
  retrieving revision 1.1.4.4
  retrieving revision 1.1.4.5
  diff -u -r1.1.4.4 -r1.1.4.5
  --- CalcClientC.c	14 Nov 2003 11:31:44 -0000	1.1.4.4
  +++ CalcClientC.c	2 Dec 2003 11:42:00 -0000	1.1.4.5
  @@ -10,6 +10,7 @@
   	Point* ret;
   	
   	int result = Add(99, 23);
  +	printf("addition is : %d\n", result);
   
   	p1 = malloc(sizeof(Point));
   	p1->x = 11;
  
  
  
  1.1.2.8   +5 -1      ws-axis/c/src/client/samples/CalculatorC/Attic/Calculator.c
  
  Index: Calculator.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/samples/CalculatorC/Attic/Calculator.c,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- Calculator.c	21 Nov 2003 12:48:07 -0000	1.1.2.7
  +++ Calculator.c	2 Dec 2003 11:42:00 -0000	1.1.2.8
  @@ -27,7 +27,7 @@
   	int nStatus;
   	int ret = 0;
   	CallX* pCall;
  -	if (!g_pCalculator) g_pCalculator = GetCallObject(APTHTTP, "http://192.168.101.10:5555/axis/Calculator");
  +	if (!g_pCalculator) g_pCalculator = GetCallObject(APTHTTP, "http://192.168.101.4:5555/axis/Calculator");
   	if (!g_pCalculator || !g_pCalculator->__vfptr) return ret;
   	pCall = g_pCalculator->__vfptr;
   	/* Following will establish the connections with the server too */
  @@ -55,7 +55,11 @@
   	int nStatus;
   	Point* pReturn = NULL;
   	CallX* pCall;
  +<<<<<<< Calculator.c
  +	if (!g_pCalculator) g_pCalculator = GetCallObject(APTHTTP, "http://192.168.101.4:5555/axis/Calculator");
  +=======
   	if (!g_pCalculator) g_pCalculator = GetCallObject(APTHTTP, "http://192.168.101.10:5555/axis/Calculator");
  +>>>>>>> 1.1.2.7
   	if (!g_pCalculator || !g_pCalculator->__vfptr) return pReturn;
   	pCall = g_pCalculator->__vfptr;
   	if (AXIS_SUCCESS != pCall->Initialize(g_pCalculator)) return NULL;
  
  
  
  No                   revision
  No                   revision
  1.10.4.1  +2 -2      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.10
  retrieving revision 1.10.4.1
  diff -u -r1.10 -r1.10.4.1
  --- Makefile.am	15 Oct 2003 06:11:28 -0000	1.10
  +++ Makefile.am	2 Dec 2003 11:42:00 -0000	1.10.4.1
  @@ -1,9 +1,9 @@
   noinst_LTLIBRARIES = libcommon.la
  -AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
  +AM_CPPFLAGS = -Wall
   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 \
    AxisSocketUtils.cpp
   
  -libcommon_la_LIBADD = -L$(AXISCPP_HOME)/lib -lxerces-c -lstdc++
  +libcommon_la_LIBADD = -L$(AXISCPP_HOME)/lib/arabica -lArabica -lstdc++
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  No                   revision
  No                   revision
  1.30.4.2  +4 -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.30.4.1
  retrieving revision 1.30.4.2
  diff -u -r1.30.4.1 -r1.30.4.2
  --- Axis.cpp	21 Nov 2003 12:48:08 -0000	1.30.4.1
  +++ Axis.cpp	2 Dec 2003 11:42:00 -0000	1.30.4.2
  @@ -68,6 +68,7 @@
   #include <unistd.h>
   #endif
   
  +
   #include <axis/engine/ServerAxisEngine.h>
   #include <axis/common/AxisTrace.h>
   #include <stdio.h>
  @@ -91,6 +92,7 @@
   #include <axis/common/AxisConfig.h>
   #include <axis/wsdd/WSDDKeywords.h>
   
  +#include <xercesc/util/TransService.hpp>
   
   #define BYTESTOREAD 64
   //the relative location of the wsdl files hardcoded
  @@ -243,7 +245,7 @@
   {
   	//order of these initialization method invocation should not be changed
   //	AXISTRACE1("inside initialize_module\n");
  -	XMLPlatformUtils::Initialize();
  +	//XMLPlatformUtils::Initialize();
   	AxisEngine::m_bServer = bServer;
   	AxisUtils::Initialize();
   	WSDDKeywords::Initialize();
  @@ -262,7 +264,7 @@
   
   extern "C" int uninitialize_module()
   {
  -	XMLPlatformUtils::Terminate();
  +	//XMLPlatformUtils::Terminate();
   	ModuleUnInitialize();
   	return AXIS_SUCCESS;
   }
  
  
  
  1.6.4.1   +2 -2      ws-axis/c/src/engine/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/Makefile.am,v
  retrieving revision 1.6
  retrieving revision 1.6.4.1
  diff -u -r1.6 -r1.6.4.1
  --- Makefile.am	30 Sep 2003 09:04:54 -0000	1.6
  +++ Makefile.am	2 Dec 2003 11:42:00 -0000	1.6.4.1
  @@ -1,5 +1,5 @@
   noinst_LTLIBRARIES = libengine.la
  -AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
  +AM_CPPFLAGS = -Wall
   libengine_la_SOURCES = Axis.cpp \
   		AxisEngine.cpp \
                   ServerAxisEngine.cpp \
  @@ -15,5 +15,5 @@
   		SharedObject.cpp
   		
   
  -libengine_la_LIBADD = -L$(AXISCPP_HOME)/lib/xerces-c -lxerces-c -lstdc++
  +libengine_la_LIBADD = -L$(AXISCPP_HOME)/lib/arabica -lArabica -lstdc++
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.10.4.2  +7 -0      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.10.4.1
  retrieving revision 1.10.4.2
  diff -u -r1.10.4.1 -r1.10.4.2
  --- ServerAxisEngine.cpp	21 Nov 2003 12:48:08 -0000	1.10.4.1
  +++ ServerAxisEngine.cpp	2 Dec 2003 11:42:00 -0000	1.10.4.2
  @@ -139,6 +139,12 @@
   					break; //do .. while(0)
   				}
   			}
  +            else
  +			{
  +                m_pSZ->setSoapFault(SoapFault::getSoapFault(SF_NOSOAPMETHOD));
  +                //no method to be invoked
  +                break; //do .. while(0)
  +			}
   			//Get Global and Transport Handlers
   			if(AXIS_SUCCESS != (Status = InitializeHandlers(sSessionId, soap->trtype)))
   			{
  @@ -248,6 +254,7 @@
   		{
   			if (AXIS_SUCCESS != (Status = m_pWebService->Invoke(pMsg)))
   			{
  +                AXISTRACE1("Web service failed");
   				m_pSZ->setSoapFault(SoapFault::getSoapFault(SF_WEBSERVICEFAILED));
   				break;
   			}        
  
  
  
  No                   revision
  No                   revision
  1.1.2.5   +1 -0      ws-axis/c/src/server/samples/cservicewrapper/Attic/CServiceWrapper.c
  
  Index: CServiceWrapper.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/samples/cservicewrapper/Attic/CServiceWrapper.c,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- CServiceWrapper.c	21 Nov 2003 12:48:10 -0000	1.1.2.4
  +++ CServiceWrapper.c	2 Dec 2003 11:42:00 -0000	1.1.2.5
  @@ -4,6 +4,7 @@
   #include "CServiceWrapper.h"
   #include "../cservice/Service.h"
   
  +
   #include <string.h>
   
   extern int AddInt(int a, int b);
  
  
  
  No                   revision
  No                   revision
  1.4.4.1   +3 -3      ws-axis/c/src/soap/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/Makefile.am,v
  retrieving revision 1.4
  retrieving revision 1.4.4.1
  diff -u -r1.4 -r1.4.4.1
  --- Makefile.am	12 Sep 2003 09:29:47 -0000	1.4
  +++ Makefile.am	2 Dec 2003 11:42:00 -0000	1.4.4.1
  @@ -1,6 +1,6 @@
   noinst_LTLIBRARIES = libsoap.la
   
  -AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
  +AM_CPPFLAGS = -Wall
   libsoap_la_SOURCES = Attribute.cpp \
           BasicNode.cpp \
           CharacterElement.cpp \
  @@ -14,8 +14,8 @@
           SoapMethod.cpp \
           SoapSerializer.cpp \
           URIMapping.cpp \
  -        XMLStreamHandler.cpp \
  +        XMLSimpleHandler.cpp \
   	SoapKeywordMapping.cpp
   
  -libsoap_la_LIBADD = -L$(AXISCPP_HOME)/lib/xerces-c -lxerces-c
  +libsoap_la_LIBADD = -L$(AXISCPP_HOME)/lib/arabica -lArabica
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.18.4.2  +13 -11    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.18.4.1
  retrieving revision 1.18.4.2
  diff -u -r1.18.4.1 -r1.18.4.2
  --- XMLStreamHandler.cpp	21 Nov 2003 12:48:11 -0000	1.18.4.1
  +++ XMLStreamHandler.cpp	2 Dec 2003 11:42:00 -0000	1.18.4.2
  @@ -69,6 +69,8 @@
   #include <axis/soap/CharacterElement.h>
   #include <axis/common/AxisUtils.h>
   
  +#define __XTRC(x) x
  +
   XMLStreamHandler::XMLStreamHandler()
   {
   	m_pEnv = NULL;
  @@ -109,7 +111,7 @@
   
   */
   
  -void XMLStreamHandler::startElement(const XMLCh *const uri,const XMLCh *const localname,const
XMLCh *const qname,const Attributes &attrs)
  +void XMLStreamHandler::startElement(const std::string& uri,const std::string& localname,const
std::string& qname,const AttributesT &attrs)
   {
   	AxisXMLString sLname = __XTRC(localname);
   	const AxisXMLCh* lname = sLname.c_str();
  @@ -202,7 +204,7 @@
   	}
   }
   
  -void XMLStreamHandler::endElement (const XMLCh *const uri,const XMLCh *const localname,const
XMLCh *const qname)
  +void XMLStreamHandler::endElement (const std::string& uri, const std::string& localname,const
std::string& qname)
   {
   	AxisXMLString sLname = __XTRC(localname);
   	const AxisXMLCh* lname = sLname.c_str();
  @@ -238,7 +240,7 @@
   	}
   }
   
  -void  XMLStreamHandler::characters (const XMLCh *const chars,const unsigned int length)
  +void  XMLStreamHandler::characters (const std::string& chars,const unsigned int length)
   {
   	if ((m_PL0 == SOAP_BODY) && (m_PL1 == SOAP_PARAM)) //Make this a switch statement
if many cases to be handled
   	{
  @@ -505,7 +507,7 @@
   	m_nParamNestingLevel = 0;
   }
   
  -void XMLStreamHandler::FillEnvelope(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillEnvelope(const std::string& uri, const std::string&
localname, const std::string& qname, const Attributes &attrs)
   {
   	AxisXMLString str;
   	const AxisXMLCh* pchURI;
  @@ -551,22 +553,22 @@
   	}
   }
   
  -void XMLStreamHandler::FillBody(const XMLCh *const uri, const XMLCh *const localname, const
XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillBody(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	//nothing to do
   }
   
  -void XMLStreamHandler::FillHeader(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillHeader(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	//nothing to do
   }
   
  -void XMLStreamHandler::FillFault(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillFault(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	//nothing to do
   }
   
  -void XMLStreamHandler::FillMethod(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillMethod(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	AxisXMLString str = __XTRC(qname);
   	if (str.find(':') != AxisXMLString::npos) 
  @@ -579,7 +581,7 @@
   	m_pMethod->setLocalName(__XTRC(localname));
   }
   
  -void XMLStreamHandler::createHeaderBlock(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::createHeaderBlock(const std::string& uri, const std::string&
localname, const std::string& qname, const Attributes &attrs)
   {
   	m_pHeaderBlock= new HeaderBlock();
   	AxisXMLString str = __XTRC(qname);	
  @@ -592,10 +594,10 @@
   	m_pHeaderBlock->setUri(__XTRC(uri));
   }
   
  -const AxisChar* XMLStreamHandler::__XTRC(const XMLCh *pChar)
  +/*const AxisChar* XMLStreamHandler::__XTRC(const XMLCh *pChar)
   {
   	if (true == (XMLString::transcode(pChar, m_Buffer, TRANSCODE_BUFFER_SIZE-1)))
   		return m_Buffer;
   	else 
   		return ""; 
  -}
  +}*/
  
  
  
  No                   revision
  
  Index: XMLStreamHandler.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/XMLStreamHandler.cpp,v
  retrieving revision 1.18.4.1
  retrieving revision 1.18.4.2
  diff -u -r1.18.4.1 -r1.18.4.2
  --- XMLStreamHandler.cpp	21 Nov 2003 12:48:11 -0000	1.18.4.1
  +++ XMLStreamHandler.cpp	2 Dec 2003 11:42:00 -0000	1.18.4.2
  @@ -69,6 +69,8 @@
   #include <axis/soap/CharacterElement.h>
   #include <axis/common/AxisUtils.h>
   
  +#define __XTRC(x) x
  +
   XMLStreamHandler::XMLStreamHandler()
   {
   	m_pEnv = NULL;
  @@ -109,7 +111,7 @@
   
   */
   
  -void XMLStreamHandler::startElement(const XMLCh *const uri,const XMLCh *const localname,const
XMLCh *const qname,const Attributes &attrs)
  +void XMLStreamHandler::startElement(const std::string& uri,const std::string& localname,const
std::string& qname,const AttributesT &attrs)
   {
   	AxisXMLString sLname = __XTRC(localname);
   	const AxisXMLCh* lname = sLname.c_str();
  @@ -202,7 +204,7 @@
   	}
   }
   
  -void XMLStreamHandler::endElement (const XMLCh *const uri,const XMLCh *const localname,const
XMLCh *const qname)
  +void XMLStreamHandler::endElement (const std::string& uri, const std::string& localname,const
std::string& qname)
   {
   	AxisXMLString sLname = __XTRC(localname);
   	const AxisXMLCh* lname = sLname.c_str();
  @@ -238,7 +240,7 @@
   	}
   }
   
  -void  XMLStreamHandler::characters (const XMLCh *const chars,const unsigned int length)
  +void  XMLStreamHandler::characters (const std::string& chars,const unsigned int length)
   {
   	if ((m_PL0 == SOAP_BODY) && (m_PL1 == SOAP_PARAM)) //Make this a switch statement
if many cases to be handled
   	{
  @@ -505,7 +507,7 @@
   	m_nParamNestingLevel = 0;
   }
   
  -void XMLStreamHandler::FillEnvelope(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillEnvelope(const std::string& uri, const std::string&
localname, const std::string& qname, const Attributes &attrs)
   {
   	AxisXMLString str;
   	const AxisXMLCh* pchURI;
  @@ -551,22 +553,22 @@
   	}
   }
   
  -void XMLStreamHandler::FillBody(const XMLCh *const uri, const XMLCh *const localname, const
XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillBody(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	//nothing to do
   }
   
  -void XMLStreamHandler::FillHeader(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillHeader(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	//nothing to do
   }
   
  -void XMLStreamHandler::FillFault(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillFault(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	//nothing to do
   }
   
  -void XMLStreamHandler::FillMethod(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillMethod(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	AxisXMLString str = __XTRC(qname);
   	if (str.find(':') != AxisXMLString::npos) 
  @@ -579,7 +581,7 @@
   	m_pMethod->setLocalName(__XTRC(localname));
   }
   
  -void XMLStreamHandler::createHeaderBlock(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::createHeaderBlock(const std::string& uri, const std::string&
localname, const std::string& qname, const Attributes &attrs)
   {
   	m_pHeaderBlock= new HeaderBlock();
   	AxisXMLString str = __XTRC(qname);	
  @@ -592,10 +594,10 @@
   	m_pHeaderBlock->setUri(__XTRC(uri));
   }
   
  -const AxisChar* XMLStreamHandler::__XTRC(const XMLCh *pChar)
  +/*const AxisChar* XMLStreamHandler::__XTRC(const XMLCh *pChar)
   {
   	if (true == (XMLString::transcode(pChar, m_Buffer, TRANSCODE_BUFFER_SIZE-1)))
   		return m_Buffer;
   	else 
   		return ""; 
  -}
  +}*/
  
  
  
  No                   revision
  
  Index: XMLStreamHandler.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/XMLStreamHandler.cpp,v
  retrieving revision 1.18.4.1
  retrieving revision 1.18.4.2
  diff -u -r1.18.4.1 -r1.18.4.2
  --- XMLStreamHandler.cpp	21 Nov 2003 12:48:11 -0000	1.18.4.1
  +++ XMLStreamHandler.cpp	2 Dec 2003 11:42:00 -0000	1.18.4.2
  @@ -69,6 +69,8 @@
   #include <axis/soap/CharacterElement.h>
   #include <axis/common/AxisUtils.h>
   
  +#define __XTRC(x) x
  +
   XMLStreamHandler::XMLStreamHandler()
   {
   	m_pEnv = NULL;
  @@ -109,7 +111,7 @@
   
   */
   
  -void XMLStreamHandler::startElement(const XMLCh *const uri,const XMLCh *const localname,const
XMLCh *const qname,const Attributes &attrs)
  +void XMLStreamHandler::startElement(const std::string& uri,const std::string& localname,const
std::string& qname,const AttributesT &attrs)
   {
   	AxisXMLString sLname = __XTRC(localname);
   	const AxisXMLCh* lname = sLname.c_str();
  @@ -202,7 +204,7 @@
   	}
   }
   
  -void XMLStreamHandler::endElement (const XMLCh *const uri,const XMLCh *const localname,const
XMLCh *const qname)
  +void XMLStreamHandler::endElement (const std::string& uri, const std::string& localname,const
std::string& qname)
   {
   	AxisXMLString sLname = __XTRC(localname);
   	const AxisXMLCh* lname = sLname.c_str();
  @@ -238,7 +240,7 @@
   	}
   }
   
  -void  XMLStreamHandler::characters (const XMLCh *const chars,const unsigned int length)
  +void  XMLStreamHandler::characters (const std::string& chars,const unsigned int length)
   {
   	if ((m_PL0 == SOAP_BODY) && (m_PL1 == SOAP_PARAM)) //Make this a switch statement
if many cases to be handled
   	{
  @@ -505,7 +507,7 @@
   	m_nParamNestingLevel = 0;
   }
   
  -void XMLStreamHandler::FillEnvelope(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillEnvelope(const std::string& uri, const std::string&
localname, const std::string& qname, const Attributes &attrs)
   {
   	AxisXMLString str;
   	const AxisXMLCh* pchURI;
  @@ -551,22 +553,22 @@
   	}
   }
   
  -void XMLStreamHandler::FillBody(const XMLCh *const uri, const XMLCh *const localname, const
XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillBody(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	//nothing to do
   }
   
  -void XMLStreamHandler::FillHeader(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillHeader(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	//nothing to do
   }
   
  -void XMLStreamHandler::FillFault(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillFault(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	//nothing to do
   }
   
  -void XMLStreamHandler::FillMethod(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::FillMethod(const std::string& uri, const std::string& localname,
const std::string& qname, const Attributes &attrs)
   {
   	AxisXMLString str = __XTRC(qname);
   	if (str.find(':') != AxisXMLString::npos) 
  @@ -579,7 +581,7 @@
   	m_pMethod->setLocalName(__XTRC(localname));
   }
   
  -void XMLStreamHandler::createHeaderBlock(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
  +void XMLStreamHandler::createHeaderBlock(const std::string& uri, const std::string&
localname, const std::string& qname, const Attributes &attrs)
   {
   	m_pHeaderBlock= new HeaderBlock();
   	AxisXMLString str = __XTRC(qname);	
  @@ -592,10 +594,10 @@
   	m_pHeaderBlock->setUri(__XTRC(uri));
   }
   
  -const AxisChar* XMLStreamHandler::__XTRC(const XMLCh *pChar)
  +/*const AxisChar* XMLStreamHandler::__XTRC(const XMLCh *pChar)
   {
   	if (true == (XMLString::transcode(pChar, m_Buffer, TRANSCODE_BUFFER_SIZE-1)))
   		return m_Buffer;
   	else 
   		return ""; 
  -}
  +}*/
  
  
  
  1.1.2.1   +589 -0    ws-axis/c/src/soap/Attic/XMLSimpleHandler.cpp
  
  
  
  

Mime
View raw message