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 su...@apache.org on 2003/12/11 05:29:58 UTC
cvs commit: ws-axis/c/vc/wsdd WSDD.dsp
susantha 2003/12/10 20:29:57
Modified: c/include/axis/common Tag: CWrapperSupport GDefine.h Param.h
c/include/axis/soap Tag: CWrapperSupport SoapDeSerializer.h
c/include/axis/wsdd Tag: CWrapperSupport WSDDDocument.h
c/include/axis/xml Tag: CWrapperSupport QName.h
c/src/common Tag: CWrapperSupport AxisUtils.cpp
c/src/engine Tag: CWrapperSupport Axis.cpp
c/src/server/samples/interoptests/base Tag: CWrapperSupport
InteropTestPortTypeWrapper.cpp
InteropTestPortTypeWrapper.h
c/src/soap Tag: CWrapperSupport SoapDeSerializer.cpp
c/src/wsdd Tag: CWrapperSupport WSDDDocument.cpp
c/src/xml Tag: CWrapperSupport QName.cpp
c/vc/client Tag: CWrapperSupport client.dsp
c/vc/common Tag: CWrapperSupport Common.dsp
c/vc/engine Tag: CWrapperSupport Engine.dsp ExEngine.dsp
c/vc/server/apache1_3 Tag: CWrapperSupport Apache1_3.dsp
c/vc/server/apache2_0 Tag: CWrapperSupport Apache2_0.dsp
c/vc/server/simple_axis_server Tag: CWrapperSupport
SimpleAxisServer.dsp
c/vc/soap Tag: CWrapperSupport Soap.dsp
c/vc/wsdd Tag: CWrapperSupport WSDD.dsp
Log:
Used Expat for parsing
Revision Changes Path
No revision
No revision
1.1.4.6 +1 -0 ws-axis/c/include/axis/common/GDefine.h
Index: GDefine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/GDefine.h,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -r1.1.4.5 -r1.1.4.6
--- GDefine.h 21 Nov 2003 12:48:07 -0000 1.1.4.5
+++ GDefine.h 11 Dec 2003 04:29:56 -0000 1.1.4.6
@@ -74,6 +74,7 @@
#define AxisChar char
#define AxisXMLCh char
+#define XMLCh AxisChar
#ifdef __cplusplus
#define AxisString basic_string<char>
1.2.4.2 +1 -1 ws-axis/c/include/axis/common/Param.h
Index: Param.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/Param.h,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- Param.h 7 Nov 2003 09:46:16 -0000 1.2.4.1
+++ Param.h 11 Dec 2003 04:29:56 -0000 1.2.4.2
@@ -84,7 +84,7 @@
{
friend class SoapDeSerializer;
friend class SoapSerializer;
- friend class XMLStreamHandler;
+ friend class SoapParser;
public:
Param(){ m_Type = USER_TYPE;}; //if there is no attribute that says the type
No revision
No revision
1.2.4.5 +2 -7 ws-axis/c/include/axis/soap/SoapDeSerializer.h
Index: SoapDeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/soap/SoapDeSerializer.h,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -u -r1.2.4.4 -r1.2.4.5
--- SoapDeSerializer.h 4 Dec 2003 05:37:38 -0000 1.2.4.4
+++ SoapDeSerializer.h 11 Dec 2003 04:29:56 -0000 1.2.4.5
@@ -68,8 +68,7 @@
#define AFX_SOAPDESERIALIZER_H__FD0E7C3B_B887_480A_9E2A_20736A88B09B__INCLUDED_
#include <axis/common/IHandlerSoapDeSerializer.h>
-//#include "XMLStreamHandler.h"
-#include <axis/soap/XMLSimpleHandler.h>
+#include "SoapParser.h"
#include <string>
#define HUGE_BUFFER_SIZE 8192
@@ -83,11 +82,7 @@
class SoapDeSerializer : public IHandlerSoapDeSerializer
{
private:
- SAX::FeatureNames<std::string> fNames;
- SAX::PropertyNames<std::string> pNames;
-
- SAX::XMLReader<std::string>* m_pParser;
- XMLStreamHandler m_pHandler;
+ SoapParser* m_pParser;
const Ax_soapstream* m_pInputStream;
const char* m_pCurrentBuffer;
Param* m_pLastArrayParam;
No revision
No revision
1.2.4.5 +22 -90 ws-axis/c/include/axis/wsdd/WSDDDocument.h
Index: WSDDDocument.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/wsdd/WSDDDocument.h,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -u -r1.2.4.4 -r1.2.4.5
--- WSDDDocument.h 4 Dec 2003 08:04:23 -0000 1.2.4.4
+++ WSDDDocument.h 11 Dec 2003 04:29:56 -0000 1.2.4.5
@@ -70,26 +70,9 @@
#include "WSDDDeployment.h"
#include "WSDDService.h"
-#include "../common/GDefine.h"
-
-#include <axis/soap/XMLSimpleHandler.h>
-#include <string>
-#include <arabica/SAX/XMLReader.h>
-#include <arabica/SAX/EntityResolver.h>
-#include <arabica/SAX/DTDHandler.h>
-#include <arabica/SAX/ContentHandler.h>
-#include <arabica/SAX/ErrorHandler.h>
-#include <arabica/SAX/Locator.h>
-#include <arabica/SAX/Attributes.h>
-#include <arabica/SAX/ext/LexicalHandler.h>
-#include <arabica/SAX/ext/DeclHandler.h>
-#include <arabica/SAX/SAXException.h>
-
-/*#include <xercesc/sax2/DefaultHandler.hpp>
-#include <xercesc/sax2/SAX2XMLReader.hpp>
-#include <xercesc/sax2/XMLReaderFactory.hpp>
-#include <xercesc/util/PlatformUtils.hpp>*/
+#include "../xml/QName.h"
+#include <expat.h>
#include <string>
#include <map>
@@ -97,20 +80,14 @@
enum WSDDLevels {WSDD_UNKNOWN=1, WSDD_DEPLOYMENT, WSDD_UNDEPLOYMENT, WSDD_GLOBCONF, WSDD_SERVICE, WSDD_HANDLER, WSDD_CHAIN, WSDD_TRANSPORT, WSDD_REQFLOW, WSDD_RESFLOW, WSDD_PARAM };
-//XERCES_CPP_NAMESPACE_USE;
-
-
//wsdd file related defines
#define METHODNAME_SEPARATOR ' '
#define ROLENAME_SEPARATOR ','
#define TRANSCODE_BUFFER_SIZE 256
-class WSDDDocument:public SAX::ContentHandler, public SAX::ErrorHandler
- /* ,public SAX::EntityResolver, public SAX::DTDHandler,
- public SAX::LexicalHandler,
- public SAX::DeclHandler */
+class WSDDDocument
{
-private:
+private:
bool m_bFatalError;
bool m_bError;
int m_nLibId;
@@ -128,8 +105,8 @@
private:
//const AxisChar* __XTRC(const string& pChar);
- void ProcessAttributes(WSDDLevels ElementType, const AttributesT& attrs);
- void GetParameters(WSDDLevels ElementType, const AttributesT& attrs);
+ void ProcessAttributes(WSDDLevels ElementType, const XMLCh **attrs);
+ void GetParameters(WSDDLevels ElementType, const XMLCh **attrs);
void AddAllowedRolesToService(const AxisXMLCh* value);
void AddAllowedMethodsToService(const AxisXMLCh* value);
@@ -139,67 +116,22 @@
int ParseDocument(const AxisChar* sWSDD);
int GetDeployment(const AxisChar* sWSDD, WSDDDeployment* pDeployment);
- // -----------------------------------------------------------------------
- // Implementations of the SAX DocumentHandler interface
- // -----------------------------------------------------------------------
- void startElement(const string& uri, const string& localname, const string& qname, const AttributesT &attrs);
- void characters (const string& chars);
- void endElement (const string& uri, const string& localname, const string& qname);
- void startPrefixMapping(const string& prefix, const string& uri);
- void endPrefixMapping(const string& prefix);
-
- /*void startElement(const string& uri,const string& localname,const string& qname,const AttributesT &attrs);
- void characters (const string& chars,const unsigned int length);
- void endElement (const string& uri,const string& localname,const string& qname);
- void startPrefixMapping(const string& prefix, const string& uri);
- void endPrefixMapping(const string& prefix);*/
-
- // -----------------------------------------------------------------------
- // Implementations of the SAX ErrorHandler interface
- // -----------------------------------------------------------------------
- void warning(const SAX::SAXParseException& exception);
- void error(const SAX::SAXParseException& exception);
- void fatalError(const SAX::SAXParseException& exception);
-
-
-
- virtual void setDocumentLocator(const LocatorT& locator){ }
- virtual void startDocument(){ }
- virtual void endDocument(){ }
- virtual void ignorableWhitespace(const std::string& ch){ }
- virtual void processingInstruction(const std::string& target, const std::string& data){ }
- virtual void skippedEntity(const std::string& name){ }
-
- /*Following are not important for our purpose*/
- virtual void notationDecl(const std::string& name,
- const std::string& publicId,
- const std::string& systemId){}
- virtual void unparsedEntityDecl(const std::string& name,
- const std::string& publicId,
- const std::string& systemId,
- const std::string& notationName){ }
-
- virtual void startDTD(const std::string& name,
- const std::string& publicId,
- const std::string& systemId){ }
- virtual void endDTD(){ }
- virtual void startEntity(const std::string& name){ }
- virtual void endEntity(const std::string& name){ }
- virtual void startCDATA(){ }
- virtual void endCDATA(){ }
- virtual void comment(const std::string& text){ }
- virtual void elementDecl(const std::string& name, const std::string& model){ }
- virtual void attributeDecl(const std::string& elementName,
- const std::string& attributeName,
- const std::string& type,
- const std::string& valueDefault,
- const std::string& value){ }
- virtual void internalEntityDecl(const std::string& name, const std::string& value){ }
- virtual void externalEntityDecl(const std::string& name,
- const std::string& publicId,
- const std::string& systemId){ }
- virtual SAX::InputSource resolveEntity(const std::string& publicId, const std::string& systemId){ return SAX::InputSource();}
-
+ void startElement(const XMLCh *qname,const XMLCh **attrs);
+ void endElement(const XMLCh *qname);
+ void characters(const XMLCh *chars,int length);
+ void startPrefixMapping(const XMLCh *prefix, const XMLCh *uri);
+ void endPrefixMapping(const XMLCh *prefix);
+
+ inline static void XMLCALL s_startElement(void* p, const XMLCh *qname,const XMLCh **attrs)
+ {((WSDDDocument*)p)->startElement(qname,attrs);};
+ inline static void XMLCALL s_endElement(void* p, const XMLCh *qname)
+ {((WSDDDocument*)p)->endElement(qname);};
+ inline static void XMLCALL s_characters(void* p, const XMLCh *chars,int length)
+ {((WSDDDocument*)p)->characters(chars,length);};
+ inline static void XMLCALL s_startPrefixMapping(void* p, const XMLCh *prefix, const XMLCh *uri)
+ {((WSDDDocument*)p)->startPrefixMapping(prefix, uri);};
+ inline static void XMLCALL s_endPrefixMapping(void* p, const XMLCh *prefix)
+ {((WSDDDocument*)p)->endPrefixMapping(prefix);};
};
#endif //__WSDDDOCUMENTS_H_INCLUDED__
No revision
No revision
1.1.4.1 +10 -14 ws-axis/c/include/axis/xml/QName.h
Index: QName.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/xml/QName.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- QName.h 20 Oct 2003 03:18:20 -0000 1.1
+++ QName.h 11 Dec 2003 04:29:56 -0000 1.1.4.1
@@ -68,9 +68,7 @@
#if !defined(AFX_QNAME_H__7E4E7E7B_F051_4989_89A6_F0248109C410__INCLUDED_)
#define AFX_QNAME_H__7E4E7E7B_F051_4989_89A6_F0248109C410__INCLUDED_
-#include <string>
-
-using namespace std;
+#include "../common/GDefine.h"
/**
* Qualified name according to "Namespaces in XML" specification.
@@ -92,21 +90,19 @@
* @brief Qualified name according to "Namespaces in XML" specification
*/
+#define NAMESPACESEPARATOR 0x03 /*Heart*/
+
class QName
{
public:
- string& getPrefix();
- string& getNamespaceURI();
- string& getLocalPart();
- QName(string& sNamespaceURI, string& sLocalPart, string& sPrefix);
- QName(string& sNamespaceURI, string& sLocalPart);
- QName(string& sLocalPart);
- virtual ~QName();
+ const XMLCh* uri;
+ const XMLCh* localname;
-private:
- string m_sPrefix;
- string m_sNamespaceURI;
- string m_sLocalPart;
+public:
+ QName();
+ virtual ~QName();
+ void SplitQNameString(const XMLCh* qname);
+ void MergeQNameString();
};
#endif // !defined(AFX_QNAME_H__7E4E7E7B_F051_4989_89A6_F0248109C410__INCLUDED_)
No revision
No revision
1.10.4.2 +0 -4 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.10.4.1
retrieving revision 1.10.4.2
diff -u -r1.10.4.1 -r1.10.4.2
--- AxisUtils.cpp 21 Nov 2003 12:48:08 -0000 1.10.4.1
+++ AxisUtils.cpp 11 Dec 2003 04:29:57 -0000 1.10.4.2
@@ -67,10 +67,6 @@
#include <axis/common/AxisUtils.h>
#include <axis/common/GDefine.h>
-#include <xercesc/util/XMLString.hpp>
-
-XERCES_CPP_NAMESPACE_USE
-
AxisXMLCh AxisUtils::m_Buffer[CONVERT_BUFFER_SIZE];
//////////////////////////////////////////////////////////////////////
No revision
No revision
1.30.4.3 +0 -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.2
retrieving revision 1.30.4.3
diff -u -r1.30.4.2 -r1.30.4.3
--- Axis.cpp 2 Dec 2003 11:42:00 -0000 1.30.4.2
+++ Axis.cpp 11 Dec 2003 04:29:57 -0000 1.30.4.3
@@ -92,8 +92,6 @@
#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
#define WSDLDIRECTORY "./Axis/wsdls/"
No revision
No revision
1.3.4.2 +6 -6 ws-axis/c/src/server/samples/interoptests/base/InteropTestPortTypeWrapper.cpp
Index: InteropTestPortTypeWrapper.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/base/InteropTestPortTypeWrapper.cpp,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- InteropTestPortTypeWrapper.cpp 21 Nov 2003 12:48:10 -0000 1.3.4.1
+++ InteropTestPortTypeWrapper.cpp 11 Dec 2003 04:29:57 -0000 1.3.4.2
@@ -117,7 +117,7 @@
v0.m_Array = new string[v0.m_Size];
if (AXIS_SUCCESS != pIWSDZ->GetArray((Axis_Array*)(&v0), XSD_STRING)) return AXIS_FAIL;
ArrayOfstring ret = pWs->echoStringArray(v0);
- return pIWSSZ->AddOutputParam("echoStringArrayReturn", (Axis_Array*)(&ret),XSD_STRING);
+ return pIWSSZ->AddOutputBasicArrayParam("echoStringArrayReturn", (Axis_Array*)(&ret),XSD_STRING);
}
@@ -157,7 +157,7 @@
v0.m_Array = new int[v0.m_Size];
if (AXIS_SUCCESS != pIWSDZ->GetArray((Axis_Array*)(&v0), XSD_INT)) return AXIS_FAIL;
ArrayOfint ret = pWs->echoIntegerArray(v0);
- return pIWSSZ->AddOutputParam("echoIntegerArrayReturn", (Axis_Array*)(&ret),XSD_INT);
+ return pIWSSZ->AddOutputBasicArrayParam("echoIntegerArrayReturn", (Axis_Array*)(&ret),XSD_INT);
}
@@ -197,7 +197,7 @@
v0.m_Array = new float[v0.m_Size];
if (AXIS_SUCCESS != pIWSDZ->GetArray((Axis_Array*)(&v0), XSD_FLOAT)) return AXIS_FAIL;
ArrayOffloat ret = pWs->echoFloatArray(v0);
- return pIWSSZ->AddOutputParam("echoFloatArrayReturn", (Axis_Array*)(&ret),XSD_FLOAT);
+ return pIWSSZ->AddOutputBasicArrayParam("echoFloatArrayReturn", (Axis_Array*)(&ret),XSD_FLOAT);
}
@@ -217,7 +217,7 @@
, (void*)Axis_Create_SOAPStruct, (void*)Axis_Delete_SOAPStruct
, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
SOAPStruct *ret = pWs->echoStruct(v0);
- return pIWSSZ->AddOutputParam("echoStructReturn", ret, (void*)Axis_Serialize_SOAPStruct, (void*)Axis_Delete_SOAPStruct);
+ return pIWSSZ->AddOutputCmplxParam("echoStructReturn", ret, (void*)Axis_Serialize_SOAPStruct, (void*)Axis_Delete_SOAPStruct);
}
@@ -233,11 +233,11 @@
mc->getSoapDeSerializer(&pIWSDZ);
if (!pIWSDZ) return AXIS_FAIL;
pIWSSZ->createSoapMethod("echoStructArrayResponse", pIWSSZ->getNewNamespacePrefix(), "http://soapinterop.org/");
- ArrayOfSOAPStruct v0 = (ArrayOfSOAPStruct&)pIWSDZ->GetArray((void*)Axis_DeSerialize_SOAPStruct
+ ArrayOfSOAPStruct v0 = (ArrayOfSOAPStruct&)pIWSDZ->GetCmplxArray((void*)Axis_DeSerialize_SOAPStruct
, (void*)Axis_Create_SOAPStruct, (void*)Axis_Delete_SOAPStruct
, (void*)Axis_GetSize_SOAPStruct, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
ArrayOfSOAPStruct ret = pWs->echoStructArray(v0);
- return pIWSSZ->AddOutputParam("echoStructArrayReturn", (Axis_Array*)(&ret),(void*) Axis_Serialize_SOAPStruct, (void*) Axis_Delete_SOAPStruct, (void*) Axis_GetSize_SOAPStruct, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
+ return pIWSSZ->AddOutputCmplxArrayParam("echoStructArrayReturn", (Axis_Array*)(&ret),(void*) Axis_Serialize_SOAPStruct, (void*) Axis_Delete_SOAPStruct, (void*) Axis_GetSize_SOAPStruct, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
}
1.1.4.2 +4 -4 ws-axis/c/src/server/samples/interoptests/base/InteropTestPortTypeWrapper.h
Index: InteropTestPortTypeWrapper.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/base/InteropTestPortTypeWrapper.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- InteropTestPortTypeWrapper.h 7 Nov 2003 09:46:21 -0000 1.1.4.1
+++ InteropTestPortTypeWrapper.h 11 Dec 2003 04:29:57 -0000 1.1.4.2
@@ -24,10 +24,10 @@
public:
virtual ~InteropTestPortTypeWrapper();
public://implementation of WrapperClassHandler interface
- int AXISCALL(Invoke)(IMessageData* mc);
- void AXISCALL(OnFault)(IMessageData* pMsg);
- int AXISCALL(Init)();
- int AXISCALL(Fini)();
+ int AXISCALL Invoke(IMessageData* mc);
+ void AXISCALL OnFault(IMessageData* pMsg);
+ int AXISCALL Init();
+ int AXISCALL Fini();
private://Methods corresponding to the web service methods
int echoString(IMessageData* mc);
int echoStringArray(IMessageData* mc);
No revision
No revision
1.17.4.7 +14 -34 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.17.4.6
retrieving revision 1.17.4.7
diff -u -r1.17.4.6 -r1.17.4.7
--- SoapDeSerializer.cpp 4 Dec 2003 08:04:24 -0000 1.17.4.6
+++ SoapDeSerializer.cpp 11 Dec 2003 04:29:57 -0000 1.17.4.7
@@ -73,9 +73,6 @@
#include <axis/common/GDefine.h>
#include <axis/common/Packet.h>
-#include <arabica/SAX/helpers/FeatureNames.h>
-#include <arabica/SAX/helpers/PropertyNames.h>
-
#include <axis/common/AxisTrace.h>
@@ -87,13 +84,12 @@
{
m_pInputStream = NULL;
m_pLastArrayParam = NULL;
- m_pParser = NULL;
- m_pParser = new SAX::XMLReader<std::string>;
+ m_pParser = new SoapParser();
}
SoapDeSerializer::~SoapDeSerializer()
{
- m_pHandler.Init();
+ m_pParser->Init();
if (m_pParser) delete m_pParser;
}
@@ -103,13 +99,12 @@
int nChars = 0;
if (NULL != m_pInputStream->transport.pGetFunct)
{
- m_pParser->parse_start();
do {
m_pInputStream->transport.pGetFunct(&m_pCurrentBuffer, &nChars, m_pInputStream->str.ip_stream);
if ((nChars > 0) && m_pCurrentBuffer)
- m_pParser->parse_continue(m_pCurrentBuffer, nChars);
+ m_pParser->Parse(m_pCurrentBuffer, nChars);
} while (nChars > 0);
- m_pParser->parse_end();
+ m_pParser->ParseEnd();
}
return AXIS_SUCCESS;
}
@@ -117,7 +112,7 @@
SoapEnvelope* SoapDeSerializer::GetEnvelope()
{
AXISTRACE1("SoapDeSerializer::GetEnvelope");
- return m_pHandler.m_pEnv;
+ return m_pParser->m_pEnv;
}
ISoapHeader* SoapDeSerializer::GetHeader()
@@ -125,24 +120,24 @@
//actually here a dynamic cast is not needed. But it is
// done for safe side, incase SoapHeader derives from
// more that one interface and the deriving order changes.
- return static_cast<ISoapHeader*>(m_pHandler.m_pHead);
+ return static_cast<ISoapHeader*>(m_pParser->m_pHead);
}
SoapBody* SoapDeSerializer::GetBody()
{
AXISTRACE1("SoapDeSerializer::GetBody");
- return m_pHandler.m_pBody;
+ return m_pParser->m_pBody;
}
SoapMethod* SoapDeSerializer::GetMethod()
{
AXISTRACE1("SoapDeSerializer::GetMethod");
- return m_pHandler.m_pMethod;
+ return m_pParser->m_pMethod;
}
SoapFault* SoapDeSerializer::GetFault()
{
- return m_pHandler.m_pFault;
+ return m_pParser->m_pFault;
}
//this function is more usefull with XMLpull parser
@@ -184,28 +179,13 @@
IParam* SoapDeSerializer::GetParam()
{
AXISTRACE1("SoapDeSerializer::GetParam");
- return m_pHandler.GetParam();
+ return m_pParser->GetParam();
}
int SoapDeSerializer::Init()
{
- try
- {
- m_pHandler.Init();
-
- m_pParser->setFeature(fNames.external_general, true);
- m_pParser->setFeature(fNames.namespaces, true);
- m_pParser->setFeature(fNames.namespace_prefixes, true);
- m_pParser->setContentHandler(m_pHandler);
- m_pParser->setErrorHandler(m_pHandler);
- }
- catch(SAX::SAXException& e)
- {
- return AXIS_FAIL;
- }
-
+ m_pParser->Init();
m_pLastArrayParam = NULL;
-
return AXIS_SUCCESS;
}
@@ -213,17 +193,17 @@
const AxisChar* SoapDeSerializer::GetMethodName()
{
- if (m_pHandler.m_pMethod)
+ if (m_pParser->m_pMethod)
{
AXISTRACE1("SoapDeSerializer::GetMethodName");
- return m_pHandler.m_pMethod->getMethodName();
+ return m_pParser->m_pMethod->getMethodName();
}
return NULL;
}
int SoapDeSerializer::GetVersion()
{
- return m_pHandler.m_nSoapVersion;
+ return m_pParser->m_nSoapVersion;
}
Axis_Array SoapDeSerializer::GetCmplxArray(void* pDZFunct, void* pCreFunct, void* pDelFunct, void* pSizeFunct, const AxisChar* pchTypeName, const AxisChar* pchURI)
No revision
No revision
1.23.4.5 +101 -148 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.23.4.4
retrieving revision 1.23.4.5
diff -u -r1.23.4.4 -r1.23.4.5
--- WSDDDocument.cpp 4 Dec 2003 08:04:24 -0000 1.23.4.4
+++ WSDDDocument.cpp 11 Dec 2003 04:29:57 -0000 1.23.4.5
@@ -67,8 +67,8 @@
#include <string>
#include <axis/common/AxisTrace.h>
-
-#define __XTRC(x) x
+#define NAMESPACESEPARATOR 0x03 /*Heart*/
+#define FILEBUFFSIZE 1024
WSDDDocument::WSDDDocument()
{
@@ -97,69 +97,50 @@
int WSDDDocument::ParseDocument(const AxisChar* sWSDD)
{
-// AXISTRACE1("inside ParseDocument\n");
- try
- {
- //SAX2XMLReader* parser = XMLReaderFactory::createXMLReader();
-
- SAX::XMLReader<std::string> parser;
- SAX::FeatureNames<std::string> fNames;
- SAX::PropertyNames<std::string> pNames;
- try
- {
- parser.setFeature(fNames.external_general, true);
- // parser.setFeature(fNames.validation, true);
- parser.setFeature(fNames.namespaces, true);
- parser.setFeature(fNames.namespace_prefixes, true);
- }
- catch(SAX::SAXException& e)
- {
-// std::cerr << e.what() << std::endl;
- }
-
- parser.setContentHandler(*this);
- parser.setErrorHandler(*this);
-/*
- parser.setDTDHandler(*this);
- parser.setEntityResolver(*this);
-
- try
- {
- parser.setProperty(pNames.declHandler, static_cast<SAX::DeclHandler&>(*this));
- parser.setProperty(pNames.lexicalHandler, static_cast<SAX::LexicalHandler&>(*this));
- }
- catch(SAX::SAXException& e)
- {
- std::cout << e.what() << std::endl;
- } // catch
-*/
- string strDocPath(sWSDD);
- SAX::InputSource Input(strDocPath);
- parser.parse(Input);
-
-
-
- //parser->setContentHandler(this);
- //parser->setErrorHandler(this);
- //AXISTRACE1("BEFORE parser->parse(sWSDD);");
-
- //parser->parse(sWSDD);
-
- //delete parser;
-
+ XMLCh Buff[FILEBUFFSIZE];
+ XML_Parser Parser = XML_ParserCreateNS(NULL, NAMESPACESEPARATOR);
+ XML_SetUserData(Parser, this);
+ XML_SetNamespaceDeclHandler(Parser, s_startPrefixMapping, s_endPrefixMapping);
+ XML_SetElementHandler(Parser, s_startElement, s_endElement);
+ XML_SetCharacterDataHandler(Parser, s_characters);
+ FILE *file = fopen(sWSDD, "r");
+ if (NULL == file)
+ {
+ XML_ParserFree(Parser);
+ return AXIS_FAIL;
}
- catch (...)
+ for (;;)
{
- return AXIS_FAIL;
+ int done;
+ int len;
+ len = fread(Buff, 1, FILEBUFFSIZE, file);
+ if (ferror(file))
+ {
+ fclose(file);
+ XML_ParserFree(Parser);
+ return AXIS_FAIL;
+ }
+ done = feof(file);
+ if (XML_Parse(Parser, Buff, len, done) == XML_STATUS_ERROR)
+ {
+ fclose(file);
+ XML_ParserFree(Parser);
+ return AXIS_FAIL;
+ }
+
+ if (done)
+ break;
}
+ fclose(file);
+ XML_ParserFree(Parser);
return AXIS_SUCCESS;
}
-void WSDDDocument::endElement (const std::string& uri, const std::string& localname, const std::string& qname)
+void WSDDDocument::endElement (const XMLCh *qname)
{
- AxisXMLString sLname = __XTRC(localname);
- const AxisXMLCh* lname = sLname.c_str();
- if (0 != strcmp(lname, kw_param)) //just neglect endElement of parameter
+ QName qn;
+ qn.SplitQNameString(qname);
+ if (0 != strcmp(qn.localname, kw_param)) //just neglect endElement of parameter
{
if (m_lev1 == WSDD_UNKNOWN) //not inside a requestFlow or responseFlow elements
{
@@ -172,7 +153,7 @@
m_lev0 = WSDD_DEPLOYMENT;
break;
case WSDD_SERVICE:
- if (0 == strcmp(lname, kw_srv))
+ if (0 == strcmp(qn.localname, kw_srv))
{
//add service object to Deployment object
m_pDeployment->AddService(m_pService);
@@ -201,7 +182,7 @@
}
else // inside a requestFlow or responseFlow elements
{
- if(0 == strcmp(lname, kw_hdl))
+ if(0 == strcmp(qn.localname, kw_hdl))
{
m_lev2 = WSDD_UNKNOWN;
//add handler in m_pHandler to the corresponding container.
@@ -228,42 +209,39 @@
default: ; //this cannot happen ??
}
}
- else if(0 == strcmp(lname, kw_rqf))
+ else if(0 == strcmp(qn.localname, kw_rqf))
{
m_lev1 = WSDD_UNKNOWN;
}
- else if(0 == strcmp(lname, kw_rsf))
+ else if(0 == strcmp(qn.localname, kw_rsf))
{
m_lev1 = WSDD_UNKNOWN;
}
}
}
+ qn.MergeQNameString();
}
-void WSDDDocument::ProcessAttributes(WSDDLevels ElementType, const AttributesT &attrs)
+void WSDDDocument::ProcessAttributes(WSDDLevels ElementType, const XMLCh **attrs)
{
- AxisXMLString sLocal;
- AxisXMLString sValue;
- const AxisXMLCh* local;
- const AxisXMLCh* value;
- for (int i = 0; i < attrs.getLength(); i++)
+ QName qn;
+ const XMLCh* value;
+ for (int i = 0; attrs[i]; i += 2)
{
- sLocal = __XTRC(attrs.getLocalName(i));
- sValue = __XTRC(attrs.getValue(i));
- local = sLocal.c_str();
- value = sValue.c_str();
+ qn.SplitQNameString(attrs[i]);
+ value = attrs[i+1];
switch(ElementType)
{
case WSDD_SERVICE: //add this attribute to current service object
- if (0 == strcmp(local, kw_name))
+ if (0 == strcmp(qn.localname, kw_name))
{
m_pService->SetServiceName(value);
}
- else if (0 == strcmp(local, kw_prv))
+ else if (0 == strcmp(qn.localname, kw_prv))
{
m_pService->SetProvider(value);
}
- else if (0 == strcmp(local, kw_desc))
+ else if (0 == strcmp(qn.localname, kw_desc))
{
m_pService->SetDescription(value);
}
@@ -273,11 +251,11 @@
}
break;
case WSDD_HANDLER: //add this attribute to current handler object
- if (0 == strcmp(local, kw_name))
+ if (0 == strcmp(qn.localname, kw_name))
{
//usefull ? ignore for now .. //TODO
}
- else if (0 == strcmp(local, kw_type))
+ else if (0 == strcmp(qn.localname, kw_type))
{
//we get the libname for the hanlder here ???
m_pHandler->SetLibName(value);
@@ -291,7 +269,7 @@
m_pHandler->SetLibId((*m_pLibNameIdMap)[value]);
}
}
- else if (0 == strcmp(local, kw_desc))
+ else if (0 == strcmp(qn.localname, kw_desc))
{
m_pHandler->SetDescription(value);
}
@@ -302,7 +280,7 @@
break;
case WSDD_REQFLOW:
case WSDD_RESFLOW:
- if (0 == strcmp(local, kw_name))
+ if (0 == strcmp(qn.localname, kw_name))
{
//usefull ? ignore for now .. //TODO
}
@@ -312,7 +290,7 @@
}
break;
case WSDD_TRANSPORT:
- if (0 == strcmp(local, kw_name))
+ if (0 == strcmp(qn.localname, kw_name))
{
//get tranport type
if (0 == strcmp(value, kw_http))
@@ -331,36 +309,34 @@
break;
default:;
}
+ qn.MergeQNameString();
}
}
-void WSDDDocument::GetParameters(WSDDLevels ElementType, const AttributesT &attrs)
+void WSDDDocument::GetParameters(WSDDLevels ElementType, const XMLCh **attrs)
{
- AxisXMLString sName, sValue, sType;
- const AxisXMLCh *name, *value, *type;
- //bool locked;
- AxisXMLString Localname, Value;
- for (int i = 0; i < attrs.getLength(); i++)
+ QName qn;
+ const XMLCh* value;
+ const XMLCh* type;
+ const XMLCh* name;
+ for (int i = 0; attrs[i]; i += 2)
{
- Localname = __XTRC(attrs.getLocalName(i));
- Value = __XTRC(attrs.getValue(i));
- if (0 == strcmp(Localname.c_str(), kw_name))
+ qn.SplitQNameString(attrs[i]);
+ value = attrs[i+1];
+ if (0 == strcmp(qn.localname, kw_name))
{
- sName = Value.c_str();
+ name = value;
}
- else if (0 == strcmp(Localname.c_str(), kw_value))
+ else if (0 == strcmp(qn.localname, kw_value))
{
- sValue = Value.c_str();
+ value = value;
}
- else if (0 == strcmp(Localname.c_str(), kw_type))
+ else if (0 == strcmp(qn.localname, kw_type))
{
- sType = Value.c_str();
+ type = value;
}
+ qn.MergeQNameString();
}
-
- name = sName.c_str();
- value = sValue.c_str();
- type = sType.c_str();
switch(ElementType)
{
@@ -446,48 +422,47 @@
}
-void WSDDDocument::startElement(const std::string& uri, const std::string& localname, const std::string& qname, const AttributesT &attrs)
+void WSDDDocument::startElement(const XMLCh *qname,const XMLCh **attrs)
{
- AxisXMLString sLname = __XTRC(localname);
- const AxisXMLCh* lname = sLname.c_str();
-
+ QName qn;
+ qn.SplitQNameString(qname);
if (m_lev1 == WSDD_UNKNOWN) //not inside a requestFlow or responseFlow elements
{
switch(m_lev0)
{
case WSDD_UNKNOWN:
- if(0 == strcmp(lname, kw_depl))
+ if(0 == strcmp(qn.localname, kw_depl))
{
m_lev0 = WSDD_DEPLOYMENT;
m_pDeployment->SetDeploymentType(DT_DEPLOYMENT);
}
- else if(0 == strcmp(lname, kw_undepl))
+ else if(0 == strcmp(qn.localname, kw_undepl))
{
m_lev0 = WSDD_DEPLOYMENT;
m_pDeployment->SetDeploymentType(DT_UNDEPLOYMENT);
}
break;
case WSDD_DEPLOYMENT:
- if(0 == strcmp(lname, kw_glconf))
+ if(0 == strcmp(qn.localname, kw_glconf))
{
m_lev0 = WSDD_GLOBCONF;
//nothing to get
}
- else if(0 == strcmp(lname, kw_srv))
+ else if(0 == strcmp(qn.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 == strcmp(lname, kw_hdl))
+ else if(0 == strcmp(qn.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 == strcmp(lname, kw_tr))
+ else if(0 == strcmp(qn.localname, kw_tr))
{
m_lev0 = WSDD_TRANSPORT;
ProcessAttributes(WSDD_TRANSPORT, attrs);
@@ -498,16 +473,16 @@
}
break;
case WSDD_GLOBCONF:
- if(0 == strcmp(lname, kw_param))
+ if(0 == strcmp(qn.localname, kw_param))
{
GetParameters(WSDD_GLOBCONF, attrs);
}
- else if(0 == strcmp(lname, kw_rqf))
+ else if(0 == strcmp(qn.localname, kw_rqf))
{
m_lev1 = WSDD_REQFLOW;
ProcessAttributes(WSDD_REQFLOW, attrs);
}
- else if(0 == strcmp(lname, kw_rsf))
+ else if(0 == strcmp(qn.localname, kw_rsf))
{
m_lev1 = WSDD_RESFLOW;
ProcessAttributes(WSDD_RESFLOW, attrs);
@@ -518,16 +493,16 @@
}
break;
case WSDD_SERVICE:
- if(0 == strcmp(lname, kw_param))
+ if(0 == strcmp(qn.localname, kw_param))
{
GetParameters(WSDD_SERVICE, attrs);
}
- else if(0 == strcmp(lname, kw_rqf))
+ else if(0 == strcmp(qn.localname, kw_rqf))
{
m_lev1 = WSDD_REQFLOW;
ProcessAttributes(WSDD_REQFLOW, attrs);
}
- else if(0 == strcmp(lname, kw_rsf))
+ else if(0 == strcmp(qn.localname, kw_rsf))
{
m_lev1 = WSDD_RESFLOW;
ProcessAttributes(WSDD_RESFLOW, attrs);
@@ -538,19 +513,19 @@
}
break;
case WSDD_HANDLER:
- if(0 == strcmp(lname, kw_param))
+ if(0 == strcmp(qn.localname, kw_param))
{
GetParameters(WSDD_HANDLER, attrs);
}
break;
case WSDD_TRANSPORT:
- if(0 == strcmp(lname, kw_rqf))
+ if(0 == strcmp(qn.localname, kw_rqf))
{
m_lev1 = WSDD_REQFLOW;
ProcessAttributes(WSDD_REQFLOW, attrs);
}
- else if(0 == strcmp(lname, kw_rsf))
+ else if(0 == strcmp(qn.localname, kw_rsf))
{
m_lev1 = WSDD_RESFLOW;
ProcessAttributes(WSDD_RESFLOW, attrs);
@@ -561,19 +536,19 @@
}
else // inside a requestFlow or responseFlow elements
{
- if(0 == strcmp(lname, kw_param))
+ if(0 == strcmp(qn.localname, kw_param))
{
GetParameters(m_lev2, attrs); //must be parameters of a handler or a chain
}
- else if(0 == strcmp(lname, kw_hdl))
+ else if(0 == strcmp(qn.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 == strcmp(lname, kw_chain))
+ else if(0 == strcmp(qn.localname, kw_chain))
{
}
@@ -581,45 +556,23 @@
{
//error : unknown element type in wsdd file
}
-
}
+ qn.MergeQNameString();
}
-void WSDDDocument::startPrefixMapping(const std::string& prefix, const std::string& uri)
+void WSDDDocument::startPrefixMapping(const XMLCh *prefix, const XMLCh *uri)
{
- m_NsStack[__XTRC(prefix)] = __XTRC(uri); //I think the same prifix cannot repeat ???
+ if (prefix) m_NsStack[prefix] = uri; //I think the same prifix cannot repeat ???
}
-void WSDDDocument::endPrefixMapping(const std::string& prefix)
+void WSDDDocument::endPrefixMapping(const XMLCh *prefix)
{
-// string sPrifix = prefix;
- m_NsStack.erase(__XTRC(prefix)); //I think the same prifix cannot repeat ???
+ if (prefix) m_NsStack.erase(prefix); //I think the same prifix cannot repeat ???
}
-void WSDDDocument::characters (const std::string& chars)
+void WSDDDocument::characters (const XMLCh* chars,int length)
{
//cout<<"==="<<XMLString::transcode(chars)<<"==="<<endl;
-}
-
-/*const AxisChar* WSDDDocument::__XTRC(const XMLCh *pChar)
-{
- if (true == (XMLString::transcode(pChar, m_Buffer, TRANSCODE_BUFFER_SIZE-1)))
- return m_Buffer;
- else
- return "";
-}
-*/
-
-void WSDDDocument::warning(const SAX::SAXParseException& exception)
-{
-}
-void WSDDDocument::error(const SAX::SAXParseException& exception)
-{
- m_bError = true;
-}
-void WSDDDocument::fatalError(const SAX::SAXParseException& exception)
-{
- m_bFatalError = true;
}
No revision
No revision
1.2.4.1 +29 -29 ws-axis/c/src/xml/QName.cpp
Index: QName.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/QName.cpp,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- QName.cpp 20 Oct 2003 06:42:30 -0000 1.2
+++ QName.cpp 11 Dec 2003 04:29:57 -0000 1.2.4.1
@@ -71,23 +71,10 @@
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-QName::QName(string& sLocalPart)
+QName::QName()
{
- m_sLocalPart= sLocalPart;
-}
-
-QName::QName(string& sNamespaceURI, string& sLocalPart)
-{
- m_sNamespaceURI= sNamespaceURI;
- m_sLocalPart= sLocalPart;
-}
-
-QName::QName(string& sNamespaceURI, string& sLocalPart, string& sPrefix)
-{
- m_sNamespaceURI= sNamespaceURI;
- m_sLocalPart= sLocalPart;
- m_sPrefix= sPrefix;
-
+ uri = 0;
+ localname = 0;
}
QName::~QName()
@@ -95,17 +82,30 @@
}
-string& QName::getLocalPart()
+void QName::SplitQNameString(const XMLCh* qname)
{
- return m_sLocalPart;
-}
-
-string& QName::getNamespaceURI()
-{
- return m_sNamespaceURI;
-}
-
-string& QName::getPrefix()
-{
- return m_sPrefix;
-}
+ XMLCh *p = const_cast<XMLCh*>(qname);
+ while (*p)
+ {
+ if (*p == NAMESPACESEPARATOR)
+ {
+ *p = '\0'; //put null to separate local name from namespace
+ localname = ++p; //now p points to localpart
+ uri = qname; //qname points to uri
+ return;
+ }
+ p++;
+ }
+ //if there is no separator that means there is no uri
+ localname = qname;
+ uri = 0; //no uri
+}
+
+void QName::MergeQNameString()
+{
+ if (uri)
+ {
+ XMLCh* p = const_cast<XMLCh*>(localname);
+ *(--p) = NAMESPACESEPARATOR;
+ }
+}
\ No newline at end of file
No revision
No revision
1.7.4.4 +2 -2 ws-axis/c/vc/client/client.dsp
Index: client.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/client/client.dsp,v
retrieving revision 1.7.4.3
retrieving revision 1.7.4.4
diff -u -r1.7.4.3 -r1.7.4.4
--- client.dsp 4 Dec 2003 05:37:38 -0000 1.7.4.3
+++ client.dsp 11 Dec 2003 04:29:57 -0000 1.7.4.4
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "../../bin/win32/client"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../include" /I "../../src/common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,7 +65,7 @@
# PROP Intermediate_Dir "../../bin/win32/client"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "C:/arabica" /I "c:/arabica/arabica" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
No revision
No revision
1.28.4.4 +2 -2 ws-axis/c/vc/common/Common.dsp
Index: Common.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/common/Common.dsp,v
retrieving revision 1.28.4.3
retrieving revision 1.28.4.4
diff -u -r1.28.4.3 -r1.28.4.4
--- Common.dsp 4 Dec 2003 05:37:39 -0000 1.28.4.3
+++ Common.dsp 11 Dec 2003 04:29:57 -0000 1.28.4.4
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "../../bin/win32/common"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# ADD CPP /nologo /MT /W3 /O2 /I "../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,7 +65,7 @@
# PROP Intermediate_Dir "../../bin/win32/common"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "C:/arabica" /I "c:/arabica/arabica" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
No revision
No revision
1.14.4.4 +2 -2 ws-axis/c/vc/engine/Engine.dsp
Index: Engine.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/engine/Engine.dsp,v
retrieving revision 1.14.4.3
retrieving revision 1.14.4.4
diff -u -r1.14.4.3 -r1.14.4.4
--- Engine.dsp 4 Dec 2003 05:37:39 -0000 1.14.4.3
+++ Engine.dsp 11 Dec 2003 04:29:57 -0000 1.14.4.4
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "../../bin/win32/engine"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# ADD CPP /nologo /MT /W3 /O2 /I "../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,7 +65,7 @@
# PROP Intermediate_Dir "../../bin/win32/engine"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "C:/arabica" /I "c:/arabica/arabica" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
1.4.2.3 +1 -1 ws-axis/c/vc/engine/ExEngine.dsp
Index: ExEngine.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/engine/ExEngine.dsp,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- ExEngine.dsp 4 Dec 2003 05:37:39 -0000 1.4.2.2
+++ ExEngine.dsp 11 Dec 2003 04:29:57 -0000 1.4.2.3
@@ -75,7 +75,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Engine_D.lib Common_D.lib Soap_D.lib wsdd_D.lib xerces-c_2D.lib Utilities.lib SAX.lib wsock32.lib /nologo /subsystem:console /profile /debug /machine:I386 /out:"../../release/win32/ExEngine_D.exe" /libpath:"../../lib/axis" /libpath:"../../lib/xerces-c" /libpath:"C:\Expat-1.95.7\Libs" /libpath:"C:\arabica\arabica\lib"
+# ADD LINK32 Engine_D.lib Common_D.lib Soap_D.lib wsdd_D.lib wsock32.lib /nologo /subsystem:console /profile /debug /machine:I386 /out:"../../release/win32/ExEngine_D.exe" /libpath:"../../lib/axis" /libpath:"../../lib/xerces-c" /libpath:"C:\Expat-1.95.7\Libs" /libpath:"C:\arabica\arabica\lib"
!ENDIF
No revision
No revision
1.14.2.4 +2 -2 ws-axis/c/vc/server/apache1_3/Apache1_3.dsp
Index: Apache1_3.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/server/apache1_3/Apache1_3.dsp,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -r1.14.2.3 -r1.14.2.4
--- Apache1_3.dsp 4 Dec 2003 05:37:39 -0000 1.14.2.3
+++ Apache1_3.dsp 11 Dec 2003 04:29:57 -0000 1.14.2.4
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 Common.lib Soap.lib wsdd.lib Engine.lib xerces-c_2.lib ApacheCore.lib /nologo /dll /machine:I386 /out:"C:\Program Files\Apache Group\Apache\modules\mod_axis.dll" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/axis" /libpath:"../../../lib/apache1_3"
+# ADD LINK32 Common.lib Soap.lib wsdd.lib Engine.lib libexpat.lib ApacheCore.lib /nologo /dll /machine:I386 /out:"C:\Program Files\Apache Group\Apache\modules\mod_axis.dll" /libpath:"../../../lib/axis" /libpath:"../../../lib/apache1_3" /libpath:"C:\Expat-1.95.7\Libs"
# SUBTRACT LINK32 /profile
!ELSEIF "$(CFG)" == "Apache1_3 - Win32 Debug"
@@ -81,7 +81,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib ApacheCore.lib Utilities.lib SAX.lib Utilities.lib SAX.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"C:\Program Files\Apache Group\Apache\modules\mod_axis.dll" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/apache1_3" /libpath:"C:\Expat-1.95.7\Libs" /libpath:"C:\arabica\arabica\lib"
+# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib ApacheCore.lib wsock32.lib libexpat.lib /nologo /dll /debug /machine:I386 /out:"C:\Program Files\Apache Group\Apache\modules\mod_axis.dll" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/apache1_3" /libpath:"C:\Expat-1.95.7\Source\lib\Debug"
# SUBTRACT LINK32 /profile
!ENDIF
No revision
No revision
1.7.2.2 +1 -1 ws-axis/c/vc/server/apache2_0/Apache2_0.dsp
Index: Apache2_0.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/server/apache2_0/Apache2_0.dsp,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- Apache2_0.dsp 8 Nov 2003 13:27:58 -0000 1.7.2.1
+++ Apache2_0.dsp 11 Dec 2003 04:29:57 -0000 1.7.2.2
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib xerces-c_2D.lib libapr.lib libhttpd.lib /nologo /dll /debug /machine:I386 /out:"../../../release/win32/mod_axis.dll" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/apache2_0"
+# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib libapr.lib libhttpd.lib /nologo /dll /debug /machine:I386 /out:"../../../release/win32/mod_axis.dll" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/apache2_0"
!ENDIF
No revision
No revision
1.13.2.2 +1 -1 ws-axis/c/vc/server/simple_axis_server/SimpleAxisServer.dsp
Index: SimpleAxisServer.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/server/simple_axis_server/SimpleAxisServer.dsp,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- SimpleAxisServer.dsp 4 Dec 2003 05:37:39 -0000 1.13.2.1
+++ SimpleAxisServer.dsp 11 Dec 2003 04:29:57 -0000 1.13.2.2
@@ -76,7 +76,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wsock32.lib Engine_D.lib Common_D.lib Soap_D.lib wsdd_D.lib xerces-c_2D.lib Utilities.lib SAX.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../release/win32/SimpleAxisServer_D.exe" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"C:\Expat-1.95.7\Libs" /libpath:"C:\arabica\arabica\lib"
+# ADD LINK32 wsock32.lib Engine_D.lib Common_D.lib Soap_D.lib wsdd_D.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../release/win32/SimpleAxisServer_D.exe" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"C:\Expat-1.95.7\Libs" /libpath:"C:\arabica\arabica\lib"
!ENDIF
No revision
No revision
1.10.4.5 +2 -2 ws-axis/c/vc/soap/Soap.dsp
Index: Soap.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/soap/Soap.dsp,v
retrieving revision 1.10.4.4
retrieving revision 1.10.4.5
diff -u -r1.10.4.4 -r1.10.4.5
--- Soap.dsp 9 Dec 2003 06:17:44 -0000 1.10.4.4
+++ Soap.dsp 11 Dec 2003 04:29:57 -0000 1.10.4.5
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "../../bin/win32/soap"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# ADD CPP /nologo /MT /W3 /O2 /I "../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,7 +65,7 @@
# PROP Intermediate_Dir "../../bin/win32/soap"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "C:/arabica" /I "c:/arabica/arabica" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
No revision
No revision
1.10.4.4 +2 -2 ws-axis/c/vc/wsdd/WSDD.dsp
Index: WSDD.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/wsdd/WSDD.dsp,v
retrieving revision 1.10.4.3
retrieving revision 1.10.4.4
diff -u -r1.10.4.3 -r1.10.4.4
--- WSDD.dsp 4 Dec 2003 05:37:39 -0000 1.10.4.3
+++ WSDD.dsp 11 Dec 2003 04:29:57 -0000 1.10.4.4
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "../../bin/win32/wsdd"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# ADD CPP /nologo /MT /W3 /O2 /I "../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,7 +65,7 @@
# PROP Intermediate_Dir "../../bin/win32/wsdd"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "C:/arabica" /I "c:/arabica/arabica" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "__AXISTRACE__" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "__AXISTRACE__" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe