axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject cvs commit: xml-axis/c/src/wsdd WSDDDocument.cpp WSDDService.cpp
Date Thu, 04 Sep 2003 06:51:41 GMT
damitha     2003/09/03 23:51:41

  Modified:    c/src/common AxisException.cpp AxisException.h AxisTime.cpp
                        AxisTime.h Makefile.am
               c/src/engine Axis.cpp AxisEngine.cpp HandlerChain.cpp
                        HandlerLoader.cpp HandlerPool.cpp
               c/src/server/handlers/custom/loghandler LogAccessCount.cpp
                        LogHandler.cpp LogHandler.h
               c/src/server/handlers/custom/simpleauthhandler
                        SimpleAuth.cpp SimpleAuthorizationHandler.cpp
                        SimpleAuthorizationHandler.h
               c/src/server/handlers/global/testhandler1 TestGlobal.cpp
                        TestGlobal.h TestHandler1.cpp
               c/src/server/handlers/transport/testhandler2
                        TestHandler2.cpp TestTransport.cpp TestTransport.h
               c/src/soap XMLStreamHandler.cpp
               c/src/wsdd WSDDDocument.cpp WSDDService.cpp
  Added:       c/src/common AxisTrace.cpp AxisTrace.h
  Removed:     c/src/common Debug.cpp Debug.h
  Log:
  log:To trace debugging messages we have a class called Debug. As this is name is not appropriate
  to use I changed it to AxisTrace. So I modified the above files appropriately.
  
  Revision  Changes    Path
  1.5       +1 -1      xml-axis/c/src/common/AxisException.cpp
  
  Index: AxisException.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/common/AxisException.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AxisException.cpp	27 Aug 2003 12:16:34 -0000	1.4
  +++ AxisException.cpp	4 Sep 2003 06:51:39 -0000	1.5
  @@ -55,7 +55,7 @@
    *
    *
    *
  - * @author  Damitha Kumarage (damitha@opensource.lk)
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
    *
    */
   
  
  
  
  1.6       +1 -1      xml-axis/c/src/common/AxisException.h
  
  Index: AxisException.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/common/AxisException.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AxisException.h	27 Aug 2003 12:16:34 -0000	1.5
  +++ AxisException.h	4 Sep 2003 06:51:39 -0000	1.6
  @@ -55,7 +55,7 @@
    *
    *
    *
  - * @author Damitha Kumarage (damitha@opensource.lk)
  + * @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
    *
    */
   
  
  
  
  1.3       +62 -0     xml-axis/c/src/common/AxisTime.cpp
  
  Index: AxisTime.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/common/AxisTime.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AxisTime.cpp	1 Sep 2003 14:33:27 -0000	1.2
  +++ AxisTime.cpp	4 Sep 2003 06:51:39 -0000	1.3
  @@ -1,3 +1,63 @@
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
   #include "AxisTime.h"
   #include "AxisUtils.h"
   
  @@ -262,9 +322,11 @@
                   }
                   else if(strZone.substr(0,1) == L"-")
                   {
  +
                       timeInSecs -= intSecs;
   					pTm = localtime(&timeInSecs);
   					memcpy(&m_TM, pTm, sizeof(tm));
  +
                       time_t t = mktime(&m_TM);
                       t = abs(t - d);
   					pTm = gmtime(&t);
  
  
  
  1.2       +60 -0     xml-axis/c/src/common/AxisTime.h
  
  Index: AxisTime.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/common/AxisTime.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AxisTime.h	1 Sep 2003 13:43:31 -0000	1.1
  +++ AxisTime.h	4 Sep 2003 06:51:39 -0000	1.2
  @@ -1,3 +1,63 @@
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
   #ifndef __AXISTIME_H_INCLUDED_
   #define __AXISTIME_H_INCLUDED_
   
  
  
  
  1.4       +1 -1      xml-axis/c/src/common/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/common/Makefile.am,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.am	1 Sep 2003 13:43:31 -0000	1.3
  +++ Makefile.am	4 Sep 2003 06:51:39 -0000	1.4
  @@ -1,6 +1,6 @@
   noinst_LTLIBRARIES = libcommon.la
   
  -libcommon_la_SOURCES = Param.cpp TypeMapping.cpp Packet.cpp MessageData.cpp Debug.cpp \
  +libcommon_la_SOURCES = Param.cpp TypeMapping.cpp Packet.cpp MessageData.cpp AxisTrace.cpp \
    BasicTypeSerializer.cpp AxisException.cpp ArrayBean.cpp AccessBean.cpp AxisTime.cpp \
    GDefine.cpp AxisUtils.cpp
   
  
  
  
  1.1                  xml-axis/c/src/common/AxisTrace.cpp
  
  Index: AxisTrace.cpp
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "SOAP" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   *
   *
   *
   * @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
   *
   */
  
  #include "AxisTrace.h"
  #include <time.h>
  
  using namespace std;
  
  
  AxisTrace::AxisTrace()
  {
    //sFileName = "E:\\Program Files\\Apache Group\\Apache\\Axis\\logs\\Debug.txt";
    sFileName = TRACE_PATH;
    if(!sFileName.empty())
    {
      FileName = sFileName.c_str();
      fout = new ofstream(FileName,ios::app);  // open for writing
    }
  }
  
  AxisTrace::~AxisTrace()
  {
    fout->close();
    delete fout;
  }
  
  int AxisTrace::trace(const string &sLog,string arg2, int arg3)
  {
    if(fout)
    {
      time_t ltime;
      time(&ltime);
      //*fout << "time:" << ctime(&ltime) << ":" << sLog.c_str() << endl;
      *fout << "time:" << ctime(&ltime)
      << " :file:"<< arg2 << " :line:" << arg3 << ":" << endl
      << sLog.c_str() << endl
      << "-------------------------------------------------" << endl;
      //sprintf((char*)chEBuf,sLog.c_str());
      return SUCCESS;
    }
    else
    {
      return FAIL;
    }
  }
  
  int AxisTrace::trace(const string &sLog1, const string &sLog2,string arg3, int arg4)
  {
    if(fout)
    {
      time_t ltime;
      time(&ltime);
      //*fout << "time:" << ctime(&ltime) << ":" << sLog1.c_str() << " " << sLog2.c_str() << endl;
      *fout << "time:" << ctime(&ltime)
      << " :file:"<< arg3 << " :line:" << arg4 << endl
      << sLog1.c_str() << " " << sLog2.c_str() << endl
      << "-------------------------------------------------" << endl;
      //sprintf((char*)chEBuf,sLog1.c_str(), sLog2.c_str());
      return SUCCESS;
    }
    else
    {
      return FAIL;
    }
  }
  
  /*
  int main(int argc, char* argv[])
  {
    tracer.trace("damitha");
    return 0;
  }
  */
  
  
  1.1                  xml-axis/c/src/common/AxisTrace.h
  
  Index: AxisTrace.h
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "SOAP" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   *
   *
   *
   * @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
   *
   */
  
  #ifndef __AXISLOG_H_INCLUDED_
  #define __AXISLOG_H_INCLUDED_
  
  #include "GDefine.h"
  #include <list>
  #include <string>
  #include <fstream>
  
  #ifdef WIN32
      #define TRACE_PATH "E:\\Program Files\\Apache Group\\Apache\\Axis\\logs\\Debug.txt";
  #else //linux
      #define TRACE_PATH "/usr/local/axiscpp/axis/AxisLog";
  #endif
  
  //#define AXISTRACE
  #if defined(AXISTRACE)
    #define AXISTRACE1(X) tracer.trace(X,__FILE__,__LINE__);
    #define AXISTRACE2(X,Y) tracer.trace(X,Y,__FILE__,__LINE__);
  #endif
  #if !defined(AXISTRACE)
    #define AXISTRACE1(X) "";
    #define AXISTRACE2(X,Y) "";
  #endif
  
  //extern unsigned char chEBuf[1024];
  using namespace std;
  class AxisTrace
  {
  public:
  	AxisTrace();
  	virtual ~AxisTrace();
    string sFileName;
    const char * FileName;
    ofstream* fout;
  
    int trace(const string &sLog, string arg2, int arg3);
    int trace(const string &sLog1, const string &sLog2, string arg3, int arg4);
  
  };
  
  static AxisTrace tracer;
  
  #endif
  
  
  1.14      +7 -7      xml-axis/c/src/engine/Axis.cpp
  
  Index: Axis.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/engine/Axis.cpp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Axis.cpp	2 Sep 2003 12:03:49 -0000	1.13
  +++ Axis.cpp	4 Sep 2003 06:51:40 -0000	1.14
  @@ -68,7 +68,7 @@
   #endif
   
   #include "AxisEngine.h"
  -#include "../common/Debug.h"
  +#include "../common/AxisTrace.h"
   #include <stdio.h>
   #include <stdlib.h>
   #include <malloc.h>
  @@ -106,7 +106,7 @@
   #endif
   
   //define all global variables of the axisengine
  -#ifdef _DEBUG
  +#ifdef _AXISTRACE
   unsigned char chEBuf[1024];
   #endif
   
  @@ -123,7 +123,7 @@
   
   extern "C" int process_request(Ax_soapstream *str)
   {
  -	DEBUG1("in axis.cpp");	
  +	AXISTRACE1("in axis.cpp");	
   	int Status = FAIL;
   	FILE * WsddFile;
   	char ReadBuffer[BYTESTOREAD];
  @@ -139,13 +139,13 @@
   			//Handle the POST method
   			if (str->so.http.ip_method == AXIS_HTTP_POST)
   			{
  -				DEBUG1("method is POST");
  +				AXISTRACE1("method is POST");
   				AxisEngine* engine = new AxisEngine();	
   				if (engine)
   				{
   					Status = engine->Process(str);
  -					DEBUG1("Status = engine->Process(str);");
  -				    DEBUG1("are we successful?");            
  +					AXISTRACE1("Status = engine->Process(str);");
  +				    AXISTRACE1("are we successful?");            
   					Status = SUCCESS;
   					delete engine;
   				}
  @@ -230,7 +230,7 @@
   extern "C" int initialize_module()
   {
   	//order of these initialization method invocation should not be changed
  -	DEBUG1("inside initialize_module\n");
  +	AXISTRACE1("inside initialize_module\n");
   	SoapKeywordMapping::Initialize();
   	TypeMapping::Initialize();
   	URIMapping::Initialize();
  
  
  
  1.19      +12 -12    xml-axis/c/src/engine/AxisEngine.cpp
  
  Index: AxisEngine.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/engine/AxisEngine.cpp,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- AxisEngine.cpp	1 Sep 2003 07:28:28 -0000	1.18
  +++ AxisEngine.cpp	4 Sep 2003 06:51:40 -0000	1.19
  @@ -64,7 +64,7 @@
   #include <stdio.h>
   #include "AxisEngine.h"
   #include "../common/AxisException.h"
  -#include "../common/Debug.h"
  +#include "../common/AxisTrace.h"
   #include "../common/Packet.h"
   #include "../common/AxisUtils.h"
   #include "../wsdd/WSDDDeployment.h"
  @@ -100,7 +100,7 @@
   {
   	int Status;
   	AXIS_TRY
  -		DEBUG1("AxisEngine::Process");
  +		AXISTRACE1("AxisEngine::Process");
   		MessageData* pMsg = NULL;
   		const WSDDService* pService = NULL;
   		string sSessionId = soap->sessionid;
  @@ -138,7 +138,7 @@
   			AxisString service;
   			AxisUtils::convert(service, (cService == NULL)? "" : cService);
   		  
  -			DEBUG2("string service = ",service.c_str());
  +			AXISTRACE2("string service = ",service.c_str());
        
   			if (service.empty()) 
   			{
  @@ -188,7 +188,7 @@
   			if (pSm) 
   			{
   				AxisString method = pSm->getMethodName();
  -				DEBUG2("pSm->getMethodName(); :", method.c_str());
  +				AXISTRACE2("pSm->getMethodName(); :", method.c_str());
   				if (!method.empty())
   				{
   					if (pService->IsAllowedMethod(method))
  @@ -259,8 +259,8 @@
   		from the webserver and report the error. You can also write this
   		in a logfile specific to axis.
   		*/
  -		#ifdef _DEBUG
  -		DEBUG1(e->what());   
  +		#ifdef _AXISTRACE
  +		AXISTRACE1(e->what());   
   		delete(e);
   		#endif
   	AXIS_CATCH(...)
  @@ -271,7 +271,7 @@
   		from the webserver and report the error. You can also write this
   		in a logfile specific to axis.
   		*/
  -		DEBUG1("UNKNOWN EXCEPTION");
  +		AXISTRACE1("UNKNOWN EXCEPTION");
   	AXIS_ENDCATCH
   	return Status;
   }
  @@ -292,7 +292,7 @@
   			}
   
   		}
  -		DEBUG1("AFTER invoke transport request handlers");
  +		AXISTRACE1("AFTER invoke transport request handlers");
   		level++; // AE_TRH
   		//invoke global request handlers
   		if (m_pGReqFChain)
  @@ -303,7 +303,7 @@
   				break; //do .. while (0)
   			}		
   		}
  -		DEBUG1("AFTER invoke global request handlers");
  +        AXISTRACE1("AFTER invoke global request handlers");
   		level++; //AE_GLH
   		//invoke service specific request handlers
   		if (m_pSReqFChain)
  @@ -314,7 +314,7 @@
   				break; //do .. while (0)
   			}
   		}
  -		DEBUG1("AFTER invoke service specific request handlers");
  +		AXISTRACE1("AFTER invoke service specific request handlers");
   		level++; //AE_SERH
   		//call actual web service handler
   		if (m_pWebService)
  @@ -325,7 +325,7 @@
   				break;
   			}        
   		}
  -		DEBUG1("AFTER call actual web service handler");
  +		AXISTRACE1("AFTER call actual web service handler");
   		level++; //AE_SERV
   	}
   	while(0);
  @@ -359,7 +359,7 @@
   		//no break;
   	case AE_START:;//transport handlers have failed
   	};
  -	DEBUG1("end axisengine process()");
  +	AXISTRACE1("end axisengine process()");
   	return Status;
   }
   
  
  
  
  1.6       +3 -3      xml-axis/c/src/engine/HandlerChain.cpp
  
  Index: HandlerChain.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/engine/HandlerChain.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HandlerChain.cpp	13 Aug 2003 14:07:47 -0000	1.5
  +++ HandlerChain.cpp	4 Sep 2003 06:51:40 -0000	1.6
  @@ -66,7 +66,7 @@
   //////////////////////////////////////////////////////////////////////
   
   #include "HandlerChain.h"
  -#include "../common/Debug.h"
  +#include "../common/AxisTrace.h"
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  @@ -84,7 +84,7 @@
   
   int HandlerChain::Invoke(IMessageData* pMsg)
   {
  -	DEBUG1("HandlerChain::Invoke(IMessageData* pMsg)");
  +	AXISTRACE1("HandlerChain::Invoke(IMessageData* pMsg)");
   	m_itCurrHandler = m_HandlerList.begin();
   	while (m_itCurrHandler != m_HandlerList.end())
   	{
  @@ -98,7 +98,7 @@
   			return FAIL;
   		}
   	}
  -	DEBUG1("HandlerChain::Invoke end");
  +	AXISTRACE1("HandlerChain::Invoke end");
   	return SUCCESS;
   }
   
  
  
  
  1.9       +4 -4      xml-axis/c/src/engine/HandlerLoader.cpp
  
  Index: HandlerLoader.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/engine/HandlerLoader.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HandlerLoader.cpp	1 Sep 2003 13:44:39 -0000	1.8
  +++ HandlerLoader.cpp	4 Sep 2003 06:51:40 -0000	1.9
  @@ -63,7 +63,7 @@
   
   #include "HandlerLoader.h"
   #include <stdio.h>
  -#include "../common/Debug.h"
  +#include "../common/AxisTrace.h"
   #include "../common/AxisUtils.h"
   #include "../wsdd/WSDDDeployment.h"
   
  @@ -108,12 +108,12 @@
   
   int HandlerLoader::LoadLib(HandlerInformation* pHandlerInfo)
   {
  -	DEBUG2("in HandlerLoader::LoadLib(), Lib is :", pHandlerInfo->m_sLib.c_str());
  +	AXISTRACE2("in HandlerLoader::LoadLib(), Lib is :", pHandlerInfo->m_sLib.c_str());
   #ifdef WIN32
   	pHandlerInfo->m_Handler = LoadLibrary(pHandlerInfo->m_sLib.c_str());
   #else //Linux
   	pHandlerInfo->m_Handler = dlopen(pHandlerInfo->m_sLib.c_str(), pHandlerInfo->m_nLoadOptions);
  -	DEBUG1("after m_Handler = dlopen(pHandlerInfo->m_sLib.c_str(), pHandlerInfo->m_nLoadOptions);");  
  +	AXISTRACE1("after m_Handler = dlopen(pHandlerInfo->m_sLib.c_str(), pHandlerInfo->m_nLoadOptions);");  
   #endif
   	return (pHandlerInfo->m_Handler != 0)?SUCCESS:FAIL;
   }
  @@ -130,7 +130,7 @@
   
   int HandlerLoader::CreateHandler(BasicHandler** pHandler, int nLibId)
   {
  -	DEBUG1("inside CreateHandler\n");
  +	AXISTRACE1("inside CreateHandler\n");
   	lock();
   	*pHandler = NULL;
   	HandlerInformation* pHandlerInfo = NULL;
  
  
  
  1.10      +1 -1      xml-axis/c/src/engine/HandlerPool.cpp
  
  Index: HandlerPool.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/engine/HandlerPool.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- HandlerPool.cpp	27 Aug 2003 12:16:34 -0000	1.9
  +++ HandlerPool.cpp	4 Sep 2003 06:51:40 -0000	1.10
  @@ -73,7 +73,7 @@
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
   //////////////////////////////////////////////////////////////////////
  -#include "../common/Debug.h"
  +#include "../common/AxisTrace.h"
   
   extern AppScopeHandlerPool* g_pAppScopeHandlerPool;
   extern RequestScopeHandlerPool* g_pRequestScopeHandlerPool;
  
  
  
  1.2       +60 -0     xml-axis/c/src/server/handlers/custom/loghandler/LogAccessCount.cpp
  
  Index: LogAccessCount.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/custom/loghandler/LogAccessCount.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LogAccessCount.cpp	7 Jul 2003 13:30:05 -0000	1.1
  +++ LogAccessCount.cpp	4 Sep 2003 06:51:40 -0000	1.2
  @@ -1,3 +1,63 @@
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
   #ifdef WIN32
   #define STORAGE_CLASS_INFO __declspec(dllexport)
   #else
  
  
  
  1.4       +64 -9     xml-axis/c/src/server/handlers/custom/loghandler/LogHandler.cpp
  
  Index: LogHandler.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/custom/loghandler/LogHandler.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LogHandler.cpp	15 Aug 2003 04:31:26 -0000	1.3
  +++ LogHandler.cpp	4 Sep 2003 06:51:40 -0000	1.4
  @@ -1,18 +1,73 @@
  -//////////////////////////////////////////////////////////////////////
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
   
   #include "LogHandler.h"
   #include "../../../../soap/SoapDeSerializer.h"
   #include "../../../../soap/SoapSerializer.h"
   #include <fstream>
   #include <string>
  -#include "../../../../common/Debug.h"
  +#include "../../../../common/AxisTrace.h"
   
   using namespace std;
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
  -
   LogHandler::LogHandler()
   {
     m_Option = new map<string, string>;
  @@ -29,7 +84,7 @@
   int LogHandler::Invoke(IMessageData* md)
   {
     AXIS_TRY
  -    DEBUG1("LogHandler::Invoke(IMessageData* md)");
  +    AXISTRACE1("LogHandler::Invoke(IMessageData* md)");
   
       m_iNumAccess = 0;
       string sNumAccess = "";
  @@ -39,7 +94,7 @@
       if(!sFileName.empty())
       {
   
  -      DEBUG1("if(!sFileName.empty())");
  +      AXISTRACE1("if(!sFileName.empty())");
   
         ifstream fin(sFileName.c_str());    // open for reading
          char ch;
  @@ -65,7 +120,7 @@
         const char * FileName = sFileName.c_str();
         ofstream fout(FileName);  // open for writing
         fout << m_iNumAccess;
  -      DEBUG1("LogHandler Invoke end");
  +      AXISTRACE1("LogHandler Invoke end");
         fin.close();
         fout.close();
         return SUCCESS;
  
  
  
  1.3       +61 -0     xml-axis/c/src/server/handlers/custom/loghandler/LogHandler.h
  
  Index: LogHandler.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/custom/loghandler/LogHandler.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LogHandler.h	17 Jul 2003 07:04:44 -0000	1.2
  +++ LogHandler.h	4 Sep 2003 06:51:40 -0000	1.3
  @@ -1,3 +1,64 @@
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
  +
   #include "../../../../common/IMessageData.h"
   #include "../../../../wsdd/WSDDHandler.h"
   #include "../../../../wsdd/WSDDService.h"
  
  
  
  1.2       +60 -0     xml-axis/c/src/server/handlers/custom/simpleauthhandler/SimpleAuth.cpp
  
  Index: SimpleAuth.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/custom/simpleauthhandler/SimpleAuth.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SimpleAuth.cpp	7 Jul 2003 13:30:05 -0000	1.1
  +++ SimpleAuth.cpp	4 Sep 2003 06:51:40 -0000	1.2
  @@ -1,3 +1,63 @@
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
   #ifdef WIN32
   #define STORAGE_CLASS_INFO __declspec(dllexport)
   #else
  
  
  
  1.3       +69 -14    xml-axis/c/src/server/handlers/custom/simpleauthhandler/SimpleAuthorizationHandler.cpp
  
  Index: SimpleAuthorizationHandler.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/custom/simpleauthhandler/SimpleAuthorizationHandler.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleAuthorizationHandler.cpp	17 Jul 2003 07:16:10 -0000	1.2
  +++ SimpleAuthorizationHandler.cpp	4 Sep 2003 06:51:40 -0000	1.3
  @@ -1,4 +1,63 @@
  -//////////////////////////////////////////////////////////////////////
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
   
   #include "SimpleAuthorizationHandler.h"
   #include "../../../../soap/SoapDeSerializer.h"
  @@ -6,13 +65,9 @@
   #include <string.h>
   #include <fstream>
   #include <string>
  -#include "../../../../common/Debug.h"
  +#include "../../../../common/AxisTrace.h"
   #include "../../../../common/MessageData.h"
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
  -
   SimpleAuthorizationHandler::SimpleAuthorizationHandler()
   {
   
  @@ -27,20 +82,20 @@
   {
     try
     {
  -    DEBUG1("SimpleAuthorizationHandler::Invoke(IMessageData* md)");
  +    AXISTRACE1("SimpleAuthorizationHandler::Invoke(IMessageData* md)");
       string sValue = GetOption("AllowByDefault");
  -    DEBUG2("sValue :", sValue);
  +    AXISTRACE2("sValue :", sValue);
       int intIsAllowed =   atoi(sValue.c_str());    
       if(0 == intIsAllowed)
       {
         return SUCCESS;
       }
       m_sAuthUser = md->GetUserName();
  -    DEBUG2("m_sAuthUser:",m_sAuthUser);
  +    AXISTRACE2("m_sAuthUser:",m_sAuthUser);
       if(!m_sAuthUser.empty())
       {    
         string sAllowedRolesFileName = GetOption("AllowedRoles");
  -      DEBUG2("sAllowedRolesFileName:",sAllowedRolesFileName);
  +      AXISTRACE2("sAllowedRolesFileName:",sAllowedRolesFileName);
         ifstream fin(sAllowedRolesFileName.c_str());    // open for reading
         string sLine = "";
         char buff[512];
  @@ -49,21 +104,21 @@
           fin.getline(buff, 512);
           sLine = buff;
           m_AllowedRoles.push_back(sLine);
  -        DEBUG2("line read is:", sLine);
  +        AXISTRACE2("line read is:", sLine);
         }
          
         m_itCurrentRole = m_AllowedRoles.begin();
   	    while (m_itCurrentRole != m_AllowedRoles.end())
   	    {
  -        DEBUG2("(*m_itCurrentRole).c_str()", (*m_itCurrentRole).c_str());
  +        AXISTRACE2("(*m_itCurrentRole).c_str()", (*m_itCurrentRole).c_str());
           if(strcmp(m_sAuthUser.c_str(),(*m_itCurrentRole).c_str()) == 0)
           {
  -          DEBUG1("if(strcmp(m_sAuthUser.c_str(),(*m_itCurrentRole).c_str()) == 0)");
  +          AXISTRACE1("if(strcmp(m_sAuthUser.c_str(),(*m_itCurrentRole).c_str()) == 0)");
             return SUCCESS;
           }
   			  m_itCurrentRole++;
         }
  -      DEBUG1("SimpleAuthorizationHandler invoke end");
  +      AXISTRACE1("SimpleAuthorizationHandler invoke end");
         fin.close();      
       }
       else
  
  
  
  1.3       +60 -0     xml-axis/c/src/server/handlers/custom/simpleauthhandler/SimpleAuthorizationHandler.h
  
  Index: SimpleAuthorizationHandler.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/custom/simpleauthhandler/SimpleAuthorizationHandler.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleAuthorizationHandler.h	17 Jul 2003 07:16:10 -0000	1.2
  +++ SimpleAuthorizationHandler.h	4 Sep 2003 06:51:40 -0000	1.3
  @@ -1,3 +1,63 @@
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
   #include "../../../../common/IMessageData.h"
   #include "../../../../wsdd/WSDDHandler.h"
   #include "../../../../wsdd/WSDDService.h"
  
  
  
  1.5       +64 -14    xml-axis/c/src/server/handlers/global/testhandler1/TestGlobal.cpp
  
  Index: TestGlobal.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/global/testhandler1/TestGlobal.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestGlobal.cpp	15 Aug 2003 07:17:34 -0000	1.4
  +++ TestGlobal.cpp	4 Sep 2003 06:51:40 -0000	1.5
  @@ -1,19 +1,73 @@
  -//////////////////////////////////////////////////////////////////////
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
  +
   
   #include "TestGlobal.h"
   #include <fstream>
   //#include <string>
  -#if defined(_DEBUG)
  -#include "../../../../common/Debug.h"
  -#endif
  +#include "../../../../common/AxisTrace.h"
   #include "../../../../common/AxisException.h"
   
   //using namespace std;
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
  -
   TestGlobal::TestGlobal()
   {
     m_Option = new map<string, string>;
  @@ -31,16 +85,12 @@
   {
   
     AXIS_TRY
  -	#if defined(_DEBUG)
  -		DEBUG1("Hi, you successfully invoked TestGlobal handler");
  -	#endif
  +		AXISTRACE1("Hi, you successfully invoked TestGlobal handler");
   
       return SUCCESS;
   
     AXIS_CATCH(...)
  -		#if defined(_DEBUG)
  -		DEBUG1("inside catch block");
  -		#endif
  +		AXISTRACE1("inside catch block");
   
   		return FAIL;
     AXIS_ENDCATCH
  
  
  
  1.4       +61 -0     xml-axis/c/src/server/handlers/global/testhandler1/TestGlobal.h
  
  Index: TestGlobal.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/global/testhandler1/TestGlobal.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestGlobal.h	15 Aug 2003 07:17:34 -0000	1.3
  +++ TestGlobal.h	4 Sep 2003 06:51:40 -0000	1.4
  @@ -1,3 +1,64 @@
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
  +
   #if !defined(TESTGLOBAL_H__INCLUDED_)
   #define TESTGLOBAL_H__INCLUDED_
   
  
  
  
  1.3       +60 -0     xml-axis/c/src/server/handlers/global/testhandler1/TestHandler1.cpp
  
  Index: TestHandler1.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/global/testhandler1/TestHandler1.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestHandler1.cpp	15 Aug 2003 07:17:34 -0000	1.2
  +++ TestHandler1.cpp	4 Sep 2003 06:51:40 -0000	1.3
  @@ -1,3 +1,63 @@
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
   #ifdef WIN32
   #define STORAGE_CLASS_INFO __declspec(dllexport)
   #else
  
  
  
  1.2       +60 -0     xml-axis/c/src/server/handlers/transport/testhandler2/TestHandler2.cpp
  
  Index: TestHandler2.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/transport/testhandler2/TestHandler2.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestHandler2.cpp	7 Jul 2003 13:30:10 -0000	1.1
  +++ TestHandler2.cpp	4 Sep 2003 06:51:40 -0000	1.2
  @@ -1,3 +1,63 @@
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
   #ifdef WIN32
   #define STORAGE_CLASS_INFO __declspec(dllexport)
   #else
  
  
  
  1.4       +63 -7     xml-axis/c/src/server/handlers/transport/testhandler2/TestTransport.cpp
  
  Index: TestTransport.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/transport/testhandler2/TestTransport.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestTransport.cpp	15 Aug 2003 04:31:26 -0000	1.3
  +++ TestTransport.cpp	4 Sep 2003 06:51:41 -0000	1.4
  @@ -1,18 +1,74 @@
  -//////////////////////////////////////////////////////////////////////
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
  +
   
   #include "TestTransport.h"
   #include "../../../../soap/SoapDeSerializer.h"
   #include "../../../../soap/SoapSerializer.h"
   #include <fstream>
   #include <string>
  -#include "../../../../common/Debug.h"
  +#include "../../../../common/AxisTrace.h"
   
   using namespace std;
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
  -
   TestTransport::TestTransport()
   {
     m_Option = new map<string, string>;
  @@ -29,7 +85,7 @@
   int TestTransport::Invoke(IMessageData* md)
   {
     AXIS_TRY
  -    DEBUG1("Hi, you have successfully invoked the TestTransport handler");
  +    AXISTRACE1("Hi, you have successfully invoked the TestTransport handler");
       return SUCCESS;
     AXIS_CATCH(...)
   		return FAIL;
  
  
  
  1.3       +60 -0     xml-axis/c/src/server/handlers/transport/testhandler2/TestTransport.h
  
  Index: TestTransport.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/server/handlers/transport/testhandler2/TestTransport.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestTransport.h	17 Jul 2003 07:01:05 -0000	1.2
  +++ TestTransport.h	4 Sep 2003 06:51:41 -0000	1.3
  @@ -1,3 +1,63 @@
  +/*
  + * The Apache Software License, Version 1.1
  + *
  + *
  + * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "SOAP" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + *
  + *
  + *
  + * @author  Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
  + *
  + */
   #include "../../../../common/IMessageData.h"
   #include "../../../../wsdd/WSDDHandler.h"
   #include "../../../../wsdd/WSDDService.h"
  
  
  
  1.10      +31 -31    xml-axis/c/src/soap/XMLStreamHandler.cpp
  
  Index: XMLStreamHandler.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/soap/XMLStreamHandler.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XMLStreamHandler.cpp	2 Sep 2003 12:03:49 -0000	1.9
  +++ XMLStreamHandler.cpp	4 Sep 2003 06:51:41 -0000	1.10
  @@ -114,7 +114,7 @@
   	switch (m_PL0)
   	{
   	case SOAP_UNKNOWN:
  -	if(0 == wcscmp(localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_ENVELOPE]))
  +	if(0 == wcscmp((wchar_t*) localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_ENVELOPE]))
   	{
   		m_PL0 = SOAP_ENVELOP;
   		m_pEnv = new SoapEnvelope();
  @@ -123,21 +123,21 @@
   	}
   	break;
   	case SOAP_ENVELOP:
  -	if(0 == wcscmp(localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_BODY]))
  +	if(0 == wcscmp((wchar_t*) localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_BODY]))
   	{
   		m_PL0 = SOAP_BODY;
   		m_pBody = new SoapBody();
   		//set all attributes of SoapBody
   		FillBody(uri,localname,qname,attrs);	
   	}
  -	else if (0 == wcscmp(localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_HEADER]))
  +	else if (0 == wcscmp((wchar_t*) localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_HEADER]))
   	{
   		m_PL0 = SOAP_HEADER;
   		m_pHead = new SoapHeader();
   		//set all attributes of SoapHeader
   		FillHeader(uri,localname,qname,attrs);
   	}
  -	else if (0 == wcscmp(localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_FAULT]))
  +	else if (0 == wcscmp((wchar_t*) localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_FAULT]))
   	{
   		//m_PL0 = SOAP_FAULT;
   		//m_pFault = SoapFault::getSoapFault(1);
  @@ -160,9 +160,9 @@
   		switch (m_PL1)
   		{
   		case SOAP_UNKNOWN:
  -			if (0 == wcscmp(localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_MULTIREF]))
  +			if (0 == wcscmp((wchar_t*) localname,SoapKeywordMapping::Map(m_nSoapVersion).pchWords[SKW_MULTIREF]))
   			{
  -				m_sLastElement = localname;
  +				m_sLastElement = (wchar_t*) localname;
   				SetParamType(attrs); 
   				m_PL1 = SOAP_PARAM;
   			}
  @@ -176,18 +176,18 @@
   		case SOAP_METHOD: //now comes parameters
   			//Get Param name and type
   			//m_Param.m_sName = localname;
  -			m_sLastElement = localname;
  +			m_sLastElement = (wchar_t*) localname;
   			SetParamType(attrs); 
   			m_PL1 = SOAP_PARAM;
   			m_nParamNestingLevel++;
   			break;
   		case SOAP_PARAM: //Custom types
  -			if (m_sLastElement != localname)
  +			if (m_sLastElement != (wchar_t*) localname)
   			{
   				m_Params.push_back(new Param(m_Param)); //parent param
   			}
   			//m_Param.m_sName = localname;
  -			m_sLastElement = localname;
  +			m_sLastElement = (wchar_t*) localname;
   			SetParamType(attrs); 
   			m_nParamNestingLevel++;
   			break;
  @@ -216,7 +216,7 @@
   		break;
   	case SOAP_PARAM: //end of a parameter
   		//Add parameter to list
  -		if (m_sLastElement == localname)
  +		if (m_sLastElement == (wchar_t*) localname)
   		{
   			m_Params.push_back(new Param(m_Param)); //current param
   		}
  @@ -239,23 +239,23 @@
   	if ((m_PL0 == SOAP_BODY) && (m_PL1 == SOAP_PARAM)) //Make this a switch statement if many cases to be handled
   	{
   		//Get value of the parameter
  -		m_Param.SetValue(chars);
  +		m_Param.SetValue((wchar_t*) chars);
   	} else if ((m_PL0 == SOAP_HEADER) && (m_PL1 == SOAP_HEADER_BLOCK)) 
   	{
   		//Get the value of the header entry
  -		CharacterElement* pCharacterElement= new CharacterElement(chars);
  +		CharacterElement* pCharacterElement= new CharacterElement((wchar_t*) chars);
   		m_pHeaderBlock->addChild(pCharacterElement);
   	}
   }
   
   void XMLStreamHandler::startPrefixMapping(const XMLCh* const prefix, const XMLCh* const uri)
   {
  -	m_NsStack[prefix] = uri; //I think the same prifix cannot repeat ???
  +	m_NsStack[(wchar_t*) prefix] = (wchar_t*) uri; //I think the same prifix cannot repeat ???
   }
   
   void XMLStreamHandler::endPrefixMapping(const XMLCh* const prefix)
   {
  -	m_NsStack.erase(prefix); //I think the same prifix cannot repeat ???
  +	m_NsStack.erase((wchar_t*) prefix); //I think the same prifix cannot repeat ???
   }
   
   void XMLStreamHandler::warning(const SAXParseException& exception)
  @@ -284,9 +284,9 @@
   	m_Param.m_Type = XSD_UNKNOWN; 
   	for (int i = 0; i < attrs.getLength(); i++) 
   	{
  -		const AxisChar* URI = attrs.getURI(i); 
  -		const AxisChar* local = attrs.getLocalName(i);
  -		AxisString value = attrs.getValue(i);
  +		const AxisChar* URI = (wchar_t*) attrs.getURI(i); 
  +		const AxisChar* local = (wchar_t*) attrs.getLocalName(i);
  +		AxisString value = (wchar_t*) attrs.getValue(i);
   		URITYPE urit = URIMapping::Map(URI);
   		switch (urit)
   		{
  @@ -466,7 +466,7 @@
   {
   	AxisString str;
   	Attribute* pAttr;
  -	str = qname;
  +	str = (wchar_t*) qname;
   	pAttr = new Attribute();
   	if (str.find(L':') != AxisString::npos) 
   	{
  @@ -474,14 +474,14 @@
   		m_pEnv->setPrefix(str.c_str());
   		pAttr->setPrefix(str.c_str());
   	}
  -	pAttr->setValue(uri);
  +	pAttr->setValue((wchar_t*) uri);
   	m_pEnv->addNamespaceDecl(pAttr);
   
  -	if (0 == wcscmp(uri, SoapKeywordMapping::Map(SOAP_VER_1_1).pchNamespaceUri))
  +	if (0 == wcscmp((wchar_t*) uri, SoapKeywordMapping::Map(SOAP_VER_1_1).pchNamespaceUri))
   	{
   		m_nSoapVersion = SOAP_VER_1_1;
   	}
  -	else if (0 == wcscmp(uri, SoapKeywordMapping::Map(SOAP_VER_1_2).pchNamespaceUri))
  +	else if (0 == wcscmp((wchar_t*) uri, SoapKeywordMapping::Map(SOAP_VER_1_2).pchNamespaceUri))
   	{
   		m_nSoapVersion = SOAP_VER_1_2;
   	}
  @@ -495,10 +495,10 @@
   	for (unsigned int ix=0;ix<nAttrs;ix++)
   	{
   		pAttr = new Attribute();
  -		pAttr->setPrefix(attrs.getQName(ix));
  -		pAttr->setValue(attrs.getValue(ix));
  -		pAttr->setLocalName(attrs.getLocalName(ix));
  -		pAttr->setUri(attrs.getURI(ix));
  +		pAttr->setPrefix((wchar_t*) attrs.getQName(ix));
  +		pAttr->setValue((wchar_t*) attrs.getValue(ix));
  +		pAttr->setLocalName((wchar_t*) attrs.getLocalName(ix));
  +		pAttr->setUri((wchar_t*) attrs.getURI(ix));
   		m_pEnv->addAttribute(pAttr);	
   	}
   }
  @@ -520,15 +520,15 @@
   
   void XMLStreamHandler::FillMethod(const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname, const Attributes &attrs)
   {
  -	AxisString str = qname;
  +	AxisString str = (wchar_t*) qname;
   	if (str.find(':') != AxisString::npos) 
   	{
   		str = str.substr(0, str.find(L':'));
   		m_pMethod->setPrefix(str.c_str());
  -		str = uri;
  +		str = (wchar_t*) uri;
   		m_pMethod->setUri(str.c_str());
   	}
  -	str = localname;
  +	str = (wchar_t*) localname;
   	m_pMethod->setLocalName(str.c_str());
   /*
   	//Set Attributes
  @@ -566,12 +566,12 @@
   {
   	m_pHeaderBlock= new HeaderBlock();
   	AxisString str;	
  -	str = qname;
  +	str = (wchar_t*) qname;
   	if (str.find(L':') != AxisString::npos) 
   	{
   		str = str.substr(0, str.find(L':'));
   		m_pHeaderBlock->setPrefix(str.c_str());		
   	}
  -	m_pHeaderBlock->setLocalName(localname);
  -	m_pHeaderBlock->setUri(uri);
  +	m_pHeaderBlock->setLocalName((wchar_t*) localname);
  +	m_pHeaderBlock->setUri((wchar_t*) uri);
   }
  
  
  
  1.12      +32 -32    xml-axis/c/src/wsdd/WSDDDocument.cpp
  
  Index: WSDDDocument.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/wsdd/WSDDDocument.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- WSDDDocument.cpp	2 Sep 2003 12:03:50 -0000	1.11
  +++ WSDDDocument.cpp	4 Sep 2003 06:51:41 -0000	1.12
  @@ -65,7 +65,7 @@
   #include "WSDDDocument.h"
   #include <iostream>
   #include <string>
  -#include "../common/Debug.h"
  +#include "../common/AxisTrace.h"
   
   WSDDDocument::WSDDDocument()
   {
  @@ -92,13 +92,13 @@
   
   int WSDDDocument::ParseDocument(const string& sWSDD)
   {
  -	DEBUG1("inside ParseDocument\n");
  +	AXISTRACE1("inside ParseDocument\n");
   	try
   	{
   		SAX2XMLReader* parser = XMLReaderFactory::createXMLReader();
   		parser->setContentHandler(this);
   		parser->setErrorHandler(this);     
  -		DEBUG1("BEFORE parser->parse(sWSDD.c_str());");
  +		AXISTRACE1("BEFORE parser->parse(sWSDD.c_str());");
   		parser->parse(sWSDD.c_str());   
   		delete parser;
   	}
  @@ -111,7 +111,7 @@
   
   void  WSDDDocument::endElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname)
   {
  -	if (0 != wcscmp(localname, kw_param)) //just neglect endElement of parameter
  +	if (0 != wcscmp((wchar_t*) localname, kw_param)) //just neglect endElement of parameter
   	{
   		if (m_lev1 == WSDD_UNKNOWN) //not inside a requestFlow or responseFlow elements
   		{
  @@ -124,7 +124,7 @@
   				m_lev0 = WSDD_DEPLOYMENT;
   				break;
   			case WSDD_SERVICE:
  -				if (0 == wcscmp(localname, kw_srv))
  +				if (0 == wcscmp((wchar_t*) localname, kw_srv))
   				{
   					//add service object to Deployment object
   					m_pDeployment->AddService(m_pService);
  @@ -151,7 +151,7 @@
   		}
   		else // inside a requestFlow or responseFlow elements
   		{
  -			if(0 == wcscmp(localname, kw_hdl))
  +			if(0 == wcscmp((wchar_t*) localname, kw_hdl))
   			{
   				m_lev2 = WSDD_UNKNOWN;
   				//add handler in m_pHandler to the corresponding container.
  @@ -178,11 +178,11 @@
   					default: ; //this cannot happen ?? 
   				}
   			}
  -			else if(0 == wcscmp(localname, kw_rqf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rqf))
   			{  
   				m_lev1 = WSDD_UNKNOWN;
   			}
  -			else if(0 == wcscmp(localname, kw_rsf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rsf))
   			{  
   				m_lev1 = WSDD_UNKNOWN;
   			}						
  @@ -194,8 +194,8 @@
   {
   	for (int i = 0; i < attrs.getLength(); i++) 
   	{
  -		AxisString local = attrs.getLocalName(i);
  -		AxisString value = attrs.getValue(i);
  +		AxisString local = (wchar_t*) attrs.getLocalName(i);
  +		AxisString value = (wchar_t*) attrs.getValue(i);
   		switch(ElementType)
   		{
   		case WSDD_SERVICE: //add this attribute to current service object
  @@ -276,8 +276,8 @@
   	AxisString Localname, Value;
   	for (int i = 0; i < attrs.getLength(); i++) 
   	{
  -		Localname = attrs.getLocalName(i);
  -		Value = attrs.getValue(i);
  +		Localname = (wchar_t*) attrs.getLocalName(i);
  +		Value = (wchar_t*) attrs.getValue(i);
   		if (Localname == kw_name)
   		{
   			name = Value;
  @@ -377,33 +377,33 @@
   		switch(m_lev0)
   		{
   		case WSDD_UNKNOWN:
  -			if(0 == wcscmp(localname, kw_depl))
  +			if(0 == wcscmp((wchar_t*) localname, kw_depl))
   			{  
   				m_lev0 = WSDD_DEPLOYMENT;
   				//nothing to get
   			}
   			break;
   		case WSDD_DEPLOYMENT:
  -			if(0 == wcscmp(localname, kw_glconf))
  +			if(0 == wcscmp((wchar_t*) localname, kw_glconf))
   			{  
   				m_lev0 = WSDD_GLOBCONF;
   				//nothing to get
   			}
  -			else if(0 == wcscmp(localname, kw_srv))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_srv))
   			{  
   				m_lev0 = WSDD_SERVICE;
   				m_pService = new WSDDService();
   				//get service name and proider if any
   				ProcessAttributes(WSDD_SERVICE, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_hdl))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_hdl))
   			{  
   				m_lev0 = WSDD_HANDLER;
   				m_pHandler = new WSDDHandler();
   				ProcessAttributes(WSDD_HANDLER, attrs);
   				//get handler name and type if any
   			}
  -			else if(0 == wcscmp(localname, kw_tr))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_tr))
   			{  
   				m_lev0 = WSDD_TRANSPORT;
   				ProcessAttributes(WSDD_TRANSPORT, attrs);
  @@ -414,16 +414,16 @@
   			}
   			break;
   		case WSDD_GLOBCONF:
  -			if(0 == wcscmp(localname, kw_param))
  +			if(0 == wcscmp((wchar_t*) localname, kw_param))
   			{  
   				GetParameters(WSDD_GLOBCONF, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_rqf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rqf))
   			{  
   				m_lev1 = WSDD_REQFLOW;
   				ProcessAttributes(WSDD_REQFLOW, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_rsf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rsf))
   			{  
   				m_lev1 = WSDD_RESFLOW;
   				ProcessAttributes(WSDD_RESFLOW, attrs);
  @@ -434,16 +434,16 @@
   			}
   		break; 
   		case WSDD_SERVICE:
  -			if(0 == wcscmp(localname, kw_param))
  +			if(0 == wcscmp((wchar_t*) localname, kw_param))
   			{  
   				GetParameters(WSDD_SERVICE, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_rqf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rqf))
   			{  
   				m_lev1 = WSDD_REQFLOW;
   				ProcessAttributes(WSDD_REQFLOW, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_rsf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rsf))
   			{  
   				m_lev1 = WSDD_RESFLOW;
   				ProcessAttributes(WSDD_RESFLOW, attrs);
  @@ -454,19 +454,19 @@
   			}
   		break;
   		case WSDD_HANDLER:
  -			if(0 == wcscmp(localname, kw_param))
  +			if(0 == wcscmp((wchar_t*) localname, kw_param))
   			{  
   				GetParameters(WSDD_HANDLER, attrs);
   			}
   
   		break;
   		case WSDD_TRANSPORT:
  -			if(0 == wcscmp(localname, kw_rqf))
  +			if(0 == wcscmp((wchar_t*) localname, kw_rqf))
   			{  
   				m_lev1 = WSDD_REQFLOW;
   				ProcessAttributes(WSDD_REQFLOW, attrs);
   			}
  -			else if(0 == wcscmp(localname, kw_rsf))
  +			else if(0 == wcscmp((wchar_t*) localname, kw_rsf))
   			{  
   				m_lev1 = WSDD_RESFLOW;
   				ProcessAttributes(WSDD_RESFLOW, attrs);
  @@ -476,19 +476,19 @@
   	}
   	else // inside a requestFlow or responseFlow elements
   	{
  -		if(0 == wcscmp(localname, kw_param))
  +		if(0 == wcscmp((wchar_t*) localname, kw_param))
   		{  
   			GetParameters(m_lev2, attrs); //must be parameters of a handler or a chain
   		}
   
  -		else if(0 == wcscmp(localname, kw_hdl))
  +		else if(0 == wcscmp((wchar_t*) localname, kw_hdl))
   		{  
   			m_lev2 = WSDD_HANDLER;
   			m_pHandler = new WSDDHandler();
   			ProcessAttributes(WSDD_HANDLER, attrs);
   			//get handler name and type if any
   		}
  -		else if(0 == wcscmp(localname, kw_chain))
  +		else if(0 == wcscmp((wchar_t*) localname, kw_chain))
   		{
   
   		}
  @@ -503,14 +503,14 @@
   void WSDDDocument::startPrefixMapping(const XMLCh* const prefix, const XMLCh* const uri)
   {
   //	AxisString sPrifix = prefix;
  -	AxisString sUri = uri;
  -	m_NsStack[prefix] = uri; //I think the same prifix cannot repeat ???
  +	AxisString sUri = (wchar_t*) uri;
  +	m_NsStack[(wchar_t*) prefix] = (wchar_t*) uri; //I think the same prifix cannot repeat ???
   }
   
   void WSDDDocument::endPrefixMapping(const XMLCh* const prefix)
   {
   //	string sPrifix = prefix;
  -	m_NsStack.erase(prefix); //I think the same prifix cannot repeat ???
  +	m_NsStack.erase((wchar_t*) prefix); //I think the same prifix cannot repeat ???
   }
   
   void  WSDDDocument::characters (const XMLCh *const chars, const unsigned int length)
  
  
  
  1.7       +1 -1      xml-axis/c/src/wsdd/WSDDService.cpp
  
  Index: WSDDService.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/wsdd/WSDDService.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WSDDService.cpp	1 Sep 2003 07:28:30 -0000	1.6
  +++ WSDDService.cpp	4 Sep 2003 06:51:41 -0000	1.7
  @@ -66,7 +66,7 @@
   //////////////////////////////////////////////////////////////////////
   
   #include "WSDDService.h"
  -#include "../common/Debug.h"
  +#include "../common/AxisTrace.h"
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  

Mime
View raw message