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/src/wsdd WSDDDeployment.cpp WSDDDocument.cpp
Date Wed, 17 Dec 2003 05:56:56 GMT
damitha     2003/12/16 21:56:56

  Modified:    c/include/axis/common Tag:
                        Release-2003_10_26-bugfixes_branch AxisConfig.h
                        AxisTrace.h
               c/src/common Tag: Release-2003_10_26-bugfixes_branch
                        AxisConfig.cpp AxisTrace.cpp Packet.cpp
               c/src/engine Tag: Release-2003_10_26-bugfixes_branch
                        AxisEngine.cpp ClientAxisEngine.cpp
                        DeserializerPool.cpp HandlerChain.cpp
                        HandlerPool.cpp SerializerPool.cpp
                        ServerAxisEngine.cpp
               c/src/soap Tag: Release-2003_10_26-bugfixes_branch
                        SoapDeSerializer.cpp SoapSerializer.cpp
               c/src/wsdd Tag: Release-2003_10_26-bugfixes_branch
                        WSDDDeployment.cpp WSDDDocument.cpp
  Log:
  Cleared the unncessary log messages and put some important log messages
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.2.5   +17 -0     ws-axis/c/include/axis/common/AxisConfig.h
  
  Index: AxisConfig.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/common/AxisConfig.h,v
  retrieving revision 1.2.2.4
  retrieving revision 1.2.2.5
  diff -u -r1.2.2.4 -r1.2.2.5
  --- AxisConfig.h	15 Dec 2003 14:02:09 -0000	1.2.2.4
  +++ AxisConfig.h	17 Dec 2003 05:56:55 -0000	1.2.2.5
  @@ -77,8 +77,25 @@
       public:
           AxisConfig();
           ~AxisConfig();
  +        /**
  +	     * This is called to get the server.wsdd file path.
  +         * 
  +	     * @return the server.wsdd file path 
  +	     */
           char* GetWsddFilePath();
  +        /**
  +	     * This is called to get the AxisLog file path.
  +         *
  +	     * @return the AxisLog file path.
  +	     */
           char* GetAxisLogPath();
  +
  +        /**
  +	     * This method will read from the configuration file called axiscpp.conf
  +         * which is located in a place defined by AXIS_HOME environment variable. 
  +	 
  +	     * @return The status which indicates whether the operation is success (AXIS_SUCCESS)
or not (AXIS_FAIL).
  +	     */
           int ReadConfFile();
           
       private:		 
  
  
  
  1.4.2.7   +47 -8     ws-axis/c/include/axis/common/AxisTrace.h
  
  Index: AxisTrace.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/common/AxisTrace.h,v
  retrieving revision 1.4.2.6
  retrieving revision 1.4.2.7
  diff -u -r1.4.2.6 -r1.4.2.7
  --- AxisTrace.h	12 Dec 2003 15:00:43 -0000	1.4.2.6
  +++ AxisTrace.h	17 Dec 2003 05:56:55 -0000	1.4.2.7
  @@ -77,15 +77,16 @@
     #define AXISTRACE3(X) "";
   #endif
   
  -//extern unsigned char chEBuf[1024];
  +
   using namespace std;
   
   /**
  -    @class AxisTrace
  -    @brief This is class is used to log messages when AXISTRACE is defined.
  + *  @class AxisTrace
  + *  @brief This is class is used to log messages when AXISTRACE is defined.
   
  -    
  -    @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *  writing to the log could be disabled by commenting the line #define __AXISTRACE__
  + *  of Axisconfig.h.   
  + *  @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
   */
   
   class AxisTrace
  @@ -93,23 +94,61 @@
   public:
       AxisTrace();
   	virtual ~AxisTrace();
  +    /**
  +	 * This is called in writing to the log file whose path is specified in $AXIS_HOME/axiscpp.conf
file.
  +     * This method is used when the caller has only one string message as argument. User
  +     * can also specify the severity of the message by assigning level argument to one
  +     * of CRITICAL, WARN, INFO or TRIVIAL.
  +	 * @param sLog string message
  +     * @param level severity level
  +     * @param arg2 file name
  +     * @param arg3 line number
  +	 * @return The status which indicates whether the operation is success (AXIS_SUCCESS)
or not (AXIS_FAIL).
  +	 */
       int logaxis(const char* sLog, int level, char* arg2, int arg3);
  +    /**
  +	 * This is called in writing to the log file whose path is specified in $AXIS_HOME/axiscpp.conf
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
message 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).
  +	 */
       int logaxis(const char* sLog1, const char* sLog2, int level, char* arg3, int arg4);
   	/**
  -	 * Writes the given string to the standard console.
  +	 * 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 standard console.
   	 * @return The status which indicates whether the operation is success (AXIS_SUCCESS)
or not (AXIS_FAIL).
   	 */
   	int trace(const char* pchLog);
  +    /**
  +	 * Log file is opened for logging server side log messages
  +     *
  +     * The file is created( if one is already not there) with the name and path specified
in $AXIS_HOME/axiscpp.conf file when web server
  +     * loads.
  +	 *
  +	 * @return The status which indicates whether the operation is success (AXIS_SUCCESS)
or not (AXIS_FAIL).
  +	 */
       int openFile();
  +    /**
  +	 * Log file is opened for logging client side log messages
  +     *
  +     * The file is created with the name ClientAxisLog if one is not already in the current
path.
  +	 * 
  +	 * @return The status which indicates whether the operation is success (AXIS_SUCCESS)
or not (AXIS_FAIL).
  +	 */
       int openFileByClient();
     
   private:
       char strLine[4];
       char* strLevel;
  -    //char* m_sFileName;
       FILE* fileTrace;
  -    FILE* ConfFile; 
  +    FILE* ConfFile;
   
   };
   
  
  
  
  No                   revision
  No                   revision
  1.8.2.7   +7 -9      ws-axis/c/src/common/AxisConfig.cpp
  
  Index: AxisConfig.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/AxisConfig.cpp,v
  retrieving revision 1.8.2.6
  retrieving revision 1.8.2.7
  diff -u -r1.8.2.6 -r1.8.2.7
  --- AxisConfig.cpp	15 Dec 2003 14:05:45 -0000	1.8.2.6
  +++ AxisConfig.cpp	17 Dec 2003 05:56:56 -0000	1.8.2.7
  @@ -93,16 +93,13 @@
       
   }
   
  -/**
  -    This method will read from the configuration file called axiscpp.conf
  -* which is located in a place defined by AXIS_HOME environment variable.
  -*/
   int AxisConfig::ReadConfFile()
   {
       FILE* fileConfig = NULL;
       char* sConfPath = NULL;
       char sNewConfPath[CONFBUFFSIZE] = {0};
  -    char key[CONFBUFFSIZE] = {0};
  +    //char key[CONFBUFFSIZE] = {0};
  +    char* key;
       //char m_sLine[CONFBUFFSIZE] = {0};
   	//char value[CONFBUFFSIZE] = {0};
                
  @@ -111,7 +108,7 @@
           return AXIS_FAIL;
   	strcpy(sNewConfPath, sConfPath);
       strcat(sNewConfPath, "/axiscpp.conf");
  -    if ((fileConfig = fopen(sNewConfPath, "rt")) == NULL)
  +    if ((fileConfig = fopen(sNewConfPath, "r")) == NULL)
   		return AXIS_FAIL;
   
       /*while(fgets(m_sLine, CONFBUFFSIZE, fileConfig) != NULL)
  @@ -146,15 +143,15 @@
           int linesize = strlen(m_sLine);
           m_sValue = strpbrk(m_sLine, ":");
           if(!m_sValue) break;
  +        key = (char*) malloc(strlen(m_sValue));
           m_sValue[0] = '\0';
           sscanf(m_sLine,"%s", key);
           
           if(strcmp(key, "WSDDFILEPATH") == 0)
               strncpy(m_sWsddFilePath, m_sValue + 1, linesize  - strlen(key) - 2);
           if(strcmp(key, "AXISLOGPATH") == 0)
  -            strncpy(m_sAxisLogPath, m_sValue + 1, linesize  - strlen(key) - 2);    
  -    
  -        //m_sValue = NULL;     
  +            strncpy(m_sAxisLogPath, m_sValue + 1, linesize  - strlen(key) - 2);
  +         
       }
       
       return AXIS_SUCCESS;
  @@ -175,6 +172,7 @@
       AxisConfig* objConfig = new AxisConfig();
       objConfig->ReadConfFile();
       char* pWsddPath = objConfig->GetWsddFilePath();
  +    printf("pWsddPath:%s\n", pWsddPath);
       char* LogPath = objConfig->GetAxisLogPath();
       
   }
  
  
  
  1.9.2.6   +4 -25     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.9.2.5
  retrieving revision 1.9.2.6
  diff -u -r1.9.2.5 -r1.9.2.6
  --- AxisTrace.cpp	16 Dec 2003 12:44:11 -0000	1.9.2.5
  +++ AxisTrace.cpp	17 Dec 2003 05:56:56 -0000	1.9.2.6
  @@ -83,52 +83,39 @@
       fclose(fileTrace);
   }
   
  -/**
  -    open log file for writing at server side.
  -*/
   int AxisTrace::openFile()
   {
       char* sFileName =  g_pConfig->GetAxisLogPath();
  -    if((fileTrace = fopen(sFileName, "w")) == NULL)
  +    if((fileTrace = fopen(sFileName, "a")) == NULL)
           return AXIS_FAIL;
       fclose(fileTrace);
       int length = strlen(sFileName) + 12;
       char* setPerm = (char*) malloc(length);
       if(setPerm)
       {
  -        strcpy(setPerm, "chmod 777 ");
  +        strcpy(setPerm, "chmod 766 ");
           strcat(setPerm, sFileName);
       }
   
   #ifdef __GNUC__
       system(setPerm);
   #endif
  -    if((fileTrace = fopen(sFileName, "ab")) == NULL)
  +    if((fileTrace = fopen(sFileName, "a")) == NULL)
           return AXIS_FAIL;
                   
       return AXIS_SUCCESS;
   }
   
  -/**
  -    open log file for writing at client side.
  -*/
   int AxisTrace::openFileByClient()
   {
       char* sFileName =  "./ClientAxisLog";
       
  -    if((fileTrace = fopen(sFileName, "ab")) == NULL)
  +    if((fileTrace = fopen(sFileName, "a")) == NULL)
           return AXIS_FAIL;
   
       return AXIS_SUCCESS;
   }
   
  -/** 
  -*   Logs messages according to their severity level.
  -*   @param sLog log message
  -*   @param level severity level of the message
  -*   @param arg2 file name
  -*   @param arg3 line number
  -*/
   int AxisTrace::logaxis(const char* sLog, int level, char* arg2, int arg3)
   {
       time_t ltime;
  @@ -167,14 +154,6 @@
      
   }
   
  -/**
  -*   Logs messages according to their severity level.
  -*   @param sLog1 log message1
  -*   @param sLog2 log message2
  -*   @param level severity level of the message
  -*   @param arg2 file name
  -*   @param arg3 line number
  -*/
   int AxisTrace::logaxis(const char* sLog1, const char* sLog2, int level, char* arg3, int
arg4)
   {
       time_t ltime;
  
  
  
  1.9.2.3   +3 -8      ws-axis/c/src/common/Packet.cpp
  
  Index: Packet.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/Packet.cpp,v
  retrieving revision 1.9.2.2
  retrieving revision 1.9.2.3
  diff -u -r1.9.2.2 -r1.9.2.3
  --- Packet.cpp	12 Dec 2003 13:47:20 -0000	1.9.2.2
  +++ Packet.cpp	17 Dec 2003 05:56:56 -0000	1.9.2.3
  @@ -69,24 +69,19 @@
   
   int set_header(Ax_soapstream* soap, char * pchkey, char * pchvalue)
   {
  -    AXISTRACE1("came here1", 4);
   	int count = soap->so.http.op_headercount;
       char tempMy[8];
       sprintf(tempMy, "%d", count);
  -    AXISTRACE2("count is:", tempMy, 4);    
  +    AXISTRACE2("header count is:", tempMy, INFO);    
   	Ax_header * temp = soap->so.http.ip_headers;
  -    AXISTRACE1("came here2", 4);
       if(soap->so.http.op_headers)
           soap->so.http.op_headers = (Ax_header*)realloc(temp, 
   										(sizeof(Ax_header)*(count+1)));
       else
           soap->so.http.op_headers = (Ax_header*)malloc((sizeof(Ax_header)*(count+1)));
  -        
  -    AXISTRACE1("came here3", 4);                                        
  +                                                
   	soap->so.http.op_headers[count].headername = pchkey;
  -    AXISTRACE1("came here4", 4); 
  -	soap->so.http.op_headers[count].headervalue = pchvalue;
  -    AXISTRACE1("came here5", 4); 
  +	soap->so.http.op_headers[count].headervalue = pchvalue; 
   	soap->so.http.op_headercount = count+1;
       
   
  
  
  
  No                   revision
  No                   revision
  1.24.2.2  +7 -1      ws-axis/c/src/engine/AxisEngine.cpp
  
  Index: AxisEngine.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngine.cpp,v
  retrieving revision 1.24.2.1
  retrieving revision 1.24.2.2
  diff -u -r1.24.2.1 -r1.24.2.2
  --- AxisEngine.cpp	21 Nov 2003 13:01:10 -0000	1.24.2.1
  +++ AxisEngine.cpp	17 Dec 2003 05:56:56 -0000	1.24.2.2
  @@ -67,10 +67,12 @@
   #include <axis/engine/HandlerPool.h>
   #include <axis/engine/DeserializerPool.h>
   #include <axis/engine/SerializerPool.h>
  +#include <axis/common/AxisTrace.h>
   
   extern DeserializerPool* g_pDeserializerPool;
   extern SerializerPool* g_pSerializerPool;
   extern HandlerPool* g_pHandlerPool;
  +extern AxisTrace* g_pAT;
   //extern WSDDDeployment* g_pWSDDDeployment;
   
   AxisEngine::AxisEngine()
  @@ -98,7 +100,11 @@
   {
   	int Status;
   	m_pMsgData = new MessageData();
  -	if (!m_pMsgData) return AXIS_FAIL;
  +	if (!m_pMsgData)
  +    {
  +        AXISTRACE1("MessageData object could not be initialized", CRITICAL);
  +        return AXIS_FAIL;
  +    }
   	//Create and initialize Serializer and Deserializer objects
   	if (AXIS_SUCCESS != (Status = g_pSerializerPool->GetInstance(&m_pSZ))) return Status;
   	if (AXIS_SUCCESS != (Status = g_pDeserializerPool->GetInstance(&m_pDZ))) return
Status;
  
  
  
  1.7.2.4   +11 -8     ws-axis/c/src/engine/ClientAxisEngine.cpp
  
  Index: ClientAxisEngine.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/ClientAxisEngine.cpp,v
  retrieving revision 1.7.2.3
  retrieving revision 1.7.2.4
  diff -u -r1.7.2.3 -r1.7.2.4
  --- ClientAxisEngine.cpp	12 Dec 2003 13:47:20 -0000	1.7.2.3
  +++ ClientAxisEngine.cpp	17 Dec 2003 05:56:56 -0000	1.7.2.4
  @@ -35,14 +35,21 @@
   	int Status;
   	//const WSDDService* pService = NULL;
   
  -	if (!pSoap) return AXIS_FAIL;
  +	if (!pSoap)
  +    {
  +        AXISTRACE1("Ax_soapstream is null", CRITICAL);
  +        return AXIS_FAIL;
  +    }
   	m_pSoap = pSoap;
   
   	string sSessionId = m_pSoap->sessionid;
   
   	if (!(m_pSoap->transport.pSendFunct && m_pSoap->transport.pGetFunct &&
   		m_pSoap->transport.pSendTrtFunct && m_pSoap->transport.pGetTrtFunct))
  -		return AXIS_FAIL;
  +        {
  +            AXISTRACE1("transport is not set properly", CRITICAL);
  +            return AXIS_FAIL;
  +        }
   
   	do {
   		//const char* cService = get_header(soap, SOAPACTIONHEADER);
  @@ -98,7 +105,7 @@
   				break; //do .. while (0)
   			}
   		}
  -//		AXISTRACE1("AFTER invoke service specific request handlers");
  +
   		level++; //AE_SERH		//invoke transport request handlers
   		//invoke global request handlers
   		if (m_pGReqFChain)
  @@ -109,7 +116,6 @@
   				break; //do .. while (0)
   			}		
   		}
  -//        AXISTRACE1("AFTER invoke global request handlers");
   		level++; //AE_GLH	
   		if (m_pTReqFChain) {
   			if(AXIS_SUCCESS != (Status = m_pTReqFChain->Invoke(pMsg)))
  @@ -118,7 +124,6 @@
   				break; //do .. while (0)
   			}
   		}
  -//		AXISTRACE1("AFTER invoke transport request handlers");
   		level++; // AE_TRH
   
   
  @@ -129,8 +134,7 @@
   	do 
   	{
           if((Status = m_pSZ->SetOutputStream(m_pSoap)) == AXIS_SUCCESS)
  -        {
  -            AXISTRACE1("clientinvoke", 4);
  +        {            
               if (AXIS_SUCCESS != (Status = m_pSoap->transport.pSendTrtFunct(m_pSoap)))
break;
               m_pSZ->flushSerializedBuffer();
           }
  @@ -178,7 +182,6 @@
   	case AE_START:;//transport handlers have failed
   	};
   	*/
  -//	AXISTRACE1("end axisengine process()");
   	return Status;
   }
   
  
  
  
  1.5.2.2   +4 -0      ws-axis/c/src/engine/DeserializerPool.cpp
  
  Index: DeserializerPool.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/DeserializerPool.cpp,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- DeserializerPool.cpp	21 Nov 2003 13:01:10 -0000	1.5.2.1
  +++ DeserializerPool.cpp	17 Dec 2003 05:56:56 -0000	1.5.2.2
  @@ -64,6 +64,9 @@
   //////////////////////////////////////////////////////////////////////
   
   #include <axis/engine/DeserializerPool.h>
  +#include <axis/common/AxisTrace.h>
  +
  +extern AxisTrace* g_pAT;
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  @@ -98,6 +101,7 @@
   			delete *ppDZ;
   			*ppDZ = NULL;
   			unlock();
  +            AXISTRACE1("Deserializer could not be initialized", CRITICAL);
   			return AXIS_FAIL;
   		}
   	}
  
  
  
  1.9.2.4   +1 -1      ws-axis/c/src/engine/HandlerChain.cpp
  
  Index: HandlerChain.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/HandlerChain.cpp,v
  retrieving revision 1.9.2.3
  retrieving revision 1.9.2.4
  diff -u -r1.9.2.3 -r1.9.2.4
  --- HandlerChain.cpp	12 Dec 2003 13:47:20 -0000	1.9.2.3
  +++ HandlerChain.cpp	17 Dec 2003 05:56:56 -0000	1.9.2.4
  @@ -95,7 +95,7 @@
   		}
   		else
   		{
  -            AXISTRACE1("handler invoke not successful", WARN);
  +            AXISTRACE1("Handler invoke not successful", WARN);
   			OnFault(pMsg);
   			return AXIS_FAIL;
   		}
  
  
  
  1.15.2.4  +1 -1      ws-axis/c/src/engine/HandlerPool.cpp
  
  Index: HandlerPool.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/HandlerPool.cpp,v
  retrieving revision 1.15.2.3
  retrieving revision 1.15.2.4
  diff -u -r1.15.2.3 -r1.15.2.4
  --- HandlerPool.cpp	12 Dec 2003 13:47:20 -0000	1.15.2.3
  +++ HandlerPool.cpp	17 Dec 2003 05:56:56 -0000	1.15.2.4
  @@ -271,7 +271,7 @@
   	}
   	if (Status != AXIS_SUCCESS) //some failure so undo whatever done here
   	{
  -        AXISTRACE1("handler failure", WARN);
  +        AXISTRACE1("Handler failure", WARN);
   		string nosession = SESSIONLESSHANDLERS;
   		for (pChain->m_itCurrHandler = pChain->m_HandlerList.begin(); pChain->m_itCurrHandler
!= pChain->m_HandlerList.end(); pChain->m_itCurrHandler++)
   		{
  
  
  
  1.5.2.2   +4 -0      ws-axis/c/src/engine/SerializerPool.cpp
  
  Index: SerializerPool.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/SerializerPool.cpp,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- SerializerPool.cpp	21 Nov 2003 13:01:10 -0000	1.5.2.1
  +++ SerializerPool.cpp	17 Dec 2003 05:56:56 -0000	1.5.2.2
  @@ -64,6 +64,9 @@
   //////////////////////////////////////////////////////////////////////
   
   #include <axis/engine/SerializerPool.h>
  +#include <axis/common/AxisTrace.h>
  +
  +extern AxisTrace* g_pAT;
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  @@ -99,6 +102,7 @@
   			delete *ppSZ;
   			*ppSZ = NULL;
   			unlock();
  +            AXISTRACE1("Serializer pool could not be initialized", CRITICAL);
   			return AXIS_FAIL;
   		}
   	}
  
  
  
  1.10.2.5  +6 -4      ws-axis/c/src/engine/ServerAxisEngine.cpp
  
  Index: ServerAxisEngine.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/ServerAxisEngine.cpp,v
  retrieving revision 1.10.2.4
  retrieving revision 1.10.2.5
  diff -u -r1.10.2.4 -r1.10.2.5
  --- ServerAxisEngine.cpp	12 Dec 2003 13:47:20 -0000	1.10.2.4
  +++ ServerAxisEngine.cpp	17 Dec 2003 05:56:56 -0000	1.10.2.5
  @@ -41,7 +41,10 @@
   
   		if (!(soap->transport.pSendFunct && soap->transport.pGetFunct &&
   			soap->transport.pSendTrtFunct && soap->transport.pGetTrtFunct))
  -			return AXIS_FAIL;
  +            {
  +                AXISTRACE1("transport is not set properly", CRITICAL);
  +                return AXIS_FAIL;
  +            }
   
   		do {
   			//populate MessageData with transport information
  @@ -170,9 +173,8 @@
               intContentLength = m_pSZ->GetContentLength();
               
               sprintf(strContentLength,"%d", intContentLength);
  -            AXISTRACE2("content length:", strContentLength, 4);
  -            set_header(soap, "Content-Length", strContentLength);
  -            AXISTRACE2("content length:", strContentLength, 4);
  +            AXISTRACE2("content length:", strContentLength, INFO);
  +            set_header(soap, "Content-Length", strContentLength);            
               //send any transoport information like http headers first
               soap->transport.pSendTrtFunct(soap);
               m_pSZ->flushSerializedBuffer();
  
  
  
  No                   revision
  No                   revision
  1.17.2.6  +1 -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.2.5
  retrieving revision 1.17.2.6
  diff -u -r1.17.2.5 -r1.17.2.6
  --- SoapDeSerializer.cpp	11 Dec 2003 14:10:34 -0000	1.17.2.5
  +++ SoapDeSerializer.cpp	17 Dec 2003 05:56:56 -0000	1.17.2.6
  @@ -119,8 +119,7 @@
       
   	if (NULL != m_pInputStream->transport.pGetFunct)
           m_hugebuffer = (char*) malloc(intBuffLen + 10);
  -		m_pInputStream->transport.pGetFunct(m_hugebuffer, intBuffLen, &nChars, m_pInputStream->str.ip_stream);
  -    AXISTRACE2("buffer length is: ",strBuffLen, 4);        
  +		m_pInputStream->transport.pGetFunct(m_hugebuffer, intBuffLen, &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");
  
  
  
  1.30.2.5  +2 -4      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.30.2.4
  retrieving revision 1.30.2.5
  diff -u -r1.30.2.4 -r1.30.2.5
  --- SoapSerializer.cpp	12 Dec 2003 13:49:20 -0000	1.30.2.4
  +++ SoapSerializer.cpp	17 Dec 2003 05:56:56 -0000	1.30.2.5
  @@ -398,11 +398,9 @@
   */
   int SoapSerializer::flushSerializedBuffer()
   {
  -	//sendSoapResponse(m_cSerializedBuffer);
  -    AXISTRACE1("flushSerializedBuffer1", 4);
  +	//sendSoapResponse(m_cSerializedBuffer);    
   	if (NULL != m_pOutputStream->transport.pSendFunct)
  -    {
  -        AXISTRACE1("flushSerializedBuffer2", 4);    
  +    {        
   		m_pOutputStream->transport.pSendFunct(m_cSerializedBuffer, m_pOutputStream->str.op_stream);
       }
       
  
  
  
  No                   revision
  No                   revision
  1.18.2.3  +9 -7      ws-axis/c/src/wsdd/WSDDDeployment.cpp
  
  Index: WSDDDeployment.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDeployment.cpp,v
  retrieving revision 1.18.2.2
  retrieving revision 1.18.2.3
  diff -u -r1.18.2.2 -r1.18.2.3
  --- WSDDDeployment.cpp	12 Dec 2003 13:47:20 -0000	1.18.2.2
  +++ WSDDDeployment.cpp	17 Dec 2003 05:56:56 -0000	1.18.2.3
  @@ -149,8 +149,10 @@
   	WSDDDocument doc;
   	if (AXIS_SUCCESS != doc.GetDeployment(sWSDD, this))
   	{
  +        printf("server.wsdd loading failed\n");
   		return AXIS_FAIL;
   	}
  +    printf("server.wsdd loading successful\n");
   	return AXIS_SUCCESS;
   }
   
  @@ -267,7 +269,7 @@
    */
   int WSDDDeployment::unDeploy(string sServiceName)
   {
  -	AXISTRACE3("entered to WSDDDeployment::unDeploy");
  + AXISTRACE3("entered to WSDDDeployment::unDeploy");
   
   	int iStatus = AXIS_FAIL;
   
  @@ -289,9 +291,9 @@
   		do {
   			file = fopen(m_sWSDDPath.c_str(), "w");
   			if(file) {
  -				AXISTRACE3("WSDDDeployment::unDeploy, opened the file successfully");
  +    AXISTRACE3("WSDDDeployment::unDeploy, opened the file successfully");
   			} else {
  -				AXISTRACE3("FAILED: WSDDDeployment::unDeploy, couldn't open the file successfully");
  +    AXISTRACE3("FAILED: WSDDDeployment::unDeploy, couldn't open the file successfully");
   				iWriteStatus = AXIS_FAIL;
   				break;
   			}
  @@ -300,20 +302,20 @@
   			
   			iWriteResult = fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", file);
   			if (iWriteResult<0) {
  -				AXISTRACE3("WSDDDeployment::unDeploy, writing to the file is UNSUCCESSFULL");
  +    AXISTRACE3("WSDDDeployment::unDeploy, writing to the file is UNSUCCESSFULL");
   				iWriteStatus = AXIS_FAIL;
   				break;
   			} else {
  -				AXISTRACE3("WSDDDeployment::unDeploy, writing to the file is SUCCESSFULL");
  +    AXISTRACE3("WSDDDeployment::unDeploy, writing to the file is SUCCESSFULL");
   			}
   
   			iWriteResult = fputs("<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" xmlns:java=\"http://xml.apache.org/axis/wsdd/providers/java\">\n",
file);
   			if (iWriteResult<0) {
  -				AXISTRACE3("WSDDDeployment::unDeploy, writing to the file is UNSUCCESSFULL");
  +    AXISTRACE3("WSDDDeployment::unDeploy, writing to the file is UNSUCCESSFULL");
   				iWriteStatus = AXIS_FAIL;
   				break;
   			} else {
  -				AXISTRACE3("WSDDDeployment::unDeploy, writing to the file is SUCCESSFULL");
  +    AXISTRACE3("WSDDDeployment::unDeploy, writing to the file is SUCCESSFULL");
   			}
   
   			if(m_DeployedServices)
  
  
  
  1.23.2.6  +2 -1      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.2.5
  retrieving revision 1.23.2.6
  diff -u -r1.23.2.5 -r1.23.2.6
  --- WSDDDocument.cpp	12 Dec 2003 13:47:20 -0000	1.23.2.5
  +++ WSDDDocument.cpp	17 Dec 2003 05:56:56 -0000	1.23.2.6
  @@ -65,7 +65,6 @@
   #include <axis/wsdd/WSDDDocument.h>
   #include <axis/wsdd/WSDDKeywords.h>
   #include <string>
  -#include <axis/common/AxisTrace.h>
   
   
   WSDDDocument::WSDDDocument()
  @@ -106,8 +105,10 @@
   	}
   	catch (...)
   	{
  +        printf("Document parsing failed\n");
   		return AXIS_FAIL;
   	}
  +    printf("Document parsing successful\n");
   	return AXIS_SUCCESS;
   }
   
  
  
  

Mime
View raw message