axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject cvs commit: xml-axis/c/src/wsdd Makefile.am WSDDDeployment.cpp WSDDDocument.cpp
Date Mon, 01 Sep 2003 13:44:39 GMT
damitha     2003/09/01 06:44:39

  Modified:    c/src/engine Axis.cpp HandlerLoader.cpp Makefile.am
               c/src/soap Makefile.am SoapSerializer.cpp SoapSerializer.h
                        XMLStreamHandler.cpp
               c/src/server/apache Makefile.am
               c/src/wsdd Makefile.am WSDDDeployment.cpp WSDDDocument.cpp
  Log:
  
  
  Revision  Changes    Path
  1.11      +1 -1      xml-axis/c/src/engine/Axis.cpp
  
  Index: Axis.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/engine/Axis.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Axis.cpp	1 Sep 2003 07:28:28 -0000	1.10
  +++ Axis.cpp	1 Sep 2003 13:44:39 -0000	1.11
  @@ -101,7 +101,7 @@
   #ifdef AXIS_APACHE1_3
   #define WSDDFILEPATH "./Axis/conf/server.wsdd"
   #else
  -#define WSDDFILEPATH "/usr/local/axiscpp/axis/server.wsdd"
  +#define WSDDFILEPATH "/usr/local/axiscpp/samples/server.wsdd"
   #endif
   #endif
   
  
  
  
  1.8       +5 -0      xml-axis/c/src/engine/HandlerLoader.cpp
  
  Index: HandlerLoader.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/engine/HandlerLoader.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HandlerLoader.cpp	27 Aug 2003 12:16:34 -0000	1.7
  +++ HandlerLoader.cpp	1 Sep 2003 13:44:39 -0000	1.8
  @@ -137,7 +137,12 @@
   	if (m_HandlerInfoList.find(nLibId) == m_HandlerInfoList.end())
   	{
   		HandlerInformation* pHandlerInfo = new HandlerInformation();
  +
  +		//memset(pHandlerInfo, 0, sizeof(HandlerInformation));
  +		//pHandlerInfo->m_sLib = g_WSDDDeployment.GetLibName(nLibId);
  +
   		AxisUtils::convert(pHandlerInfo->m_sLib, g_pWSDDDeployment->GetLibName(nLibId).c_str());
  +
   		if (pHandlerInfo->m_sLib.empty())
   		{
   			delete pHandlerInfo;
  
  
  
  1.3       +10 -3     xml-axis/c/src/engine/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/engine/Makefile.am,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.am	19 Aug 2003 05:16:44 -0000	1.2
  +++ Makefile.am	1 Sep 2003 13:44:39 -0000	1.3
  @@ -1,9 +1,16 @@
   noinst_LTLIBRARIES = libengine.la
  +
   libengine_la_SOURCES = Axis.cpp \
                   AxisEngine.cpp \
                   HandlerChain.cpp \
                   HandlerLoader.cpp \
  -                HandlerPool.cpp
  +                HandlerPool.cpp \
  +		AppScopeHandlerPool.cpp \
  +		DeserializerPool.cpp \
  +		RequestScopeHandlerPool.cpp \
  +		SerializerPool.cpp \
  +		SessionScopeHandlerPool.cpp \
  +		SharedObject.cpp
   
  -libengine_la_LIBADD = -L$(XERCES_HOME) -lxerces-c
  -INCLUDES = -I$(XERCES_HOME)/include
  +libengine_la_LIBADD = -L$(AXISCPP_HOME)/lib/xerces-c -lxerces-c
  +INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.3       +6 -3      xml-axis/c/src/soap/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/soap/Makefile.am,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.am	19 Aug 2003 05:16:44 -0000	1.2
  +++ Makefile.am	1 Sep 2003 13:44:39 -0000	1.3
  @@ -1,4 +1,6 @@
   noinst_LTLIBRARIES = libsoap.la
  +
  +
   libsoap_la_SOURCES = Attribute.cpp \
           BasicNode.cpp \
           CharacterElement.cpp \
  @@ -12,7 +14,8 @@
           SoapMethod.cpp \
           SoapSerializer.cpp \
           URIMapping.cpp \
  -        XMLStreamHandler.cpp
  +        XMLStreamHandler.cpp \
  +	SoapKeywordMapping.cpp
   
  -libsoap_la_LIBADD = -L$(XERCES_HOME)/lib -lxerces-c
  -INCLUDES = -I$(XERCES_HOME)/include
  +libsoap_la_LIBADD = -L$(AXISCPP_HOME)/lib/xerces-c -lxerces-c
  +INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.17      +52 -4     xml-axis/c/src/soap/SoapSerializer.cpp
  
  Index: SoapSerializer.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/soap/SoapSerializer.cpp,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- SoapSerializer.cpp	1 Sep 2003 07:28:29 -0000	1.16
  +++ SoapSerializer.cpp	1 Sep 2003 13:44:39 -0000	1.17
  @@ -265,7 +265,8 @@
   const AxisChar* SoapSerializer::getNewNamespacePrefix()
   {
   	iCounter++;
  -	swprintf(cCounter, L"ns%d", iCounter);
  +	//swprintf(cCounter, L"ns%d", iCounter);
  +    AxisSprintf(cCounter, 64, L"%d", iCounter);
   	return cCounter;
   }
   
  @@ -337,15 +338,62 @@
   	return m_BTSZ.serialize(sName, sValue, type);
   }
   
  +const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, int nValue)
  +{
  +	return m_BTSZ.serialize(sName, nValue);		
  +}
  +
  +const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, struct tm tValue)
  +{
  +    return m_uAxisTime.serialize(sName, tValue).c_str();
  +    //return NULL;
  +}
  +
  +const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, unsigned int
