axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From susan...@apache.org
Subject cvs commit: ws-axis/c/vc/wsdd WSDD.dsp
Date Thu, 04 Dec 2003 05:37:39 GMT
susantha    2003/12/03 21:37:39

  Modified:    c/include/axis/common Tag: CWrapperSupport Packet.h
               c/include/axis/soap Tag: CWrapperSupport SoapDeSerializer.h
                        XMLSimpleHandler.h
               c/include/axis/wsdd Tag: CWrapperSupport WSDDDocument.h
               c/src/client Tag: CWrapperSupport Call.cpp
               c/src/server/apache Tag: CWrapperSupport mod_axis.c
               c/src/soap Tag: CWrapperSupport SoapDeSerializer.cpp
                        XMLSimpleHandler.cpp
               c/src/wsdd Tag: CWrapperSupport WSDDDocument.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/simple_axis_server Tag: CWrapperSupport
                        SimpleAxisServer.dsp
               c/vc/soap Tag: CWrapperSupport Soap.dsp
               c/vc/wsdd Tag: CWrapperSupport WSDD.dsp
  Log:
  some modifications to support chuncked buffers parsing in the Deserializer
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.4.3   +1 -1      ws-axis/c/include/axis/common/Packet.h
  
  Index: Packet.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/common/Packet.h,v
  retrieving revision 1.1.4.2
  retrieving revision 1.1.4.3
  diff -u -r1.1.4.2 -r1.1.4.3
  --- Packet.h	21 Nov 2003 12:48:07 -0000	1.1.4.2
  +++ Packet.h	4 Dec 2003 05:37:38 -0000	1.1.4.3
  @@ -115,7 +115,7 @@
    *Function pointer definitions for trasport layer
    */
   typedef int (*AXIS_SEND_SEND_BYTES)(const char*, const void*);
  -typedef int (*AXIS_GET_BYTES)(char*, int, int*, const void*);
  +typedef int (*AXIS_GET_BYTES)(const char**, int*, const void*);
   typedef int (*AXIS_SEND_TRANSPORT_INFORMATION)(void*); /*Ax_soapstream*/
   typedef int (*AXIS_GET_TRANSPORT_INFORMATION)(void*);/*Ax_soapstream*/
   
  
  
  
  No                   revision
  No                   revision
  1.2.4.4   +5 -5      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.3
  retrieving revision 1.2.4.4
  diff -u -r1.2.4.3 -r1.2.4.4
  --- SoapDeSerializer.h	1 Dec 2003 10:24:30 -0000	1.2.4.3
  +++ SoapDeSerializer.h	4 Dec 2003 05:37:38 -0000	1.2.4.4
  @@ -83,13 +83,13 @@
   class SoapDeSerializer : public IHandlerSoapDeSerializer
   {
   private:
  -	//XMLStreamHandler* m_pHandler;
  +	SAX::FeatureNames<std::string> fNames;
  +	SAX::PropertyNames<std::string> pNames;
  +
  +	SAX::XMLReader<std::string>* m_pParser;
       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;
  +	const char* m_pCurrentBuffer;
   	Param* m_pLastArrayParam;
   public:
   	int GetVersion();
  
  
  
  1.1.2.2   +17 -19    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.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- XMLSimpleHandler.h	1 Dec 2003 10:24:30 -0000	1.1.2.1
  +++ XMLSimpleHandler.h	4 Dec 2003 05:37:38 -0000	1.1.2.2
  @@ -114,11 +114,10 @@
   
   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 SAX::EntityResolver, public SAX::DTDHandler,
  -							public SAX::ContentHandler,
  -							public SAX::ErrorHandler,
  -							public SAX::LexicalHandler,
  -							public SAX::DeclHandler
  +class XMLStreamHandler:public SAX::ContentHandler, public SAX::ErrorHandler
  +					/* ,public SAX::EntityResolver, public SAX::DTDHandler,
  +						public SAX::LexicalHandler,
  +						public SAX::DeclHandler  */
   {
   	friend class SoapDeSerializer;
   private:
  @@ -164,7 +163,7 @@
       //  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,const unsigned int length);
  +	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);
  @@ -172,14 +171,20 @@
   	// -----------------------------------------------------------------------
       //  Implementations of the SAX ErrorHandler interface
       // -----------------------------------------------------------------------
  -    void warning(const SAX::SAXParseException& exception);
  -    void error(const SAX::SAXParseException& exception);
  -    void fatalError(const SAX::SAXParseException& exception);
  +    void warning(const SAX::SAXException& exception);
  +    void error(const SAX::SAXException& exception);
  +    void fatalError(const SAX::SAXException& exception);
       void SetParamType(const AttributesT &attrs);
   
   
  +    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*/
  +    /*Following are not important for our purpose
       virtual void notationDecl(const std::string& name,
                               const std::string& publicId,
                               const std::string& systemId){};
  @@ -187,14 +192,6 @@
                                           const std::string& publicId,
                                     const std::string& systemId,
                                     const std::string& notationName){ }
  -    virtual void setDocumentLocator(const LocatorT& locator){ }
  -
  -    virtual void startDocument(){ }
  -    virtual void endDocument(){ }
  -    virtual void characters(const std::string& ch){ }
  -    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){ }
         virtual void startDTD(const std::string& name,
                           const std::string& publicId,
                           const std::string& systemId){ }
  @@ -214,7 +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);  
  +	*/                                    
   };
   
   #endif
  
  
  
  No                   revision
  No                   revision
  1.2.4.3   +17 -18    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.2
  retrieving revision 1.2.4.3
  diff -u -r1.2.4.2 -r1.2.4.3
  --- WSDDDocument.h	2 Dec 2003 11:35:34 -0000	1.2.4.2
  +++ WSDDDocument.h	4 Dec 2003 05:37:38 -0000	1.2.4.3
  @@ -105,11 +105,10 @@
   #define ROLENAME_SEPARATOR ','
   #define TRANSCODE_BUFFER_SIZE 256
   
  -class WSDDDocument:public SAX::EntityResolver, public SAX::DTDHandler,
  -							public SAX::ContentHandler,
  -							public SAX::ErrorHandler,
  -							public SAX::LexicalHandler,
  -							public SAX::DeclHandler
  +class WSDDDocument:public SAX::ContentHandler, public SAX::ErrorHandler
  +					/* ,public SAX::EntityResolver, public SAX::DTDHandler,
  +						public SAX::LexicalHandler,
  +						public SAX::DeclHandler  */
   {
   private:
   	bool m_bFatalError;
  @@ -144,7 +143,7 @@
       //  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, const unsigned int length);
  +	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);
  @@ -158,13 +157,20 @@
   	// -----------------------------------------------------------------------
       //  Implementations of the SAX ErrorHandler interface
       // -----------------------------------------------------------------------
  -    void warning(const SAX::SAXParseException& exception);
  -    void error(const SAX::SAXParseException& exception);
  -    void fatalError(const SAX::SAXParseException& exception);
  +    void warning(const SAX::SAXException& exception);
  +    void error(const SAX::SAXException& exception);
  +    void fatalError(const SAX::SAXException& exception);
   
   
       
  -    /*Following are not important for our purpose*/
  +    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){}
  @@ -172,14 +178,7 @@
                                           const std::string& publicId,
                                     const std::string& systemId,
                                     const std::string& notationName){ }
  -    virtual void setDocumentLocator(const LocatorT& locator){ }                   
              
   
  -    virtual void startDocument(){ }
  -    virtual void endDocument(){ }
  -    virtual void characters(const std::string& ch){ }
  -    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){ }
         virtual void startDTD(const std::string& name,
                           const std::string& publicId,
                           const std::string& systemId){ }
  @@ -200,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.20.4.7  +2 -2      ws-axis/c/src/client/Call.cpp
  
  Index: Call.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/Call.cpp,v
  retrieving revision 1.20.4.6
  retrieving revision 1.20.4.7
  diff -u -r1.20.4.6 -r1.20.4.7
  --- Call.cpp	21 Nov 2003 12:48:07 -0000	1.20.4.6
  +++ Call.cpp	4 Dec 2003 05:37:38 -0000	1.20.4.7
  @@ -433,12 +433,12 @@
   	catch (ChannelException e)
   	{
   		/*printf(e.GetErr().c_str());*/
  -		return FAIL;
  +		return AXIS_FAIL;
   	}
   	catch (...)
   	{
   		/*printf("Unknown exception occured in the client");*/
  -		return FAIL;
  +		return AXIS_FAIL;
   	}
   }
   
  
  
  
  No                   revision
  No                   revision
  1.16.4.2  +8 -2      ws-axis/c/src/server/apache/mod_axis.c
  
  Index: mod_axis.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/apache/mod_axis.c,v
  retrieving revision 1.16.4.1
  retrieving revision 1.16.4.2
  diff -u -r1.16.4.1 -r1.16.4.2
  --- mod_axis.c	21 Nov 2003 12:48:09 -0000	1.16.4.1
  +++ mod_axis.c	4 Dec 2003 05:37:38 -0000	1.16.4.2
  @@ -22,6 +22,11 @@
   /*extern int process(soapstream *);*/
   extern unsigned char chEBuf[1024];
   
  +#define SIZEOFMODULEBUFFER 100
  +
  +char g_buffer[SIZEOFMODULEBUFFER];
  +
  +
   /*Should dispatch the headers from within this method*/
   int send_transport_information(Ax_soapstream* hdr)
   {
  @@ -56,12 +61,13 @@
    * This function is called by the Axis Engine whenever it needs to get bytes from the 
    * transport layer.
    */
  -int get_request_bytes(char* req, int reqsize, int* retsize, const void* ipstream)
  +int get_request_bytes(const char** req, int* retsize, const void* ipstream)
   {
   	int len_read;
   	ap_hard_timeout("util_read", (request_rec*)ipstream);
  -	len_read = ap_get_client_block((request_rec*)ipstream, req, reqsize);
  +	len_read = ap_get_client_block((request_rec*)ipstream, g_buffer, SIZEOFMODULEBUFFER);
   	ap_reset_timeout((request_rec*)ipstream);
  +	*req = g_buffer;
   	*retsize =  len_read;
   	return 0;
   }
  
  
  
  No                   revision
  No                   revision
  1.17.4.5  +27 -64    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.4
  retrieving revision 1.17.4.5
  diff -u -r1.17.4.4 -r1.17.4.5
  --- SoapDeSerializer.cpp	2 Dec 2003 12:37:42 -0000	1.17.4.4
  +++ SoapDeSerializer.cpp	4 Dec 2003 05:37:38 -0000	1.17.4.5
  @@ -85,81 +85,31 @@
   
   SoapDeSerializer::SoapDeSerializer()
   {
  -	//m_pHandler = new XMLStreamHandler();	
  -//	m_pParser = XMLReaderFactory::createXMLReader();
  -	
  -	SAX::FeatureNames<std::string> fNames;
  -	SAX::PropertyNames<std::string> pNames;
  -	try
  -	{
  -	    m_pParser.setFeature(fNames.external_general, true);
  -	    m_pParser.setFeature(fNames.validation, true);
  -        m_pParser.setFeature(fNames.namespaces, true);
  -        m_pParser.setFeature(fNames.namespace_prefixes, true);
  -    	}
  -      	catch(SAX::SAXException& e)
  -        {
  -            std::cerr << e.what() << std::endl;
  -    	}
  -
  -    	m_pParser.setContentHandler(m_pHandler);
  -    	m_pParser.setDTDHandler(m_pHandler);
  -    	m_pParser.setErrorHandler(m_pHandler);
  -    	m_pParser.setEntityResolver(m_pHandler);
  -
  -    	try
  -	{
  -	    m_pParser.setProperty(pNames.declHandler, static_cast<SAX::DeclHandler&>(m_pHandler));
  -	    m_pParser.setProperty(pNames.lexicalHandler, static_cast<SAX::LexicalHandler&>(m_pHandler));
  -	}
  -    catch(SAX::SAXException& e)
  -	{
  -	    std::cout << e.what() << std::endl;
  -	} // catch    
  -
  -    	//m_pParser->setContentHandler(m_pHandler);
  -    	//m_pParser->setErrorHandler(m_pHandler);
   	m_pInputStream = NULL;
   	m_pLastArrayParam = NULL;
  +	m_pParser = NULL;
   }
   
   SoapDeSerializer::~SoapDeSerializer()
   {
  -	//delete m_pHandler;
  -	//delete m_pParser;
  +	m_pHandler.Init();
   }
   
   int SoapDeSerializer::SetInputStream(const Ax_soapstream* pInputStream)
   {
   	m_pInputStream = pInputStream;
  -	//---------------------start--------------------------
  -	//Deserialize
  -	//---------START XERCES SAX2 SPCIFIC CODE---------//
  -	//a huge buffer to store the whole soap request stream
  -	//to store the number of chars returned by get_request_bytes
   	int nChars = 0;
  -	//request a huge number of bytes to get the whole soap request
  -	//when pull parsing is used this should change
   	if (NULL != m_pInputStream->transport.pGetFunct)
  -		m_pInputStream->transport.pGetFunct(m_hugebuffer, HUGE_BUFFER_SIZE, &nChars, m_pInputStream->str.ip_stream);
  -	//if no soap then quit
  -
  -	if (nChars <= 0) return AXIS_FAIL;
  -	//MemBufInputSource Input((const unsigned char*)m_hugebuffer, nChars , "bufferid");
  -
  -	//Input.setEncoding("UTF-16");
  -
  -	//m_sHugebuffer = m_hugebuffer;
  -	//SAX::InputSource Input(m_sHugebuffer);
  -	//m_pParser->parse(Input);
  -    //m_pParser.parse(Input);
  -
  -    m_pParser.parse_start();
  -    m_pParser.parse_continue(m_hugebuffer, HUGE_BUFFER_SIZE);
  -    m_pParser.parse_end();
  -    
  +	{
  +		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);
  +		} while (nChars > 0);
  +		m_pParser->parse_end();
  +	}
   	return AXIS_SUCCESS;
  -
   }
   
   SoapEnvelope* SoapDeSerializer::GetEnvelope()
  @@ -237,12 +187,25 @@
   
   int SoapDeSerializer::Init()
   {
  -	m_hugebuffer[0] = '\0';
  +	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);
  +		m_pParser->setContentHandler(m_pHandler);
  +		m_pParser->setErrorHandler(m_pHandler);
  +    }
  +    catch(SAX::SAXException& e)
  +    {
  +		return AXIS_FAIL;
  +    }
  +	
   	m_pLastArrayParam = NULL;
   
  -	m_pHandler.Init();
   	return AXIS_SUCCESS;
  -
   }
   
   
  
  
  
  1.1.2.3   +4 -10     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.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- XMLSimpleHandler.cpp	2 Dec 2003 12:37:42 -0000	1.1.2.2
  +++ XMLSimpleHandler.cpp	4 Dec 2003 05:37:38 -0000	1.1.2.3
  @@ -249,7 +249,7 @@
   	}
   }
   
  -void  XMLStreamHandler::characters (const string& chars,const unsigned int length)
  +void  XMLStreamHandler::characters (const string& chars)
   {
       AXISTRACE1("characters");
   	if ((m_PL0 == SOAP_BODY) && (m_PL1 == SOAP_PARAM)) //Make this a switch statement
if many cases to be handled
  @@ -280,16 +280,16 @@
   	m_NsStack.erase(__XTRC(prefix)); //I think the same prifix cannot repeat ???
   }
   
  -void XMLStreamHandler::warning(const SAX::SAXParseException& exception)
  +void XMLStreamHandler::warning(const SAX::SAXException& exception)
   {
   
   }
  -void XMLStreamHandler::error(const SAX::SAXParseException& exception)
  +void XMLStreamHandler::error(const SAX::SAXException& exception)
   {
   //  sprintf((char*)chEBuf, "Error : %s", __TRC(exception.getMessage()));
   	m_Success = AXIS_FAIL;
   }
  -void XMLStreamHandler::fatalError(const SAX::SAXParseException& exception)
  +void XMLStreamHandler::fatalError(const SAX::SAXException& exception)
   {
   // sprintf((char*)chEBuf, "Fatal Error : %s", __TRC(exception.getMessage()));
   	m_Success = AXIS_FAIL;
  @@ -573,12 +573,6 @@
   	m_pHeaderBlock->setLocalName(__XTRC(localname.c_str()));
   	m_pHeaderBlock->setUri(__XTRC(uri.c_str()));
   }
  -
  -// EntityResolver
  -SAX::InputSource XMLStreamHandler::resolveEntity(const std::string& publicId, const
std::string& systemId)
  -{
  -  return SAX::InputSource();
  -} // resolveEntity
   
   /*const AxisChar* XMLStreamHandler::__XTRC(const XMLCh *pChar)
   {
  
  
  
  No                   revision
  No                   revision
  1.23.4.3  +9 -8      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.2
  retrieving revision 1.23.4.3
  diff -u -r1.23.4.2 -r1.23.4.3
  --- WSDDDocument.cpp	2 Dec 2003 11:38:50 -0000	1.23.4.2
  +++ WSDDDocument.cpp	4 Dec 2003 05:37:38 -0000	1.23.4.3
  @@ -108,18 +108,19 @@
           try
           {
               parser.setFeature(fNames.external_general, true);
  -            parser.setFeature(fNames.validation, 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;
  +//            std::cerr << e.what() << std::endl;
       	}
   
       	parser.setContentHandler(*this);
  -    	parser.setDTDHandler(*this);
       	parser.setErrorHandler(*this);
  +/*
  +    	parser.setDTDHandler(*this);
       	parser.setEntityResolver(*this);
   
       	try
  @@ -131,7 +132,7 @@
           {
               std::cout << e.what() << std::endl;
           } // catch
  -
  +*/
           string strDocPath(sWSDD);
           SAX::InputSource Input(strDocPath);
           parser.parse(Input);
  @@ -595,7 +596,7 @@
   	m_NsStack.erase(__XTRC(prefix)); //I think the same prifix cannot repeat ???
   }
   
  -void  WSDDDocument::characters (const std::string& chars, const unsigned int length)
  +void  WSDDDocument::characters (const std::string& chars)
   {
   	//cout<<"==="<<XMLString::transcode(chars)<<"==="<<endl;
   }
  @@ -609,14 +610,14 @@
   }
   */
   
  -void WSDDDocument::warning(const SAX::SAXParseException& exception)
  +void WSDDDocument::warning(const SAX::SAXException& exception)
   {
   }
  -void WSDDDocument::error(const SAX::SAXParseException& exception)
  +void WSDDDocument::error(const SAX::SAXException& exception)
   {
   	m_bError = true;
   }
  -void WSDDDocument::fatalError(const SAX::SAXParseException& exception)
  +void WSDDDocument::fatalError(const SAX::SAXException& exception)
   {
   	m_bFatalError = true;
   }
  
  
  
  No                   revision
  No                   revision
  1.7.4.3   +1 -1      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.2
  retrieving revision 1.7.4.3
  diff -u -r1.7.4.2 -r1.7.4.3
  --- client.dsp	8 Nov 2003 13:27:58 -0000	1.7.4.2
  +++ client.dsp	4 Dec 2003 05:37:38 -0000	1.7.4.3
  @@ -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" /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:/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 BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  
  
  
  No                   revision
  No                   revision
  1.28.4.3  +1 -1      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.2
  retrieving revision 1.28.4.3
  diff -u -r1.28.4.2 -r1.28.4.3
  --- Common.dsp	8 Nov 2003 13:27:58 -0000	1.28.4.2
  +++ Common.dsp	4 Dec 2003 05:37:39 -0000	1.28.4.3
  @@ -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" /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:/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 BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  
  
  
  No                   revision
  No                   revision
  1.14.4.3  +1 -1      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.2
  retrieving revision 1.14.4.3
  diff -u -r1.14.4.2 -r1.14.4.3
  --- Engine.dsp	8 Nov 2003 13:27:58 -0000	1.14.4.2
  +++ Engine.dsp	4 Dec 2003 05:37:39 -0000	1.14.4.3
  @@ -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" /D "WIN32" /D "_DEBUG" /D
