axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whitl...@apache.org
Subject cvs commit: ws-axis/c/tools/trace/org/apache/axis/tracetool Tracer.java
Date Mon, 22 Nov 2004 16:10:14 GMT
whitlock    2004/11/22 08:10:13

  Modified:    c/include/axis/client Call.hpp
               c/include/axis/server GDefine.hpp Packet.hpp
               c/src/common AxisTrace.cpp AxisTrace.h
               c/src/engine Axis.cpp
               c/src/server/simple_axis_server SimpleAxisServer.cpp
               c/src/soap SoapDeSerializer.cpp SoapSerializer.cpp
               c/src/transport SOAPTransport.h
               c/src/xml/xerces SoapBinInputStream.h XMLParserXerces.h
               c/tools/trace/org/apache/axis/tracetool Tracer.java
  Log:
  Remove Packet.hpp and fix trace problems on Linux (enums incompatible with va_args)
  
  Revision  Changes    Path
  1.10      +0 -1      ws-axis/c/include/axis/client/Call.hpp
  
  Index: Call.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/client/Call.hpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Call.hpp	22 Nov 2004 11:13:37 -0000	1.9
  +++ Call.hpp	22 Nov 2004 16:10:07 -0000	1.10
  @@ -49,7 +49,6 @@
   #define _CALL_H____OF_AXIS_INCLUDED_
   
   #include "../server/GDefine.hpp"
  -#include "../server/Packet.hpp"
   #include "../server/TypeMapping.hpp"
   #include "../server/AxisUserAPI.hpp"
   #include "../server/WSDDDefines.hpp"
  
  
  
  1.5       +9 -0      ws-axis/c/include/axis/server/GDefine.hpp
  
  Index: GDefine.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/GDefine.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GDefine.hpp	9 Nov 2004 02:41:26 -0000	1.4
  +++ GDefine.hpp	22 Nov 2004 16:10:07 -0000	1.5
  @@ -44,6 +44,15 @@
       APT_UNKNOWN = -1, APTHTTP1_0=0, APTHTTP1_1, APTFTP, APTSMTP, APTHTTPS, APTOTHER
   } AXIS_PROTOCOL_TYPE;
   
  +typedef enum 
  +{
  +    SOAPACTION_HEADER,
  +    SERVICE_URI,
  +    OPERATION_NAME,
  +    SOAP_MESSAGE_LENGTH,
  +	SECURE_PROPERTIES
  +} AXIS_TRANSPORT_INFORMATION_TYPE;
  +
   #define SOAPACTIONHEADER "SOAPAction"
   
   #define AxisChar char
  
  
  
  1.5       +1 -284    ws-axis/c/include/axis/server/Packet.hpp
  
  Index: Packet.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/Packet.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Packet.hpp	3 Nov 2004 13:25:56 -0000	1.4
  +++ Packet.hpp	22 Nov 2004 16:10:07 -0000	1.5
  @@ -18,287 +18,4 @@
    * @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
    *
    */
  -#ifdef WIN32
  -#pragma warning (disable : 4786)
  -#endif
  -
  -#if !defined(__PACKET_H_OF_AXIS_INCLUDED__)
  -#define __PACKET_H_OF_AXIS_INCLUDED__
  -
  -#include "GDefine.hpp"
  -
  -typedef enum 
  -{
  -    SOAPACTION_HEADER,
  -    SERVICE_URI,
  -    OPERATION_NAME,
  -    SOAP_MESSAGE_LENGTH,
  -	SECURE_PROPERTIES
  -} AXIS_TRANSPORT_INFORMATION_TYPE;
  -
  -/*
  - * This structure is supposed to keep the streaming objects of the transport
  - * such as iostream in c++, request_rec in apache module etc
  - */
  -/*typedef struct 
  -{
  -    const void* ip_stream;
  -    const void* op_stream;
  -} Ax_iostream;
  -*/
  -typedef enum
  -{
  -    AXIS_HTTP_GET,
  -    AXIS_HTTP_POST,
  -    AXIS_HTTP_UNSUPPORTED
  -} AXIS_HTTP_METHOD;
  -
  -/*
  - * This structure is used to keep string key/value pairs such as 
  - * http headers. set_header
  - * function can be used to add headers to a Ax_soapstream
  - */ 
  -typedef struct
  -{
  -    char* headername;
  -    char* headervalue;
  -} Ax_header;
  -
  -/*
  -typedef struct
  -{
  -    char* uri_path;
  -    Ax_header* ip_headers;
  -    int ip_headercount;
  -    Ax_header* op_headers;
  -    int op_headercount;
  -    AXIS_HTTP_METHOD ip_method;
  -    AXIS_HTTP_METHOD op_method;
  -} Ax_stream_http, Ax_stream_https;
  -
  -typedef struct
  -{
  -    int dummy;  
  -} Ax_stream_smtp;
  -
  -typedef union
  -{
  -    Ax_stream_http* http;
  -    Ax_stream_https* https;
  -    Ax_stream_smtp* smtp;
  -    void* other; 
  -} Ax_soapcontent;
  -*/
  -typedef enum
  -{
  -    TRANSPORT_FINISHED=0,
  -    TRANSPORT_IN_PROGRESS,
  -    TRANSPORT_FAILED
  -} AXIS_TRANSPORT_STATUS;
  -
  -/*
  - * Function pointer definitions for axis trasport module call backs 
  - */
  -
  -/*
  - * This function is provided by the transport modules.
  - * Called by Axis engine when it needs to send SOAP
  - * message. This function may be called several times.
  - * @param 
  - *         1st - null terminated character buffer to be sent
  - *        2nd - buffer id    which identifies the buffer
  - *        3rd - Ax_soapstream object which act like a thread id
  - * @return
  - *    TRANSPORT_FINISHED - Transport done and buffer is free to re-use.
  - *  TRANSPORT_IN_PROGRESS - Transport is in progress and buffer 
  - *                          cannot be re-used yet.
  - *  TRANSPORT_FAILED - Transport has failed and no use of trying to 
  - *                     send any more bytes. Better to abort.
  - * Note: if the bufferid is NULL that indicates the buffer is a 
  - *       temporary buffer and should not be retained.
  - *         So in this case the buffer should be immediately sent.
  - 
  -typedef AXIS_TRANSPORT_STATUS 
  -(AXISCALL * AXIS_MODULE_CALLBACK_SEND_MESSAGE_BYTES)
  -(const char*, const void*, const void*);
  -*/
  -
  -/*
  - * This function is provided by the transport modules. 
  - * Called by Axis engine when it needs to get SOAP
  - * message. This function may be called several times.
  - * @param 
  - *        1st - pointer to buffer pointer to which the transport's buffer is set
  - *        2nd - pointer to an int to which the number of bytes read is set
  - *        3rd - Ax_soapstream object which act like a thread id
  - * @return
  - *    TRANSPORT_FINISHED - No any more message bytes to be received. 
  - *                       If a buffer is present it is the last
  - *                         buffer.
  - *  TRANSPORT_IN_PROGRESS - There may be more message bytes to be received. 
  - *                          Axis Engine may call this 
  - *                            function again to get any subsequent message 
  - *                          buffers. Buffer should be present.
  - *  TRANSPORT_FAILED - Transport has failed and no use of trying to get any
  - *                     more bytes. Better to abort.
  - 
  -typedef AXIS_TRANSPORT_STATUS 
  -(AXISCALL * AXIS_MODULE_CALLBACK_GET_MESSAGE_BYTES)
  -(const char**, int*, const void*);
  - */
  -
  -/*
  - * This function is provided by the transport modules. 
  - * Called by Axis engine when it needs to say the
  - * transport module that the engine is no longer using the buffer 
  - * and can be re-used.
  - * @param 
  - *        1st - buffer that Axis got from the transport layer.
  - *        2nd - Ax_soapstream object which act like a thread id
  -
  -typedef void (AXISCALL * AXIS_MODULE_CALLBACK_RELEASE_RECEIVE_BUFFER)
  -(const char*, const void*);
  - */
  -
  -/**
  - * This function is provided by the transport modules. 
  - * Called by Axis engine when it needs to set any
  - * transport information such as http headers. 
  - * This function can be called multiple times. But when
  - * to send the transport information is upto the transport module
  - * @param
  - *        1st - Transport information type to set
  - *        2nd - Information value
  - *        3rd - Ax_soapstream object which act like a thread id
  - 
  -typedef void (AXISCALL * AXIS_MODULE_CALLBACK_SET_TRANSPORT_INFORMATION)
  -(AXIS_TRANSPORT_INFORMATION_TYPE, const char*, const void*);
  - */
  -/*
  - * This function is provided by the transport modules. 
  - * Called by Axis engine when it needs to get any
  - * transport information such as http headers. 
  - * This function can be called only once.
  - * @param
  - *        1st - Transport information type to get
  - *        2nd - Ax_soapstream object which act like a thread id
  -
  -typedef const char* (AXISCALL * AXIS_MODULE_CALLBACK_GET_TRANSPORT_INFORMATION)
  -(AXIS_TRANSPORT_INFORMATION_TYPE, const void*);
  - */
  -/*
  - * Function pointer definitions for axis call backs 
  - */
  -
  -/*
  - * This function is provided by the Axis Engine. 
  - * Called by transport module when it needs to say that
  - * a message buffer passed to it is no longer being used by the transport 
  - * and can be re-used by the 
  - * Axis engine.This function should be called for each buffer 
  - * if AXIS_MODULE_CALLBACK_SEND_MESSAGE_BYTES
  - * returned TRANSPORT_IN_PROGRESS.
  - * @param 
  - *        1st - buffer that Axis gave to the transport layer
  - *        2nd - buffer id    which uniquely identifies the buffer
  - *        3rd - Ax_soapstream object which act like a thread id
  - */
  -typedef void (AXISCALL * AXIS_ENGINE_CALLBACK_RELEASE_SEND_BUFFER)
  -(const char*, const void*);
  - 
  -/*
  - * Each transport module on the server side should populate following struct with 
  - * their transport function pointers in order for the Axis Engine to work properly.
  - */
  -/*typedef struct
  -{
  -	AXIS_MODULE_CALLBACK_SEND_MESSAGE_BYTES pSendFunct;
  -	AXIS_MODULE_CALLBACK_GET_MESSAGE_BYTES pGetFunct;
  -	AXIS_MODULE_CALLBACK_RELEASE_RECEIVE_BUFFER pRelBufFunct;
  -	AXIS_MODULE_CALLBACK_SET_TRANSPORT_INFORMATION pSetTrtFunct;
  -	AXIS_MODULE_CALLBACK_GET_TRANSPORT_INFORMATION pGetTrtFunct;
  -	AXIS_ENGINE_CALLBACK_RELEASE_SEND_BUFFER pRelSendBufFunct;
  -} Ax_transport;
  -
  -typedef struct
  -{
  -    Ax_soapcontent so;
  -    Ax_iostream str;
  -    char* sessionid;
  -    AXIS_PROTOCOL_TYPE trtype;
  -    Ax_transport transport;
  -    void* reserved1; 
  -    void* reserved2; 
  -} Ax_soapstream;
  -*/
  -typedef struct
  -{
  -    const void* pBufferId;
  -    const char* pcBuffer;
  -} BufferInfo;
  -
  -/* NO_OF_SERIALIZE_BUFFERS should be equal to the corresponding 
  - * value in the axis configuration file 
  - */
  -#define NO_OF_SERIALIZE_BUFFERS 20
  -
  -extern "C"
  -{
  -/*
  - * Functions to manipulate Ax_soapstream object. Implemented in Packet.cpp
  - *
  - */
  -/*
  -STORAGE_CLASS_INFO int set_property(Ax_soapstream* stream, char * pchkey, 
  -                                    char * pchvalue);
  -STORAGE_CLASS_INFO const char* get_property(const Ax_soapstream* stream,
  -                                            const char* pchkey);
  -STORAGE_CLASS_INFO void remove_all_properties(Ax_soapstream* stream);
  -*/
  -/*
  - * This function is implemented in axis and should be called ONCE to 
  - * uninitialize Axis Engine when the 
  - * Axis SOAP processor shuts down.
  - */
  -STORAGE_CLASS_INFO int uninitialize_module();
  -
  -/*
  - * This function is implemented in axis and should be called ONCE to 
  - * initialize Axis Engine.
  - */
  -STORAGE_CLASS_INFO int initialize_module(int bServer);
  -
  -/*
  - * This callback function is implemented in axis and should be called by the 
  - * transport module in order to
  - * start processing a SOAP message. 
  - * @param 
  - * stream - Ax_soapstream object contains information about the SOAP stream 
  - *          and the message. This also should be populated with the 
  - *          transport module.
  - */
  -STORAGE_CLASS_INFO int process_request(void* stream);
  -
  -/*
  - * This callback function is implemented in axis and should be called by 
  - * the transport module. 
  - * @param 
  - *        buffer - Buffer passed to transport by calling transport's 
  - *      AXIS_MODULE_CALLBACK_SEND_MESSAGE_BYTES 
  - *                 callback
  - *        bufferid - Id of the buffer passed to transport by calling transport's 
  - *               AXIS_MODULE_CALLBACK_SEND_MESSAGE_BYTES callback
  - *        stream - Ax_soapstream object passed to transport by calling 
  - *               transport's AXIS_MODULE_CALLBACK_SEND_MESSAGE_BYTES callback
  - */
  -STORAGE_CLASS_INFO void axis_buffer_release(const char* buffer, 
  -                                            const void* bufferid, 
  -                                            const void* stream);
  -
  -}
  -
  -#endif
  -
  -
  -
  -
  +#error "Please do not include Packet.hpp"
  \ No newline at end of file
  
  
  
  1.44      +11 -11    ws-axis/c/src/common/AxisTrace.cpp
  
  Index: AxisTrace.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.cpp,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- AxisTrace.cpp	19 Nov 2004 16:22:06 -0000	1.43
  +++ AxisTrace.cpp	22 Nov 2004 16:10:07 -0000	1.44
  @@ -158,8 +158,8 @@
       char *envVars[]={"PATH","LIBPATH","LD_LIBRARY_PATH","AXISCPP_DEPLOY","PWD",
           "CLASSPATH","INCLUDE","LIB","NLSPATH","OS","COMPUTERNAME","USERNAME",
           "HOSTNAME","LANG","LOGIN","LOGNAME","MACHTYPE","OSTYPE","UID","USER"};
  -    for (int i=0; i<sizeof(envVars)/4; i++) {
  -        string text = envVars[i];
  +    for (unsigned i=0; i<sizeof(envVars)/4; i++) {
  +        text = envVars[i];
           const char *value = getenv(envVars[i]);
           if (NULL==value) text += " was not set";
           else {
  @@ -185,7 +185,7 @@
   
   	try {
   		string line;
  -		for (int is=0; is<m_stack.size(); is++) line += " ";
  +		for (unsigned is=0; is<m_stack.size(); is++) line += " ";
   		line += "{ ";
   		if (NULL!=className) {
   			line += className;
  @@ -206,7 +206,7 @@
   		va_list args;
   		va_start(args, nParms);
   		for (int i=0; i<nParms; i++) {
  -			AxisTraceType type = va_arg(args, AxisTraceType);
  +			int type = va_arg(args, int);
   			unsigned len = va_arg(args, unsigned);
   			void *value = va_arg(args, void*);
   			if (0!=i) line += ", ";
  @@ -230,7 +230,7 @@
   }
   
   void AxisTrace::traceExit(const char *className, const char *methodName, int returnIndex,
  -						  AxisTraceType type, unsigned len, void *value)
  +						  int type, unsigned len, void *value)
   {
       if (!isTraceOn()) return;
   
  @@ -246,7 +246,7 @@
   		if (m_stack.size()>0) m_stack.pop();
   
   		string line;
  -		for (int is=0; is<m_stack.size(); is++) line += " ";
  +		for (unsigned is=0; is<m_stack.size(); is++) line += " ";
   		line += "} ";
   		if (NULL!=className) {
   			line += className;
  @@ -271,7 +271,7 @@
   }
   
   void AxisTrace::traceCatch(const char *className, const char *methodName, int catchIndex,
  -						   AxisTraceType type, unsigned len, void *value)
  +						   int type, unsigned len, void *value)
   {
       if (!isTraceOn()) return;
   
  @@ -283,7 +283,7 @@
   		while (m_stack.size()>0 && name!=m_stack.top()) m_stack.pop();
   
   		string line;
  -		for (int is=0; is<m_stack.size(); is++) line += " ";
  +		for (unsigned is=0; is<m_stack.size(); is++) line += " ";
   		line += "! ";
   		if (NULL!=className) {
   			line += className;
  @@ -308,7 +308,7 @@
       }
   }
   
  -void AxisTrace::addParameter(string& line, AxisTraceType type, unsigned len, void *value)
  +void AxisTrace::addParameter(string& line, int type, unsigned len, void *value)
   {
   	char prim[32]; // Plenty big enough to hold a primitive
         char *pcValue = (char*)value;
  @@ -346,13 +346,13 @@
   	case TRACETYPE_DATA:	
   		try {
   			line += "[";
  -			for (int i=0; i<len && i<32; i++) {
  +			for (unsigned i=0; i<len && i<32; i++) {
   				int x = (int)(pcValue[i]);
   				sprintf(prim,"%2.2X",x);
   				line += prim;
   			}
   			line += "] <";
  -			for (int j=0; j<len && j<32; j++) {
  +			for (unsigned j=0; j<len && j<32; j++) {
   				char c = pcValue[j];
   				if (!isprint(c)) c='.';
   				sprintf(prim,"%c",c);
  
  
  
  1.18      +22 -59    ws-axis/c/src/common/AxisTrace.h
  
  Index: AxisTrace.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- AxisTrace.h	19 Nov 2004 16:22:06 -0000	1.17
  +++ AxisTrace.h	22 Nov 2004 16:10:07 -0000	1.18
  @@ -55,24 +55,25 @@
   
   AXIS_CPP_NAMESPACE_START
   
  -typedef enum {
  -	TRACETYPE_UNKNOWN=0,
  -	TRACETYPE_CHAR,
  -	TRACETYPE_USHORT,
  -	TRACETYPE_SHORT,
  -	TRACETYPE_UINT,
  -	TRACETYPE_INT,
  -	TRACETYPE_ULONG,
  -	TRACETYPE_LONG,
  -	TRACETYPE_UDOUBLE,
  -	TRACETYPE_DOUBLE,
  -	TRACETYPE_FLOAT,
  -	TRACETYPE_BOOL,
  -	TRACETYPE_POINTER,
  -	TRACETYPE_DATA,
  -	TRACETYPE_STRING,
  -	TRACETYPE_STLSTRING
  -} AxisTraceType;
  +// Unfortunately the trace type has to be an int with #defines, not an enum because
  +// it is used with '...' and va_args, and ints can be used with '...' but enums 
  +// cannot.
  +#define TRACETYPE_UNKNOWN	0
  +#define TRACETYPE_CHAR		1
  +#define TRACETYPE_USHORT	2
  +#define TRACETYPE_SHORT		3
  +#define TRACETYPE_UINT		4
  +#define TRACETYPE_INT		5
  +#define TRACETYPE_ULONG		6
  +#define TRACETYPE_LONG		7
  +#define TRACETYPE_UDOUBLE	8
  +#define TRACETYPE_DOUBLE	9
  +#define TRACETYPE_FLOAT		10
  +#define TRACETYPE_BOOL		11
  +#define TRACETYPE_POINTER	12
  +#define TRACETYPE_DATA		13
  +#define TRACETYPE_STRING	14
  +#define TRACETYPE_STLSTRING	15
   
   class AxisTrace
   {
  @@ -117,44 +118,6 @@
           int arg4);
   
       /**
  -     * This is called in writing to the log file whose path is specified in 
  -     * $AXIS_HOME/axiscpp.c     * onf file.
  -     * This method is used when the caller has two string messages 
  -     * as arguments. One may be his      *own message.
  -     * The other may be to print a trace value. User can also specify the 
  -     * severity of the messag     *e by
  -     * assigning level argument to one of CRITICAL, WARN, INFO or TRIVIAL.
  -     * @param sLog1 string message one
  -     * @param sLog2 string message two  
  -     * @param level severity level
  -     * @param arg3 file name
  -     * @param arg4 line number
  -     * @return The status which indicates whether the operation is success 
  -     * (AXIS_SUCCESS) or not     * (AXIS_FAIL).
  -     */
  -    //static int logaxis(const char* sLog1, const int nLog2, int level, char* arg3, 
  -    //    int arg4);
  -
  -    /**
  -     * This is called in writing to the log file whose path is specified in 
  -     * $AXIS_HOME/axiscpp.c     * onf file.
  -     * This method is used when the caller pass first argument as string 
  -     * and the second argument     * as double. First is his own message.
  -     * The other may be to print a trace value. User can also specify the 
  -     * severity of the messag     * e by
  -     * assigning level argument to one of CRITICAL, WARN, INFO or TRIVIAL.
  -     * @param sLog1 string message one
  -     * @param sLog2 string message two  
  -     * @param level severity level
  -     * @param arg3 file name
  -     * @param arg4 line number
  -     * @return The status which indicates whether the operation is success
  -     * (AXIS_SUCCESS) or not (AXIS_FAIL).
  -     */
  -    //static int logaxis(const char* sLog1, const double dLog2, int level, 
  -    //    char* arg3, int arg4);
  -
  -    /**
        * Writes the given string to the standard console. 
        * This method is useful when using the standalone server.
        * @param pchLog The given string which will be printed to the 
  @@ -205,13 +168,13 @@
   	 * Traces the exit to a method.
   	 */
   	static void traceExit(const char *className, const char *methodName, int returnIndex,
  -		AxisTraceType type=TRACETYPE_UNKNOWN, unsigned len=0, void *value=0);
  +		int type=TRACETYPE_UNKNOWN, unsigned len=0, void *value=0);
   
   	/**
   	 * Traces something that has been caught
   	 */
   	static void traceCatch(const char *className, const char *methodName, int catchIndex,
  -		AxisTraceType type=TRACETYPE_UNKNOWN, unsigned len=0, void *value=0);
  +		int type=TRACETYPE_UNKNOWN, unsigned len=0, void *value=0);
   
         /**
          * Closes the trace file
  @@ -224,7 +187,7 @@
   	static std::stack<std::string> m_stack;
   
       static int logthis(const char* pcLog, int level, char* arg2, int arg3);
  -	static void addParameter(std::string& line, AxisTraceType type, unsigned len, void
*value);
  +	static void addParameter(std::string& line, int type, unsigned len, void *value);
       static void traceHeader();
   };
   
  
  
  
  1.81      +0 -1      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.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- Axis.cpp	19 Nov 2004 16:22:06 -0000	1.80
  +++ Axis.cpp	22 Nov 2004 16:10:08 -0000	1.81
  @@ -41,7 +41,6 @@
   
   #include <stdio.h>
   #include <stdlib.h>
  -#include <axis/server/Packet.hpp>
   #include <string>
   #include <map>
   #include <iostream>
  
  
  
  1.30      +0 -1      ws-axis/c/src/server/simple_axis_server/SimpleAxisServer.cpp
  
  Index: SimpleAxisServer.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/simple_axis_server/SimpleAxisServer.cpp,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- SimpleAxisServer.cpp	16 Nov 2004 13:16:03 -0000	1.29
  +++ SimpleAxisServer.cpp	22 Nov 2004 16:10:09 -0000	1.30
  @@ -31,7 +31,6 @@
   #endif
   
   //#include <axis/server/GDefine.hpp>
  -//#include <axis/server/Packet.hpp>
   //#include <axis/Axis.hpp>
   //#include "../../common/AxisConfig.h"
   //#include "../../common/AxisSocketUtils.h"
  
  
  
  1.107     +0 -1      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.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- SoapDeSerializer.cpp	19 Nov 2004 16:22:07 -0000	1.106
  +++ SoapDeSerializer.cpp	22 Nov 2004 16:10:09 -0000	1.107
  @@ -52,7 +52,6 @@
   #include "ComplexElement.h"
   #include "CharacterElement.h"
   #include <axis/server/GDefine.hpp>
  -#include <axis/server/Packet.hpp>
   #include "../common/AxisTrace.h"
   #include "apr_base64.h"
   #include "HexCoder.h"
  
  
  
  1.77      +0 -1      ws-axis/c/src/soap/SoapSerializer.cpp
  
  Index: SoapSerializer.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.cpp,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- SoapSerializer.cpp	22 Nov 2004 11:13:38 -0000	1.76
  +++ SoapSerializer.cpp	22 Nov 2004 16:10:09 -0000	1.77
  @@ -30,7 +30,6 @@
   #include "SoapSerializer.h"
   #include "HeaderBlock.h"
   #include <axis/server/GDefine.hpp>
  -#include <axis/server/Packet.hpp>
   #include "../common/ArrayBean.h"
   #include "../common/BasicTypeSerializer.h"
   #include "../soap/SoapKeywordMapping.h"
  
  
  
  1.8       +35 -5     ws-axis/c/src/transport/SOAPTransport.h
  
  Index: SOAPTransport.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/SOAPTransport.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SOAPTransport.h	15 Nov 2004 05:38:29 -0000	1.7
  +++ SOAPTransport.h	22 Nov 2004 16:10:10 -0000	1.8
  @@ -31,7 +31,7 @@
   #if !defined(AXIS_SOAPTRANSPORT_H__OF_AXIS_INCLUDED_)
   #define AXIS_SOAPTRANSPORT_H__OF_AXIS_INCLUDED_
   
  -#include <axis/server/Packet.hpp>
  +#include <axis/server/GDefine.hpp>
   
   /**
    * @file SOAPTransport.h
  @@ -56,6 +56,36 @@
   
   AXIS_CPP_NAMESPACE_START
   
  +typedef enum
  +{
  +    TRANSPORT_FINISHED=0,
  +    TRANSPORT_IN_PROGRESS,
  +    TRANSPORT_FAILED
  +} AXIS_TRANSPORT_STATUS;
  +
  +typedef enum
  +{
  +    AXIS_HTTP_GET,
  +    AXIS_HTTP_POST,
  +    AXIS_HTTP_UNSUPPORTED
  +} AXIS_HTTP_METHOD;
  +
  +/*
  + * This function is provided by the Axis Engine. 
  + * Called by transport module when it needs to say that
  + * a message buffer passed to it is no longer being used by the transport 
  + * and can be re-used by the 
  + * Axis engine.This function should be called for each buffer 
  + * if AXIS_MODULE_CALLBACK_SEND_MESSAGE_BYTES
  + * returned TRANSPORT_IN_PROGRESS.
  + * @param 
  + *        1st - buffer that Axis gave to the transport layer
  + *        2nd - buffer id    which uniquely identifies the buffer
  + *        3rd - Ax_soapstream object which act like a thread id
  + */
  +typedef void (AXISCALL * AXIS_ENGINE_CALLBACK_RELEASE_SEND_BUFFER)
  +(const char*, const void*);
  + 
   class AxisIOStream
   {
   public:
  @@ -172,7 +202,7 @@
        * message.
        *
        * @brief Sets a predefined transport property for outgoing message.
  -     * @param eType Predefined transport property to be set. See Packet.h
  +     * @param eType Predefined transport property to be set.
        *        for predefined transport property types.
        * @param pcValue Transport property value to be set.
        */
  @@ -181,7 +211,7 @@
       /**
        * @brief Gets a predefined transport property in the arrived message
        *
  -     * @param eType Predefined transport property to get. See Packet.h
  +     * @param eType Predefined transport property to get.
        *        for predefined transport property types.
        * @return Value of the transport property if available. Returns null
        *         if unavailable.
  @@ -282,7 +312,7 @@
        * should use the transport accordingly.
        *
        * @brief Gets the protocol type of the transport library.
  -     * @return The type of the transport. See AXIS_PROTOCOL_TYPE in Packet.h
  +     * @return The type of the transport. See AXIS_PROTOCOL_TYPE
        */
       virtual AXIS_PROTOCOL_TYPE getProtocol()=0;
   
  @@ -299,7 +329,7 @@
        * Gets the sub protocol. The usefulness of this method and the return
        * values depend on the particular implementation. For example HTTP
        * transports should return one of the values defined in enumeration
  -     * AXIS_HTTP_METHOD. See Packet.h
  +     * AXIS_HTTP_METHOD.
        *
        * @brief Gets the sub protocol. 
        * @return Type of the sub protocol (Ex: GET, POST, UNSUPPORTED for HTTP).
  
  
  
  1.5       +0 -1      ws-axis/c/src/xml/xerces/SoapBinInputStream.h
  
  Index: SoapBinInputStream.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/xerces/SoapBinInputStream.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SoapBinInputStream.h	26 Oct 2004 11:00:53 -0000	1.4
  +++ SoapBinInputStream.h	22 Nov 2004 16:10:10 -0000	1.5
  @@ -20,7 +20,6 @@
   #define AXIS_SOAPBININPUTSTREAM_H__OF_AXIS_INCLUDED_
   
   #include <xercesc/util/BinInputStream.hpp>
  -#include <axis/server/Packet.hpp>
   #include "../../transport/SOAPTransport.h"
   
   XERCES_CPP_NAMESPACE_USE
  
  
  
  1.7       +0 -1      ws-axis/c/src/xml/xerces/XMLParserXerces.h
  
  Index: XMLParserXerces.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/xerces/XMLParserXerces.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XMLParserXerces.h	26 Oct 2004 11:00:53 -0000	1.6
  +++ XMLParserXerces.h	22 Nov 2004 16:10:10 -0000	1.7
  @@ -26,7 +26,6 @@
   #if !defined(__XMLPARSERXERCES_H_OF_AXIS_INCLUDED__)
   #define __XMLPARSERXERCES_H_OF_AXIS_INCLUDED__
   
  -#include <axis/server/Packet.hpp>
   #include "../QName.h"
   #include "../Event.h"
   #include "../XMLParser.h"
  
  
  
  1.10      +1 -1      ws-axis/c/tools/trace/org/apache/axis/tracetool/Tracer.java
  
  Index: Tracer.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tools/trace/org/apache/axis/tracetool/Tracer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Tracer.java	19 Nov 2004 16:22:08 -0000	1.9
  +++ Tracer.java	22 Nov 2004 16:10:10 -0000	1.10
  @@ -226,7 +226,7 @@
               // copes with catch (...)
               if ("...".equals(p.getType())) return " ";
   
  -		String parms = ",\n\t\t\t\t\tAXIS_CPP_NAMESPACE_PREFIX TRACETYPE_";
  +		String parms = ",\n\t\t\t\t\tTRACETYPE_";
   		String name = p.getName();
   		if (null == name)
   			name = "traceRet";
  
  
  

Mime
View raw message