unValue)
  +{
  +    return m_BTSZ.serialize(sName, unValue);
  +}
  +
  +const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, short sValue)
  +{
  +    return m_BTSZ.serialize(sName, sValue);
  +}
  +
  +const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, unsigned short
usValue)
  +{
  +    return m_BTSZ.serialize(sName, usValue);
  +}
  +
  +const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, char cValue)
  +{
  +    return m_BTSZ.serialize(sName, cValue);
  +}
  +
  +const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, unsigned char
ucValue)
  +{
  +    return m_BTSZ.serialize(sName, ucValue);
  +}
  +
  +const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, long lValue,
XSDTYPE type)
  +{
  +    return m_BTSZ.serialize(sName, lValue, type);
  +}
  +
  +const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, unsigned long
ulValue)
  +{
  +    return m_BTSZ.serialize(sName, ulValue);
  +}
  +
   const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, float fValue)
   {
  -	return m_BTSZ.serialize(sName, fValue);	
  +    return m_BTSZ.serialize(sName, fValue);
   }
   
  -const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, int nValue)
  +const AxisChar* SoapSerializer::SerializeBasicType(const AxisChar* sName, double dValue,
XSDTYPE type)
   {
  -	return m_BTSZ.serialize(sName, nValue);		
  +    return m_BTSZ.serialize(sName, dValue, type);
   }
  +
   
   IHeaderBlock* SoapSerializer::createHeaderBlock()
   {
  
  
  
  1.15      +15 -1     xml-axis/c/src/soap/SoapSerializer.h
  
  Index: SoapSerializer.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/soap/SoapSerializer.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SoapSerializer.h	1 Sep 2003 07:28:29 -0000	1.14
  +++ SoapSerializer.h	1 Sep 2003 13:44:39 -0000	1.15
  @@ -71,8 +71,10 @@
   #include "../common/IWrapperSoapSerializer.h"
   #include "../common/IHandlerSoapSerializer.h"
   #include "../common/BasicTypeSerializer.h"
  +#include "../common/AxisTime.h"
   #include "SoapEnvVersions.h"
   
  +
   #define SERIALIZE_BUFFER_SIZE 1024
   
   class SoapEnvelope;
  @@ -117,12 +119,24 @@
   	int removeSoapHeader();
   	int setHeaderBlock(HeaderBlock* pHeaderBlock);
   	IHeaderBlock* createHeaderBlock();
  +
   	const AxisChar* SerializeBasicType(const AxisChar* sName, const AxisChar* sValue, XSDTYPE
type=XSD_STRING);
  -	const AxisChar* SerializeBasicType(const AxisChar* sName, float fValue);
   	const AxisChar* SerializeBasicType(const AxisChar* sName, int nValue);
  +    const AxisChar* SerializeBasicType(const AxisChar* sName, struct tm tValue);
  +    const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned int unValue);
  +    const AxisChar* SerializeBasicType(const AxisChar* sName, short sValue);
  +    const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned short usValue);
  +    const AxisChar* SerializeBasicType(const AxisChar* sName, char cValue);
  +    const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned char ucValue);
  +    const AxisChar* SerializeBasicType(const AxisChar* sName, long lValue, XSDTYPE type=XSD_LONG);
  +    const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned long ulValue);
  +    const AxisChar* SerializeBasicType(const AxisChar* sName, float fValue);
  +    const AxisChar* SerializeBasicType(const AxisChar* sName, double dValue, XSDTYPE type=XSD_DOUBLE);
  +    
   private:
   	BasicTypeSerializer m_BTSZ;
   	const void* m_pOutputStream;
  +    AxisTime m_uAxisTime;
   };
   
   #endif // !defined(AFX_SOAPSERIALIZER_H__C37229AD_BD54_430D_9619_E4574CF95334__INCLUDED_)
  
  
  
  1.8       +32 -31    xml-axis/c/src/soap/XMLStreamHandler.cpp
  
  Index: XMLStreamHandler.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/soap/XMLStreamHandler.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XMLStreamHandler.cpp	1 Sep 2003 07:28:29 -0000	1.7
  +++ XMLStreamHandler.cpp	1 Sep 2003 13:44:39 -0000	1.8
  @@ -68,6 +68,7 @@
   #include "Attribute.h"
   #include "SoapEnvVersions.h"
   #include "CharacterElement.h"
  +#include <wchar.h>
   
   #define __TRC(X) XMLString::transcode(X)
   #define __REL(X) XMLString::release(X)
  @@ -114,7 +115,7 @@
   	switch (m_PL0)
   	{
   	case SOAP_UNKNOWN:
  -	if(0 == wcscmp(localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_ENVELOPE]))
  +	if(0 == wcscmp((wchar_t*) localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_ENVELOPE]))
   	{
   		m_PL0 = SOAP_ENVELOP;
   		m_pEnv = new SoapEnvelope();
  @@ -123,21 +124,21 @@
   	}
   	break;
   	case SOAP_ENVELOP:
  -	if(0 == wcscmp(localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_BODY]))
  +	if(0 == wcscmp((wchar_t*) localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_BODY]))
   	{
   		m_PL0 = SOAP_BODY;
   		m_pBody = new SoapBody();
   		//set all attributes of SoapBody
   		FillBody(uri,localname,qname,attrs);	
   	}
  -	else if (0 == wcscmp(localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_HEADER]))
  +	else if (0 == wcscmp((wchar_t*) localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_HEADER]))
   	{
   		m_PL0 = SOAP_HEADER;
   		m_pHead = new SoapHeader();
   		//set all attributes of SoapHeader
   		FillHeader(uri,localname,qname,attrs);
   	}
  -	else if (0 == wcscmp(localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_FAULT]))
  +	else if (0 == wcscmp((wchar_t*) localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_FAULT]))
   	{
   		//m_PL0 = SOAP_FAULT;
   		//m_pFault = SoapFault::getSoapFault(1);
  @@ -160,9 +161,9 @@
   		switch (m_PL1)
   		{
   		case SOAP_UNKNOWN:
  -			if (0 == wcscmp(localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_MULTIREF]))
  +			if (0 == wcscmp((wchar_t*) localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_MULTIREF]))
   			{
  -				m_sLastElement = localname;
  +				m_sLastElement = (wchar_t*) localname;
   				SetParamType(attrs); 
   				m_PL1 = SOAP_PARAM;
   			}
  @@ -176,18 +177,18 @@
   		case SOAP_METHOD: //now comes parameters
   			//Get Param name and type
   			//m_Param.m_sName = localname;
  -			m_sLastElement = localname;
  +			m_sLastElement = (wchar_t*) localname;
   			SetParamType(attrs); 
   			m_PL1 = SOAP_PARAM;
   			m_nParamNestingLevel++;
   			break;
   		case SOAP_PARAM: //Custom types
  -			if (m_sLastElement != localname)
  +			if (m_sLastElement != (wchar_t*) localname)
   			{
   				m_Params.push_back(new Param(m_Param)); //parent param
   			}
   			//m_Param.m_sName = localname;
  -			m_sLastElement = localname;
  +			m_sLastElement = (wchar_t*) localname;
   			SetParamType(attrs); 
   			m_nParamNestingLevel++;
   			break;
  @@ -216,7 +217,7 @@
   		break;
   	case SOAP_PARAM: //end of a parameter
   		//Add parameter to list
  -		if (m_sLastElement == localname)
  +		if (m_sLastElement == (wchar_t*) localname)
   		{
   			m_Params.push_back(new Param(m_Param)); //current param
   		}
  @@ -239,23 +240,23 @@
   	if ((m_PL0 == SOAP_BODY) && (m_PL1 == SOAP_PARAM)) //Make this a switch statement