"_MBCS" /D "_LIB" /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 BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  
  
  
  1.4.2.2   +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.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- ExEngine.dsp	8 Nov 2003 13:27:58 -0000	1.4.2.1
  +++ ExEngine.dsp	4 Dec 2003 05:37:39 -0000	1.4.2.2
  @@ -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 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib /nologo /subsystem:console
/profile /debug /machine:I386 /out:"../../release/win32/ExEngine_D.exe" /libpath:"../../lib/axis"
/libpath:"../../lib/xerces-c"
  +# 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"
   
   !ENDIF 
   
  
  
  
  No                   revision
  No                   revision
  1.14.2.3  +1 -1      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.2
  retrieving revision 1.14.2.3
  diff -u -r1.14.2.2 -r1.14.2.3
  --- Apache1_3.dsp	8 Nov 2003 13:27:58 -0000	1.14.2.2
  +++ Apache1_3.dsp	4 Dec 2003 05:37:39 -0000	1.14.2.3
  @@ -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
/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"
  +# 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"
   # SUBTRACT LINK32 /profile
   
   !ENDIF 
  
  
  
  No                   revision
  No                   revision
  1.13.2.1  +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
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- SimpleAxisServer.dsp	30 Oct 2003 06:24:17 -0000	1.13
  +++ SimpleAxisServer.dsp	4 Dec 2003 05:37:39 -0000	1.13.2.1
  @@ -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 Engine_D.lib Common_D.lib Soap_D.lib wsdd_D.lib xerces-c_2D.lib wsock32.lib
