axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From susan...@apache.org
Subject cvs commit: ws-axis/c/vc/server/handlers handlers.dsw
Date Wed, 15 Oct 2003 13:40:16 GMT
susantha    2003/10/15 06:40:16

  Modified:    c/src/common Handler.h
               c/src/engine HandlerPool.cpp ServerAxisEngine.cpp
               c/src/server/handlers/custom/loghandler LogAccessCount.cpp
                        LogHandler.cpp LogHandler.h
               c/vc/client client.dsp
               c/vc/client/samples/CalculatorC CalculatorC.dsp
               c/vc/common Common.dsp
               c/vc/server/apache1_3 Apache1_3.dsp
               c/vc/server/handlers handlers.dsw
  Log:
  Some fixes and changes to handler.h and handler samples
  
  Revision  Changes    Path
  1.6       +3 -4      ws-axis/c/src/common/Handler.h
  
  Index: Handler.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/Handler.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Handler.h	15 Oct 2003 06:11:28 -0000	1.5
  +++ Handler.h	15 Oct 2003 13:40:11 -0000	1.6
  @@ -14,13 +14,12 @@
   public:
     Handler(){};
     virtual ~Handler(){};
  -  virtual string GetOption(string sArg)=0;
  -  virtual void SetOption(string sOption, string Value)=0;
  -  virtual void SetOptionList(map<string, string>* OptionList)=0;
  +  virtual const string& GetOption(const string& sArg)=0;
  +  virtual void SetOptionList(const map<string, string>* OptionList)=0;
     int GetType(){return NORMAL_HANDLER;};
   
   protected:
  -  map<string, string>* m_Option;
  +  const map<string, string>* m_pOption;
   };
   
   #endif //__HANDLER_INCLUDED__
  
  
  
  1.13      +1 -0      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- HandlerPool.cpp	10 Oct 2003 12:47:03 -0000	1.12
  +++ HandlerPool.cpp	15 Oct 2003 13:40:11 -0000	1.13
  @@ -257,6 +257,7 @@
   			if (NORMAL_HANDLER == pBH->GetType())
   			{
                   AXISTRACE1("Normal Handler");
  +				((Handler*)pBH)->SetOptionList(pWSDDH->GetParameterList());
   				pChain->AddHandler(static_cast<Handler*>(pBH), pWSDDH->GetScope(), pWSDDH->GetLibId());
                   AXISTRACE1("after pChain->AddHandler");
   			}
  
  
  
  1.8       +4 -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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ServerAxisEngine.cpp	15 Oct 2003 06:11:28 -0000	1.7
  +++ ServerAxisEngine.cpp	15 Oct 2003 13:40:11 -0000	1.8
  @@ -30,7 +30,7 @@
   int ServerAxisEngine::Process(Ax_soapstream* soap) 
   {
   	int Status = 0;
  -	AXIS_TRY
  +//	AXIS_TRY
   		AXISTRACE1("ServerAxisEngine::Process");
   		const WSDDService* pService = NULL;
   		string sSessionId = soap->sessionid;
  @@ -177,7 +177,7 @@
   		//Pool back the webservice
   		if (m_pWebService) g_pHandlerPool->PoolWebService(sSessionId, m_pWebService, pService);

   		return Status;
  -	AXIS_CATCH(exception* e)
  +//	AXIS_CATCH(exception* e)
   		//todo
   		/*
   		An exception derived from exception which is not handled will be handled here.
  @@ -189,7 +189,7 @@
   //		AXISTRACE1(e->what());   
   		delete(e);
   		#endif
  -	AXIS_CATCH(...)
  +//	AXIS_CATCH(...)
   		//todo
   		/*
   		An unknown exception which is not handled will be handled here.
  @@ -198,7 +198,7 @@
   		in a logfile specific to axis.
   		*/
   //		AXISTRACE1("UNKNOWN EXCEPTION");
  -	AXIS_ENDCATCH
  +//	AXIS_ENDCATCH
   	return Status;
   }
   
  
  
  
  1.5       +2 -2      ws-axis/c/src/server/handlers/custom/loghandler/LogAccessCount.cpp
  
  Index: LogAccessCount.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/loghandler/LogAccessCount.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LogAccessCount.cpp	15 Oct 2003 06:11:29 -0000	1.4
  +++ LogAccessCount.cpp	15 Oct 2003 13:40:11 -0000	1.5
  @@ -65,7 +65,7 @@
   #endif
   
   #include "LogHandler.h"
  -#include <AxisTrace.h>
  +//#include <AxisTrace.h>
   
   extern "C" {
   //the two export functions////////////////////////////////////////////
  @@ -78,7 +78,7 @@
   	*inst = new LogHandler();
   	if (*inst)
   	{
  -        AXISTRACE1("GetClassInstance success");
  +//        AXISTRACE1("GetClassInstance success");
   		return SUCCESS;
   	}
   	return FAIL;
  
  
  
  1.9       +19 -20    ws-axis/c/src/server/handlers/custom/loghandler/LogHandler.cpp
  
  Index: LogHandler.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/loghandler/LogHandler.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LogHandler.cpp	15 Oct 2003 06:11:29 -0000	1.8
  +++ LogHandler.cpp	15 Oct 2003 13:40:11 -0000	1.9
  @@ -62,7 +62,7 @@
   #include "LogHandler.h"
   #include "../../../../soap/SoapDeSerializer.h"
   #include "../../../../soap/SoapSerializer.h"
  -#include <AxisTrace.h>
  +//#include <AxisTrace.h>
   #include <AxisException.h>
   #include <fstream>
   #include <string>
  @@ -72,21 +72,20 @@
   
   LogHandler::LogHandler()
   {
  -  m_Option = new map<string, string>;
  +  m_pOption = NULL;
  +  m_sEmpty = "";
   
   }
   
   LogHandler::~LogHandler()
   {
  -  delete(m_Option);
  -  m_Option = NULL;
   
   }
   // Implementation of BasicHandler interface.
   int LogHandler::Invoke(IMessageData* md)
   {
  -  AXISTRACE1("LogHandler::Invoke(IMessageData* md)");
  -  AXIS_TRY
  +//  AXISTRACE1("LogHandler::Invoke(IMessageData* md)");
  +//  AXIS_TRY
   
       m_iNumAccess = 0;
       string sNumAccess = "";
  @@ -96,7 +95,7 @@
       if(!sFileName.empty())
       {
   
  -      AXISTRACE1("if(!sFileName.empty())");
  +//      AXISTRACE1("if(!sFileName.empty())");
   
         ifstream fin(sFileName.c_str());    // open for reading
          char ch;
  @@ -122,7 +121,7 @@
         const char * FileName = sFileName.c_str();
         ofstream fout(FileName);  // open for writing
         fout << m_iNumAccess;
  -      AXISTRACE1("LogHandler Invoke end");
  +//      AXISTRACE1("LogHandler Invoke end");
         fin.close();
         fout.close();
         return SUCCESS;
  @@ -131,9 +130,9 @@
       {
         return FAIL;
       }
  -  AXIS_CATCH(...)
  -		return FAIL;
  -  AXIS_ENDCATCH
  +//  AXIS_CATCH(...)
  +//		return FAIL;
  +//  AXIS_ENDCATCH
   }
   
   void LogHandler::OnFault(IMessageData* mc)
  @@ -141,20 +140,20 @@
   
   }
   
  -
  -string LogHandler::GetOption(string sArg)
  +const string& LogHandler::GetOption(const string& sArg)
   {
  -  return (*m_Option)[sArg];
  +	map<string, string>::const_iterator it = m_pOption->find(sArg);
  +	if (it != m_pOption->end())
  +	{
  +		return (*it).second;
  +	}
  +	return m_sEmpty;
   }
   
  -void LogHandler::SetOption(string sOption, string sValue)
  -{
  -  (*m_Option)[sOption] = sValue;
  -}
   
  -void LogHandler::SetOptionList(map<string, string>* OptionList)
  +void LogHandler::SetOptionList(const map<string, string>* OptionList)
   {
  -   m_Option = OptionList;
  +   m_pOption = OptionList;
   }
   
   int LogHandler::Init()
  
  
  
  1.5       +6 -3      ws-axis/c/src/server/handlers/custom/loghandler/LogHandler.h
  
  Index: LogHandler.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/loghandler/LogHandler.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LogHandler.h	2 Oct 2003 06:06:16 -0000	1.4
  +++ LogHandler.h	15 Oct 2003 13:40:11 -0000	1.5
  @@ -65,6 +65,9 @@
   #include "../../../../common/Handler.h"
   
   #include <list>
  +#include <string>
  +
  +using namespace std;
   
   class LogHandler : public Handler
   {
  @@ -76,11 +79,11 @@
     int Init();
     int Fini();	
   
  -  string GetOption(string sArg);
  -  void SetOption(string sOption, string Value);
  -  void SetOptionList(map<string, string>* OptionList);
  +  const string& GetOption(const string& sArg);
  +  void SetOptionList(const map<string, string>* OptionList);
   
   protected:
     int m_iNumAccess;
  +  string m_sEmpty;
   
   };
  
  
  
  1.5       +32 -0     ws-axis/c/vc/client/client.dsp
  
  Index: client.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/client/client.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- client.dsp	8 Oct 2003 16:43:38 -0000	1.4
  +++ client.dsp	15 Oct 2003 13:40:13 -0000	1.5
  @@ -133,6 +133,38 @@
   
   SOURCE=..\..\src\client\Call.h
   # End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\src\client\transport\axis\Channel.hpp
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\src\client\transport\axis\HttpTransport.hpp
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\src\client\transport\axis\Platform.hpp
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\src\client\transport\axis\Receiver.hpp
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\src\client\transport\axis\Sender.hpp
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\src\client\transport\axis\Transport.hpp
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\src\client\transport\axis\TransportFactory.hpp
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\src\client\transport\axis\Url.hpp
  +# End Source File
   # End Group
   # End Target
   # End Project
  
  
  
  1.2       +5 -5      ws-axis/c/vc/client/samples/CalculatorC/CalculatorC.dsp
  
  Index: CalculatorC.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/client/samples/CalculatorC/CalculatorC.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CalculatorC.dsp	29 Sep 2003 08:11:27 -0000	1.1
  +++ CalculatorC.dsp	15 Oct 2003 13:40:13 -0000	1.2
  @@ -50,7 +50,7 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
  +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
   # ADD LINK32 Common.lib Soap.lib wsdd.lib Engine.lib client.lib xerces-c_2.lib Ws2_32.lib
/nologo /subsystem:console /machine:I386 /libpath:"../../../../lib/win32/axis" /libpath:"../../../../lib/win32/xercesc"
   
   !ELSEIF  "$(CFG)" == "CalculatorC - Win32 Debug"
  @@ -66,8 +66,8 @@
   # PROP Intermediate_Dir "../../../../bin/win32/client/samples/calculatorC"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /GZ  /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../src/common"
/D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ  /c
  +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /GZ /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../src/common"
/D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  @@ -75,8 +75,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib client_D.lib xerces-c_2D.lib
Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../lib/win32/axis"
/libpath:"../../../../lib/win32/xercesc"
  +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib client_D.lib xerces-c_2D.lib
 Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../lib/win32/axis"
/libpath:"../../../../lib/win32/xercesc"
   
   !ENDIF 
   
  
  
  
  1.24      +8 -0      ws-axis/c/vc/common/Common.dsp
  
  Index: Common.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/common/Common.dsp,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Common.dsp	11 Oct 2003 14:50:30 -0000	1.23
  +++ Common.dsp	15 Oct 2003 13:40:15 -0000	1.24
  @@ -163,7 +163,15 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\..\src\common\AxisUserAPI.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\..\src\common\AxisUtils.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\src\common\AxisWrapperAPI.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.10      +1 -1      ws-axis/c/vc/server/apache1_3/Apache1_3.dsp
  
  Index: Apache1_3.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/server/apache1_3/Apache1_3.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Apache1_3.dsp	29 Sep 2003 03:35:43 -0000	1.9
  +++ Apache1_3.dsp	15 Oct 2003 13:40:16 -0000	1.10
  @@ -81,7 +81,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
/pdbtype:sept
  -# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib ApacheCore.lib
/nologo /dll /debug /machine:I386 /out:"../../../release/win32/mod_axis.dll" /pdbtype:sept
/libpath:"../../../lib/win32/axis" /libpath:"../../../lib/win32/xercesc" /libpath:"../../../lib/win32/apache1_3"
  +# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib ApacheCore.lib
/nologo /dll /debug /machine:I386 /out:"C:\Program Files\Apache Group\Apache\modules\mod_axis.dll"
/pdbtype:sept /libpath:"../../../lib/win32/axis" /libpath:"../../../lib/win32/xercesc" /libpath:"../../../lib/win32/apache1_3"
   # SUBTRACT LINK32 /profile
   
   !ENDIF 
  
  
  
  1.4       +12 -0     ws-axis/c/vc/server/handlers/handlers.dsw
  
  Index: handlers.dsw
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/server/handlers/handlers.dsw,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- handlers.dsw	5 Aug 2003 12:50:37 -0000	1.3
  +++ handlers.dsw	15 Oct 2003 13:40:16 -0000	1.4
  @@ -15,6 +15,18 @@
   
   ###############################################################################
   
  +Project: "loghandler"=".\CUSTOM\loghandler\loghandler.dsp" - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +}}}
  +
  +###############################################################################
  +
   Project: "testhandler1"=".\GLOBAL\testhandler1\testhandler1.dsp" - Package Owner=<4>
   
   Package=<5>
  
  
  

Mime
View raw message