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/include/axis/soap XMLSimpleHandler.h SoapDeSerializer.h XMLStreamHandler.h
Date Mon, 01 Dec 2003 10:24:31 GMT
damitha     2003/12/01 02:24:30

  Modified:    c/include/axis/soap Tag: CWrapperSupport SoapDeSerializer.h
                        XMLStreamHandler.h
  Added:       c/include/axis/soap Tag: CWrapperSupport XMLSimpleHandler.h
  Log:
  
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.4.3   +9 -4      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.2
  retrieving revision 1.2.4.3
  diff -u -r1.2.4.2 -r1.2.4.3
  --- SoapDeSerializer.h	8 Nov 2003 13:27:57 -0000	1.2.4.2
  +++ SoapDeSerializer.h	1 Dec 2003 10:24:30 -0000	1.2.4.3
  @@ -67,8 +67,10 @@
   #if !defined(AFX_SOAPDESERIALIZER_H__FD0E7C3B_B887_480A_9E2A_20736A88B09B__INCLUDED_)
   #define AFX_SOAPDESERIALIZER_H__FD0E7C3B_B887_480A_9E2A_20736A88B09B__INCLUDED_
   
  -#include "../common/IHandlerSoapDeSerializer.h"
  -#include "XMLStreamHandler.h"
  +#include <axis/common/IHandlerSoapDeSerializer.h>
  +//#include "XMLStreamHandler.h"
  +#include <axis/soap/XMLSimpleHandler.h>
  +#include <string>
   
   #define HUGE_BUFFER_SIZE 8192
   
  @@ -81,10 +83,13 @@
   class SoapDeSerializer : public IHandlerSoapDeSerializer
   {
   private:
  -	XMLStreamHandler* m_pHandler;
  -	SAX2XMLReader* m_pParser;
  +	//XMLStreamHandler* m_pHandler;
  +    XMLStreamHandler m_pHandler;
  +	//SAX2XMLReader* m_pParser;   
  +	SAX::XMLReader<std::string> m_pParser;
   	const Ax_soapstream* m_pInputStream;
   	char m_hugebuffer[HUGE_BUFFER_SIZE];
  +    string m_sHugebuffer;
   	Param* m_pLastArrayParam;
   public:
   	int GetVersion();
  
  
  
  1.1.4.1   +21 -2     ws-axis/c/include/axis/soap/XMLStreamHandler.h
  
  Index: XMLStreamHandler.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/soap/XMLStreamHandler.h,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- XMLStreamHandler.h	20 Oct 2003 03:18:20 -0000	1.1
  +++ XMLStreamHandler.h	1 Dec 2003 10:24:30 -0000	1.1.4.1
  @@ -67,11 +67,26 @@
   #if !defined(__XMLSTREAMHANDLER_H_INCLUDED__)
   #define __XMLSTREAMHANDLER_H_INCLUDED__
   
  -#include <xercesc/sax2/DefaultHandler.hpp>
  +#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/Locater.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 <xercesc/framework/MemBufInputSource.hpp>
  +*/
   
   #include "../common/Param.h"
   #include "../common/ArrayBean.h"
  @@ -99,7 +114,11 @@
   
   enum SOAP_PARSE_LEVEL { SOAP_UNKNOWN=1, SOAP_ENVELOP, SOAP_HEADER, SOAP_FAULT, SOAP_BODY,
SOAP_METHOD, SOAP_PARAM, SOAP_HEADER_BLOCK};
   
  -class XMLStreamHandler:public DefaultHandler
  +class XMLStreamHandler:public SAX::EntityResolver, public SAX::DTDHandler,
  +							public SAX::ContentHandler,
  +							public SAX::ErrorHandler,
  +							public SAX::LexicalHandler,
  +							public SAX::DeclHandler
   {
   	friend class SoapDeSerializer;
   private:
  
  
  
  No                   revision
  
  Index: XMLStreamHandler.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/soap/XMLStreamHandler.h,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- XMLStreamHandler.h	20 Oct 2003 03:18:20 -0000	1.1
  +++ XMLStreamHandler.h	1 Dec 2003 10:24:30 -0000	1.1.4.1
  @@ -67,11 +67,26 @@
   #if !defined(__XMLSTREAMHANDLER_H_INCLUDED__)
   #define __XMLSTREAMHANDLER_H_INCLUDED__
   
  -#include <xercesc/sax2/DefaultHandler.hpp>
  +#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/Locater.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 <xercesc/framework/MemBufInputSource.hpp>
  +*/
   
   #include "../common/Param.h"
   #include "../common/ArrayBean.h"
  @@ -99,7 +114,11 @@
   
   enum SOAP_PARSE_LEVEL { SOAP_UNKNOWN=1, SOAP_ENVELOP, SOAP_HEADER, SOAP_FAULT, SOAP_BODY,
SOAP_METHOD, SOAP_PARAM, SOAP_HEADER_BLOCK};
   
  -class XMLStreamHandler:public DefaultHandler
  +class XMLStreamHandler:public SAX::EntityResolver, public SAX::DTDHandler,
  +							public SAX::ContentHandler,
  +							public SAX::ErrorHandler,
  +							public SAX::LexicalHandler,
  +							public SAX::DeclHandler
   {
   	friend class SoapDeSerializer;
   private:
  
  
  
  No                   revision
  
  Index: XMLStreamHandler.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/soap/XMLStreamHandler.h,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- XMLStreamHandler.h	20 Oct 2003 03:18:20 -0000	1.1
  +++ XMLStreamHandler.h	1 Dec 2003 10:24:30 -0000	1.1.4.1
  @@ -67,11 +67,26 @@
   #if !defined(__XMLSTREAMHANDLER_H_INCLUDED__)
   #define __XMLSTREAMHANDLER_H_INCLUDED__
   
  -#include <xercesc/sax2/DefaultHandler.hpp>
  +#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/Locater.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 <xercesc/framework/MemBufInputSource.hpp>
  +*/
   
   #include "../common/Param.h"
   #include "../common/ArrayBean.h"
  @@ -99,7 +114,11 @@
   
   enum SOAP_PARSE_LEVEL { SOAP_UNKNOWN=1, SOAP_ENVELOP, SOAP_HEADER, SOAP_FAULT, SOAP_BODY,
SOAP_METHOD, SOAP_PARAM, SOAP_HEADER_BLOCK};
   
  -class XMLStreamHandler:public DefaultHandler
  +class XMLStreamHandler:public SAX::EntityResolver, public SAX::DTDHandler,
  +							public SAX::ContentHandler,
  +							public SAX::ErrorHandler,
  +							public SAX::LexicalHandler,
  +							public SAX::DeclHandler
   {
   	friend class SoapDeSerializer;
   private:
  
  
  
  1.1.2.1   +220 -0    ws-axis/c/include/axis/soap/Attic/XMLSimpleHandler.h
  
  
  
  

Mime
View raw message