/nologo /subsystem:console /debug /machine:I386 /out:"../../../release/win32/SimpleAxisServer_D.exe"
/pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c"
  +# 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"
   
   !ENDIF 
   
  
  
  
  No                   revision
  No                   revision
  1.10.4.3  +3 -3      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.2
  retrieving revision 1.10.4.3
  diff -u -r1.10.4.2 -r1.10.4.3
  --- Soap.dsp	8 Nov 2003 13:27:58 -0000	1.10.4.2
  +++ Soap.dsp	4 Dec 2003 05:37:39 -0000	1.10.4.3
  @@ -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" /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:/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 BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -142,7 +142,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\src\soap\XMLStreamHandler.cpp
  +SOURCE=..\..\src\soap\XMLSimpleHandler.cpp
   # End Source File
   # End Group
   # Begin Group "Header Files"
  @@ -214,7 +214,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\soap\XMLStreamHandler.h
  +SOURCE=..\..\include\axis\soap\XMLSimpleHandler.h
   # End Source File
   # End Group
   # End Target
  
  
  
  No                   revision
  No                   revision
  1.10.4.3  +1 -1      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.2
  retrieving revision 1.10.4.3
  diff -u -r1.10.4.2 -r1.10.4.3
  --- WSDD.dsp	8 Nov 2003 13:27:59 -0000	1.10.4.2
  +++ WSDD.dsp	4 Dec 2003 05:37:39 -0000	1.10.4.3
  @@ -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" /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:/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 BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  
  
  

Mime
View raw message