if many cases to be handled
   	{
   		//Get value of the parameter
  -		m_Param.SetValue(chars);
  +		m_Param.SetValue((wchar_t*) chars);
   	} else if ((m_PL0 == SOAP_HEADER) && (m_PL1 == SOAP_HEADER_BLOCK)) 
   	{
   		//Get the value of the header entry
  -		CharacterElement* pCharacterElement= new CharacterElement(chars);
  +		CharacterElement* pCharacterElement= new CharacterElement((wchar_t*) chars);
   		m_pHeaderBlock->addChild(pCharacterElement);
   	}
   }
   
   void XMLStreamHandler::startPrefixMapping(const XMLCh* const prefix, const XMLCh* const
uri)
   {
  -	m_NsStack[prefix] = uri; //I think the same prifix cannot repeat ???
  +	m_NsStack[(wchar_t*) prefix] = (wchar_t*) uri; //I think the same prifix cannot repeat
???
   }
   
   void XMLStreamHandler::endPrefixMapping(const XMLCh* const prefix)
   {
  -	m_NsStack.erase(prefix); //I think the same prifix cannot repeat ???
  +	m_NsStack.erase((wchar_t*) prefix); //I think the same prifix cannot repeat ???
   }
   
   void XMLStreamHandler::warning(const SAXParseException& exception)
  @@ -284,9 +285,9 @@
   	m_Param.m_Type = XSD_UNKNOWN; 
   	for (int i = 0; i < attrs.getLength(); i++) 
   	{
  -		const AxisChar* URI = attrs.getURI(i); 
  -		const AxisChar* local = attrs.getLocalName(i);
  -		AxisString value = attrs.getValue(i);
  +		const AxisChar* URI = (wchar_t*) attrs.getURI(i); 
  +		const AxisChar* local = (wchar_t*) attrs.getLocalName(i);
  +		AxisString value = (wchar_t*) attrs.getValue(i);
   		URITYPE urit = URIMapping::Map(URI);
   		switch (urit)
   		{
  @@ -466,7 +467,7 @@
   {
   	AxisString str;
   	Attribute* pAttr;
  -	str = qname;
  +	str = (wchar_t*) qname;
   	pAttr = new Attribute();
   	if (str.find(L':') != AxisString::npos) 
   	{
  @@ -474,14 +475,14 @@
   		m_pEnv->setPrefix(str.c_str());
   		pAttr->setPrefix(str.c_str());
   	}
  -	pAttr->setValue(uri);
  +	pAttr->setValue((wchar_t*) uri);
   	m_pEnv->addNamespaceDecl(pAttr);
   
  -	if (0 == wcscmp(uri, SoapKeywordMapping::Map(SOAP_VER_1_1).pchNamespaceUri))
  +	if (0 == wcscmp((wchar_t*) uri, SoapKeywordMapping::Map(SOAP_VER_1_1).pchNamespaceUri))
   	{
   		m_nSoapVersion = SOAP_VER_1_1;
   	}
  -	else if (0 == wcscmp(uri, SoapKeywordMapping::Map(SOAP_VER_1_2).pchNamespaceUri))
  +	else if (0 == wcscmp((wchar_t*) uri, SoapKeywordMapping::Map(SOAP_VER_1_2).pchNamespaceUri))
   	{
   		m_nSoapVersion = SOAP_VER_1_2;
   	}
  @@ -495,10 +496,10 @@
   	for (unsigned int ix=0;ix<nAttrs;ix++)
   	{
   		pAttr = new Attribute();
  -		pAttr->setPrefix(attrs.getQName(ix));
  -		pAttr->setValue(attrs.getValue(ix));
  -		pAttr->setLocalName(attrs.getLocalName(ix));
  -		pAttr->setUri(attrs.getURI(ix));
  +		pAttr->setPrefix((wchar_t*) attrs.getQName(ix));
  +		pAttr->setValue((wchar_t*) attrs.getValue(ix));
  +		pAttr->setLocalName((wchar_t*) attrs.getLocalName(ix));
  +		pAttr->setUri((wchar_t*) attrs.getURI(ix));
   		m_pEnv->addAttribute(pAttr);	
   	}
   }
  @@ -520,15 +521,15 @@
   
   void XMLStreamHandler::FillMethod(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs)
   {
  -	AxisString str = qname;
  +	AxisString str = (wchar_t*) qname;
   	if (str.find(':') != AxisString::npos) 
   	{
   		str = str.substr(0, str.find(L':'));
   		m_pMethod->setPrefix(str);
  -		str = uri;
  +		str = (wchar_t*) uri;
   		m_pMethod->setUri(str);
   	}
  -	str = localname;
  +	str = (wchar_t*) localname;
   	m_pMethod->setLocalName(str);
   /*
   	//Set Attributes
  @@ -566,12 +567,12 @@
   {
   	m_pHeaderBlock= new HeaderBlock();
   	AxisString str;	
  -	str = qname;
  +	str = (wchar_t*) qname;
   	if (str.find(L':') != AxisString::npos) 
   	{
   		str = str.substr(0, str.find(L':'));
   		m_pHeaderBlock->setPrefix(str.c_str());		
   	}
  -	m_pHeaderBlock->setLocalName(localname);
  -	m_pHeaderBlock->setUri(uri);
  +	m_pHeaderBlock->setLocalName((wchar_t*) localname);
  +	m_pHeaderBlock->setUri((wchar_t*) uri);
   }
  
  
  
  1.3       +1 -1      xml-axis/c/src/server/apache/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/apache/Makefile.am,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.am	19 Aug 2003 05:16:44 -0000	1.2
  +++ Makefile.am	1 Sep 2003 13:44:39 -0000	1.3
  @@ -1,4 +1,4 @@
   noinst_LTLIBRARIES = libapache.la
   libapache_la_SOURCES = mod_axis.c
   
  -INCLUDES = -I$(APACHE_HOME)/include
  +INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.3       +3 -2      xml-axis/c/src/wsdd/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/wsdd/Makefile.am,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.am	19 Aug 2003 05:16:44 -0000	1.2
  +++ Makefile.am	1 Sep 2003 13:44:39 -0000	1.3
  @@ -1,9 +1,10 @@
   noinst_LTLIBRARIES = libwsdd.la
  +
   libwsdd_la_SOURCES = WSDDDeployment.cpp \
                   WSDDHandler.cpp \
                   WSDDService.cpp \
                   WSDDTransport.cpp \
                   WSDDDocument.cpp
   
  -libwsdd_la_LIBADD = -L$(XERCES_HOME)/lib -lxerces-c
  -INCLUDES = -I$(XERCES_HOME)/include
  +libwsdd_la_LIBADD = -L$(AXISCPP_HOME)/lib/xerces-c -lxerces-c
  +INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.7       +5 -1      xml-axis/c/src/wsdd/WSDDDeployment.cpp
  
  Index: WSDDDeployment.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/wsdd/WSDDDeployment.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WSDDDeployment.cpp	27 Aug 2003 12:16:37 -0000	1.6
  +++ WSDDDeployment.cpp	1 Sep 2003 13:44:39 -0000	1.7
  @@ -181,7 +181,11 @@
   	for (map<AxisString, int>::iterator it = m_pLibNameIdMap->begin(); it != m_pLibNameIdMap->end();
it++)
   	{
   		if ((*it).second == nLibId)
  -			return (*it).first;
  +		{
  +			AxisString strReturn = (*it).first;
  +			return strReturn;
  +			//return (*it).first;
  +		}
   	}
   	return m_sAux;
   }
  
  
  
  1.10      +29 -29    xml-axis/c/src/wsdd/WSDDDocument.cpp
  
  Index: WSDDDocument.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/wsdd/WSDDDocument.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- WSDDDocument.cpp	1 Sep 2003 07:28:30 -0000	1.9
  +++ WSDDDocument.cpp	1 Sep 2003 13:44:39 -0000	1.10
  @@ -111,7 +111,7 @@
   
   void  WSDDDocument::endElement (const XMLCh *const uri, const XMLCh *const localname, const
XMLCh *const qname)
   {
  -	if (0 != wcscmp(localname, kw_param)) //just neglect endElement of parameter
  +	if (0 != wcscmp((wchar_t*) localname, kw_param)) //just neglect endElement of parameter
   	{
   		if (m_lev1 == WSDD_UNKNOWN) //not inside a requestFlow or responseFlow elements
   		{
  @@ -124,7 +124,7 @@
   				m_lev0 = WSDD_DEPLOYMENT;
   				break;
   			case WSDD_SERVICE:
  -				if (0 == wcscmp(localname, kw_srv))
  +				if (0 == wcscmp((wchar_t*) localname, kw_srv))
   				{
   					//add service object to Deployment object
   					m_pDeployment->AddService(m_pService);
  @@ -151,7 +151,7 @@
   		}
   		else // inside a requestFlow or responseFlow elements
   		{
  -			if(0 == wcscmp(localname, kw_hdl))
  +			if(0 == wcscmp((wchar_t*) localname, kw_hdl))
   			{
   				m_lev2 = WSDD_UNKNOWN;
   				//add handler in m_pHandler to the corresponding container.
  @@ -178,11 +178,11 @@
   					default: ; //this cannot happen ?? 
   				}
   			}
  -			else if(0 == wcscmp(localname, kw_rqf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rqf))
   			{  
   				m_lev1 = WSDD_UNKNOWN;
   			}
  -			else if(0 == wcscmp(localname, kw_rsf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rsf))
   			{  
   				m_lev1 = WSDD_UNKNOWN;
   			}						
  @@ -194,8 +194,8 @@
   {
   	for (int i = 0; i < attrs.getLength(); i++) 
   	{
  -		AxisString local = attrs.getLocalName(i);
  -		AxisString value = attrs.getValue(i);
  +		AxisString local = (wchar_t*) attrs.getLocalName(i);
  +		AxisString value = (wchar_t*) attrs.getValue(i);
   		switch(ElementType)
   		{
   		case WSDD_SERVICE: //add this attribute to current service object
  @@ -276,8 +276,8 @@
   	AxisString Localname, Value;
   	for (int i = 0; i < attrs.getLength(); i++) 
   	{
  -		Localname = attrs.getLocalName(i);
  -		Value = attrs.getValue(i);
  +		Localname = (wchar_t*) attrs.getLocalName(i);
  +		Value = (wchar_t*) attrs.getValue(i);
   		if (Localname == kw_name)
   		{
   			name = Value;
  @@ -377,33 +377,33 @@
   		switch(m_lev0)
   		{
   		case WSDD_UNKNOWN:
  -			if(0 == wcscmp(localname, kw_depl))
  +			if(0 == wcscmp((wchar_t*) localname, kw_depl))
   			{  
   				m_lev0 = WSDD_DEPLOYMENT;
   				//nothing to get
   			}
   			break;
   		case WSDD_DEPLOYMENT:
  -			if(0 == wcscmp(localname, kw_glconf))
  +			if(0 == wcscmp((wchar_t*) localname, kw_glconf))
   			{  
   				m_lev0 = WSDD_GLOBCONF;
   				//nothing to get
   			}
  -			else if(0 == wcscmp(localname, kw_srv))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_srv))
   			{  
   				m_lev0 = WSDD_SERVICE;
   				m_pService = new WSDDService();
   				//get service name and proider if any
   				ProcessAttributes(WSDD_SERVICE, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_hdl))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_hdl))
   			{  
   				m_lev0 = WSDD_HANDLER;
   				m_pHandler = new WSDDHandler();
   				ProcessAttributes(WSDD_HANDLER, attrs);
   				//get handler name and type if any
   			}
  -			else if(0 == wcscmp(localname, kw_tr))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_tr))
   			{  
   				m_lev0 = WSDD_TRANSPORT;
   				ProcessAttributes(WSDD_TRANSPORT, attrs);
  @@ -414,16 +414,16 @@
   			}
   			break;
   		case WSDD_GLOBCONF:
  -			if(0 == wcscmp(localname, kw_param))
  +			if(0 == wcscmp((wchar_t*) localname, kw_param))
   			{  
   				GetParameters(WSDD_GLOBCONF, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_rqf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rqf))
   			{  
   				m_lev1 = WSDD_REQFLOW;
   				ProcessAttributes(WSDD_REQFLOW, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_rsf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rsf))
   			{  
   				m_lev1 = WSDD_RESFLOW;
   				ProcessAttributes(WSDD_RESFLOW, attrs);
  @@ -434,16 +434,16 @@
   			}
   		break; 
   		case WSDD_SERVICE:
  -			if(0 == wcscmp(localname, kw_param))
  +			if(0 == wcscmp((wchar_t*) localname, kw_param))
   			{  
   				GetParameters(WSDD_SERVICE, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_rqf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rqf))
   			{  
   				m_lev1 = WSDD_REQFLOW;
   				ProcessAttributes(WSDD_REQFLOW, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_rsf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rsf))
   			{  
   				m_lev1 = WSDD_RESFLOW;
   				ProcessAttributes(WSDD_RESFLOW, attrs);
  @@ -454,19 +454,19 @@
   			}
   		break;
   		case WSDD_HANDLER:
  -			if(0 == wcscmp(localname, kw_param))
  +			if(0 == wcscmp((wchar_t*) localname, kw_param))
   			{  
   				GetParameters(WSDD_HANDLER, attrs);
   			}
   
   		break;
   		case WSDD_TRANSPORT:
  -			if(0 == wcscmp(localname, kw_rqf))
  +			if(0 == wcscmp((wchar_t*) localname, kw_rqf))
   			{  
   				m_lev1 = WSDD_REQFLOW;
   				ProcessAttributes(WSDD_REQFLOW, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_rsf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rsf))
   			{  
   				m_lev1 = WSDD_RESFLOW;
   				ProcessAttributes(WSDD_RESFLOW, attrs);
  @@ -476,19 +476,19 @@
   	}
   	else // inside a requestFlow or responseFlow elements
   	{
  -		if(0 == wcscmp(localname, kw_param))
  +		if(0 == wcscmp((wchar_t*) localname, kw_param))
   		{  
   			GetParameters(m_lev2, attrs); //must be parameters of a handler or a chain
   		}
   
  -		else if(0 == wcscmp(localname, kw_hdl))
  +		else if(0 == wcscmp((wchar_t*) localname, kw_hdl))
   		{  
   			m_lev2 = WSDD_HANDLER;
   			m_pHandler = new WSDDHandler();
   			ProcessAttributes(WSDD_HANDLER, attrs);
   			//get handler name and type if any
   		}
  -		else if(0 == wcscmp(localname, kw_chain))
  +		else if(0 == wcscmp((wchar_t*) localname, kw_chain))
   		{
   
   		}
  @@ -503,14 +503,14 @@
   void WSDDDocument::startPrefixMapping(const XMLCh* const prefix, const XMLCh* const uri)
   {
   //	AxisString sPrifix = prefix;
  -	AxisString sUri = uri;
  -	m_NsStack[prefix] = uri; //I think the same prifix cannot repeat ???
  +	AxisString sUri = (wchar_t*) uri;
  +	m_NsStack[(wchar_t*) prefix] = (wchar_t*)  uri; //I think the same prifix cannot repeat
???
   }
   
   void WSDDDocument::endPrefixMapping(const XMLCh* const prefix)
   {
   //	string sPrifix = prefix;
  -	m_NsStack.erase(prefix); //I think the same prifix cannot repeat ???
  +	m_NsStack.erase((wchar_t*) prefix); //I think the same prifix cannot repeat ???
   }
   
   void  WSDDDocument::characters (const XMLCh *const chars, const unsigned int length)
  
  
  

Mime
View raw message