You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by su...@apache.org on 2003/08/04 08:36:34 UTC

cvs commit: xml-axis/c/src/common IWrapperSoapSerializer.h IHandlerSoapSerializer.h Handler.h BasicHandler.h AxisException.h AxisException.cpp

susantha    2003/08/03 23:36:34

  Modified:    c/src/common IWrapperSoapSerializer.h
                        IHandlerSoapSerializer.h Handler.h BasicHandler.h
                        AxisException.h AxisException.cpp
  Log:
  some changes to exclude exceptions and RTTI
  
  Revision  Changes    Path
  1.2       +1 -1      xml-axis/c/src/common/IWrapperSoapSerializer.h
  
  Index: IWrapperSoapSerializer.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/common/IWrapperSoapSerializer.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IWrapperSoapSerializer.h	26 Jul 2003 12:38:31 -0000	1.1
  +++ IWrapperSoapSerializer.h	4 Aug 2003 06:36:33 -0000	1.2
  @@ -80,7 +80,7 @@
   #include "TypeMapping.h"
   #include "ISoapSerializer.h"
   
  -class IWrapperSoapSerializer  : public ISoapSerializer
  +class IWrapperSoapSerializer  : virtual public ISoapSerializer
   {
   
   public:	
  
  
  
  1.2       +1 -1      xml-axis/c/src/common/IHandlerSoapSerializer.h
  
  Index: IHandlerSoapSerializer.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/common/IHandlerSoapSerializer.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IHandlerSoapSerializer.h	26 Jul 2003 12:38:32 -0000	1.1
  +++ IHandlerSoapSerializer.h	4 Aug 2003 06:36:33 -0000	1.2
  @@ -76,7 +76,7 @@
   class ISoapHeader;
   class IHeaderBlock;
   
  -class IHandlerSoapSerializer : public ISoapSerializer
  +class IHandlerSoapSerializer : virtual public ISoapSerializer
   {
   public:		
   	virtual IHeaderBlock* createHeaderBlock()=0;
  
  
  
  1.4       +3 -2      xml-axis/c/src/common/Handler.h
  
  Index: Handler.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/common/Handler.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Handler.h	23 Jul 2003 13:41:29 -0000	1.3
  +++ Handler.h	4 Aug 2003 06:36:33 -0000	1.4
  @@ -11,13 +11,14 @@
   {
   public:
     Handler(){};
  -	virtual ~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;
  +  int GetType(){return NORMAL_HANDLER;};
   
   protected:
  -map<string, string>* m_Option;
  +  map<string, string>* m_Option;
   };
   
   #endif //__HANDLER_INCLUDED__
  
  
  
  1.4       +3 -1      xml-axis/c/src/common/BasicHandler.h
  
  Index: BasicHandler.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/common/BasicHandler.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BasicHandler.h	23 Jul 2003 09:30:47 -0000	1.3
  +++ BasicHandler.h	4 Aug 2003 06:36:33 -0000	1.4
  @@ -74,14 +74,16 @@
   
   #include "IMessageData.h"
   
  +enum HANDLER_TYPE { NORMAL_HANDLER, WEBSERVICE_HANDLER, CHAIN_HANDLER };
  +
   class BasicHandler  
   {
   public:
   	BasicHandler(){};
   	virtual ~BasicHandler(){};
  -
   	virtual int Invoke(IMessageData* pMsg) = 0;
   	virtual void OnFault(IMessageData* pMsg) = 0;
  +	virtual int GetType() = 0;
   };
   
   #endif // !defined(AFX_BASICHANDLER_H__FFF77AB5_015C_4B48_9BAC_D84A7C493015__INCLUDED_)
  
  
  
  1.4       +9 -0      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AxisException.h	15 Jul 2003 06:45:30 -0000	1.3
  +++ AxisException.h	4 Aug 2003 06:36:33 -0000	1.4
  @@ -6,6 +6,15 @@
   
   #define TEST_EXCEPTION FAULT_LAST+1
   
  +#ifdef _DEBUG
  +#define AXIS_TRY try {
  +#define AXIS_CATCH(X) } catch (X) { 
  +#define AXIS_ENDCATCH }
  +#else
  +#define AXIS_TRY 
  +#define AXIS_CATCH(X) 
  +#define AXIS_ENDCATCH
  +#endif
   
   class AxisException :public exception
   {
  
  
  
  1.3       +4 -4      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AxisException.cpp	14 Jul 2003 05:26:34 -0000	1.2
  +++ AxisException.cpp	4 Aug 2003 06:36:33 -0000	1.3
  @@ -33,28 +33,28 @@
   string AxisException::getMessage(exception* e)
   {
     string sMessage;
  -  exception *objType = dynamic_cast<bad_alloc*> (e);
  +  exception *objType = static_cast<bad_alloc*> (e);
     if(objType != NULL)
     {
       //cout << "bad_alloc" << endl;
       sMessage = "thrown by new";
     }
   
  -  objType = dynamic_cast<bad_cast*> (e);
  +  objType = static_cast<bad_cast*> (e);
     if(objType != NULL)
     {
       //cout << "bad_cast" << endl;
       sMessage = "thrown by dynamic_cast when fails with a referenced type";
     }
   
  -  objType = dynamic_cast<bad_exception*> (e);
  +  objType = static_cast<bad_exception*> (e);
     if(objType != NULL)
     {
       //cout << "bad_exception" << endl;
       sMessage = "thrown when an exception doesn't match any catch";
     }
   
  -  objType = dynamic_cast<bad_typeid*> (e);
  +  objType = static_cast<bad_typeid*> (e);
     if(objType != NULL)
     {
       //cout << "bad_typeid" << endl;