You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2003/12/04 09:04:24 UTC
cvs commit: ws-axis/c/src/wsdd Makefile.am WSDDDocument.cpp
damitha 2003/12/04 00:04:24
Modified: c/include/axis/soap Tag: CWrapperSupport XMLSimpleHandler.h
c/include/axis/wsdd Tag: CWrapperSupport WSDDDocument.h
c/src Tag: CWrapperSupport Makefile.am
c/src/client/samples/Calculator Tag: CWrapperSupport
CalcClient.cpp 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 Makefile.am
c/src/soap Tag: CWrapperSupport Makefile.am
SoapDeSerializer.cpp XMLSimpleHandler.cpp
c/src/wsdd Tag: CWrapperSupport Makefile.am WSDDDocument.cpp
Log:
expat support. now the parser is reset after eache request, instead of recreating.
Revision Changes Path
No revision
No revision
1.1.2.3 +6 -6 ws-axis/c/include/axis/soap/Attic/XMLSimpleHandler.h
Index: XMLSimpleHandler.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/soap/Attic/XMLSimpleHandler.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XMLSimpleHandler.h 4 Dec 2003 05:37:38 -0000 1.1.2.2
+++ XMLSimpleHandler.h 4 Dec 2003 08:04:23 -0000 1.1.2.3
@@ -171,9 +171,9 @@
// -----------------------------------------------------------------------
// Implementations of the SAX ErrorHandler interface
// -----------------------------------------------------------------------
- void warning(const SAX::SAXException& exception);
- void error(const SAX::SAXException& exception);
- void fatalError(const SAX::SAXException& exception);
+ void warning(const SAX::SAXParseException& exception);
+ void error(const SAX::SAXParseException& exception);
+ void fatalError(const SAX::SAXParseException& exception);
void SetParamType(const AttributesT &attrs);
@@ -184,7 +184,7 @@
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
+ /*Following are not important for our purpose*/
virtual void notationDecl(const std::string& name,
const std::string& publicId,
const std::string& systemId){};
@@ -211,8 +211,8 @@
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);
- */
+ virtual SAX::InputSource resolveEntity(const std::string& publicId, const std::string& systemId){return SAX::InputSource();};
+
};
#endif
No revision
No revision
1.2.4.4 +5 -5 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.3
retrieving revision 1.2.4.4
diff -u -r1.2.4.3 -r1.2.4.4
--- WSDDDocument.h 4 Dec 2003 05:37:38 -0000 1.2.4.3
+++ WSDDDocument.h 4 Dec 2003 08:04:23 -0000 1.2.4.4
@@ -157,9 +157,9 @@
// -----------------------------------------------------------------------
// Implementations of the SAX ErrorHandler interface
// -----------------------------------------------------------------------
- void warning(const SAX::SAXException& exception);
- void error(const SAX::SAXException& exception);
- void fatalError(const SAX::SAXException& exception);
+ void warning(const SAX::SAXParseException& exception);
+ void error(const SAX::SAXParseException& exception);
+ void fatalError(const SAX::SAXParseException& exception);
@@ -170,7 +170,7 @@
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
+ /*Following are not important for our purpose*/
virtual void notationDecl(const std::string& name,
const std::string& publicId,
const std::string& systemId){}
@@ -199,7 +199,7 @@
const std::string& publicId,
const std::string& systemId){ }
virtual SAX::InputSource resolveEntity(const std::string& publicId, const std::string& systemId){ return SAX::InputSource();}
- */
+
};
#endif //__WSDDDOCUMENTS_H_INCLUDED__
No revision
No revision
1.3.4.2 +1 -1 ws-axis/c/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/Makefile.am,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- Makefile.am 2 Dec 2003 11:42:00 -0000 1.3.4.1
+++ Makefile.am 4 Dec 2003 08:04:23 -0000 1.3.4.2
@@ -2,7 +2,7 @@
SUBDIRS = common engine server soap wsdd xml
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/arabica -lArabica -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 -lexpat -ldl -lstdc++
#LDADD = -L$(XERCES_HOME)/lib/arabica -lArabica -ldl -lstdc++
INCLUDES = -I$(AXISCPP_HOME)/include
No revision
No revision
1.10.4.2 +2 -2 ws-axis/c/src/client/samples/Calculator/CalcClient.cpp
Index: CalcClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/Calculator/CalcClient.cpp,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -u -r1.10.4.1 -r1.10.4.2
--- CalcClient.cpp 7 Nov 2003 09:46:19 -0000 1.10.4.1
+++ CalcClient.cpp 4 Dec 2003 08:04:23 -0000 1.10.4.2
@@ -14,7 +14,7 @@
int result = cal.Add(99, 23);
printf("Result of 99+23=%d\n", result);
- Point* p1 = new Point();
+/* Point* p1 = new Point();
p1->x = 11;
p1->y = 22;
Point* p2 = new Point();
@@ -28,7 +28,7 @@
delete p1;
delete p2;
delete pret;
-
+*/
/* PointArray Array;
Array.m_Array = new Point[ARRAYSIZE];
Array.m_Size = ARRAYSIZE;
1.3.4.1 +1 -1 ws-axis/c/src/client/samples/Calculator/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/Calculator/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- Makefile.am 26 Oct 2003 08:53:23 -0000 1.3
+++ Makefile.am 4 Dec 2003 08:04:23 -0000 1.3.4.1
@@ -3,5 +3,5 @@
AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
calculator_SOURCES = Calculator.cpp CalcClient.cpp Point.cpp
-calculator_LDADD = $(AXISCPP_HOME)/lib/axis/libaxiscpp_client.a $(AXISCPP_HOME)/bin/libaxiscpp_mod.a -L$(AXISCPP_HOME)/lib/xerces-c -lxerces-c -ldl
+calculator_LDADD = $(AXISCPP_HOME)/lib/axis/libaxiscpp_client.a $(AXISCPP_HOME)/bin/libaxiscpp_mod.a -L$(AXISCPP_HOME)/lib/arabica -lArabica -ldl
INCLUDES = -I$(AXISCPP_HOME)/include
No revision
No revision
1.1.4.6 +2 -2 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.5
retrieving revision 1.1.4.6
diff -u -r1.1.4.5 -r1.1.4.6
--- CalcClientC.c 2 Dec 2003 11:42:00 -0000 1.1.4.5
+++ CalcClientC.c 4 Dec 2003 08:04:23 -0000 1.1.4.6
@@ -12,7 +12,7 @@
int result = Add(99, 23);
printf("addition is : %d\n", result);
- p1 = malloc(sizeof(Point));
+ /*p1 = malloc(sizeof(Point));
p1->x = 11;
p1->y = 22;
p2 = malloc(sizeof(Point));
@@ -22,6 +22,6 @@
ret = AddPoint(p1,p2);
printf("The resulting point is:%d%s%d\n", ret->x,"--", ret->y);
-
+ */
return 0;
}
1.1.2.9 +0 -4 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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Calculator.c 2 Dec 2003 11:42:00 -0000 1.1.2.8
+++ Calculator.c 4 Dec 2003 08:04:23 -0000 1.1.2.9
@@ -55,11 +55,7 @@
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.2 +1 -1 ws-axis/c/src/common/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Makefile.am,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -u -r1.10.4.1 -r1.10.4.2
--- Makefile.am 2 Dec 2003 11:42:00 -0000 1.10.4.1
+++ Makefile.am 4 Dec 2003 08:04:23 -0000 1.10.4.2
@@ -5,5 +5,5 @@
GDefine.cpp AxisUtils.cpp AxisTrace.cpp AxisException.cpp AxisConfig.cpp \
AxisSocketUtils.cpp
-libcommon_la_LIBADD = -L$(AXISCPP_HOME)/lib/arabica -lArabica -lstdc++
+libcommon_la_LIBADD = -L$(AXISCPP_HOME)/lib/arabica -lArabica -lexpat -lstdc++
INCLUDES = -I$(AXISCPP_HOME)/include
No revision
No revision
1.6.4.2 +1 -1 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.4.1
retrieving revision 1.6.4.2
diff -u -r1.6.4.1 -r1.6.4.2
--- Makefile.am 2 Dec 2003 11:42:00 -0000 1.6.4.1
+++ Makefile.am 4 Dec 2003 08:04:24 -0000 1.6.4.2
@@ -15,5 +15,5 @@
SharedObject.cpp
-libengine_la_LIBADD = -L$(AXISCPP_HOME)/lib/arabica -lArabica -lstdc++
+libengine_la_LIBADD = -L$(AXISCPP_HOME)/lib/arabica -lArabica -lexpat -lstdc++
INCLUDES = -I$(AXISCPP_HOME)/include
No revision
No revision
1.4.4.2 +1 -1 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.4.1
retrieving revision 1.4.4.2
diff -u -r1.4.4.1 -r1.4.4.2
--- Makefile.am 2 Dec 2003 11:42:00 -0000 1.4.4.1
+++ Makefile.am 4 Dec 2003 08:04:24 -0000 1.4.4.2
@@ -17,5 +17,5 @@
XMLSimpleHandler.cpp \
SoapKeywordMapping.cpp
-libsoap_la_LIBADD = -L$(AXISCPP_HOME)/lib/arabica -lArabica
+libsoap_la_LIBADD = -L$(AXISCPP_HOME)/lib/arabica -lArabica -lexpat
INCLUDES = -I$(AXISCPP_HOME)/include
1.17.4.6 +3 -2 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.5
retrieving revision 1.17.4.6
diff -u -r1.17.4.5 -r1.17.4.6
--- SoapDeSerializer.cpp 4 Dec 2003 05:37:38 -0000 1.17.4.5
+++ SoapDeSerializer.cpp 4 Dec 2003 08:04:24 -0000 1.17.4.6
@@ -88,11 +88,13 @@
m_pInputStream = NULL;
m_pLastArrayParam = NULL;
m_pParser = NULL;
+ m_pParser = new SAX::XMLReader<std::string>;
}
SoapDeSerializer::~SoapDeSerializer()
{
m_pHandler.Init();
+ if (m_pParser) delete m_pParser;
}
int SoapDeSerializer::SetInputStream(const Ax_soapstream* pInputStream)
@@ -190,8 +192,7 @@
try
{
m_pHandler.Init();
- if (m_pParser) delete m_pParser;
- m_pParser = new SAX::XMLReader<std::string>;
+
m_pParser->setFeature(fNames.external_general, true);
m_pParser->setFeature(fNames.namespaces, true);
m_pParser->setFeature(fNames.namespace_prefixes, true);
1.1.2.4 +3 -3 ws-axis/c/src/soap/Attic/XMLSimpleHandler.cpp
Index: XMLSimpleHandler.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/Attic/XMLSimpleHandler.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLSimpleHandler.cpp 4 Dec 2003 05:37:38 -0000 1.1.2.3
+++ XMLSimpleHandler.cpp 4 Dec 2003 08:04:24 -0000 1.1.2.4
@@ -280,16 +280,16 @@
m_NsStack.erase(__XTRC(prefix)); //I think the same prifix cannot repeat ???
}
-void XMLStreamHandler::warning(const SAX::SAXException& exception)
+void XMLStreamHandler::warning(const SAX::SAXParseException& exception)
{
}
-void XMLStreamHandler::error(const SAX::SAXException& exception)
+void XMLStreamHandler::error(const SAX::SAXParseException& exception)
{
// sprintf((char*)chEBuf, "Error : %s", __TRC(exception.getMessage()));
m_Success = AXIS_FAIL;
}
-void XMLStreamHandler::fatalError(const SAX::SAXException& exception)
+void XMLStreamHandler::fatalError(const SAX::SAXParseException& exception)
{
// sprintf((char*)chEBuf, "Fatal Error : %s", __TRC(exception.getMessage()));
m_Success = AXIS_FAIL;
No revision
No revision
1.4.4.2 +1 -1 ws-axis/c/src/wsdd/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/Makefile.am,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -r1.4.4.1 -r1.4.4.2
--- Makefile.am 2 Dec 2003 11:38:50 -0000 1.4.4.1
+++ Makefile.am 4 Dec 2003 08:04:24 -0000 1.4.4.2
@@ -7,5 +7,5 @@
WSDDDocument.cpp \
WSDDKeywords.cpp
-libwsdd_la_LIBADD = -L$(AXISCPP_HOME)/lib/arabica -lArabica
+libwsdd_la_LIBADD = -L$(AXISCPP_HOME)/lib/arabica -lArabica -lexpat
INCLUDES = -I$(AXISCPP_HOME)/include
1.23.4.4 +3 -3 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.3
retrieving revision 1.23.4.4
diff -u -r1.23.4.3 -r1.23.4.4
--- WSDDDocument.cpp 4 Dec 2003 05:37:38 -0000 1.23.4.3
+++ WSDDDocument.cpp 4 Dec 2003 08:04:24 -0000 1.23.4.4
@@ -610,14 +610,14 @@
}
*/
-void WSDDDocument::warning(const SAX::SAXException& exception)
+void WSDDDocument::warning(const SAX::SAXParseException& exception)
{
}
-void WSDDDocument::error(const SAX::SAXException& exception)
+void WSDDDocument::error(const SAX::SAXParseException& exception)
{
m_bError = true;
}
-void WSDDDocument::fatalError(const SAX::SAXException& exception)
+void WSDDDocument::fatalError(const SAX::SAXParseException& exception)
{
m_bFatalError = true;
}