ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whitl...@apache.org
Subject cvs commit: ws-axis/c/src/soap Attribute.cpp ComplexElement.cpp HeaderBlock.cpp SoapDeSerializer.cpp SoapSerializer.cpp
Date Fri, 29 Oct 2004 15:34:59 GMT
whitlock    2004/10/29 08:34:58

  Modified:    c/include/axis IAttribute.hpp
               c/include/axis/server Attribute.hpp AxisException.hpp
                        AxisUserAPI.hpp AxisWrapperAPI.hpp BasicHandler.hpp
                        BasicNode.hpp IHandlerSoapDeSerializer.hpp
                        IHeaderBlock.hpp IMessageData.hpp IParam.hpp
                        IWrapperSoapDeSerializer.hpp
                        IWrapperSoapSerializer.hpp Packet.hpp
                        SoapEnvVersions.hpp TypeMapping.hpp
               c/src/common ArrayBean.cpp MessageData.cpp Param.cpp
               c/src/engine Axis.cpp
               c/src/engine/server ServerAxisEngine.cpp
               c/src/soap Attribute.cpp ComplexElement.cpp HeaderBlock.cpp
                        SoapDeSerializer.cpp SoapSerializer.cpp
  Log:
  Remove C support from C++ external headers
  
  Revision  Changes    Path
  1.4       +4 -1      ws-axis/c/include/axis/IAttribute.hpp
  
  Index: IAttribute.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/IAttribute.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IAttribute.hpp	29 Oct 2004 09:53:35 -0000	1.3
  +++ IAttribute.hpp	29 Oct 2004 15:34:54 -0000	1.4
  @@ -25,6 +25,8 @@
   
   #include <axis/server/GDefine.hpp>
   
  +AXIS_CPP_NAMESPACE_START
  +
   /**
    *   @class IAttribute
    *   @brief interface for the IAttribute class.
  @@ -47,7 +49,8 @@
       virtual const AxisChar* getUri() = 0;
       virtual const AxisChar* getPrefix() = 0;
       virtual const AxisChar* getLocalName() = 0;
  -
   };
  +
  +AXIS_CPP_NAMESPACE_END
   
   #endif
  
  
  
  1.3       +2 -38     ws-axis/c/include/axis/server/Attribute.hpp
  
  Index: Attribute.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/Attribute.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Attribute.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ Attribute.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -15,7 +15,7 @@
    */
   
    /**
  - * @file Attribute.h
  + * @file Attribute.hpp
    *
    *
    */
  @@ -24,19 +24,14 @@
   #define _ATTRIBUTE_H____OF_AXIS_INCLUDED_
   
   #include "GDefine.hpp"
  -
  -#ifdef __cplusplus
  +#include <axis/IAttribute.hpp>
   #include <list>
   #include <string>
   
   AXIS_CPP_NAMESPACE_START
  -
   using namespace std;
   
   class SoapSerializer;
  -#include <axis/IAttribute.hpp>
  -
  -#endif
   
   /**
    *   @class Attribute
  @@ -48,29 +43,9 @@
    *
    */
   
  -/*
  - * Revision 1.1  2004/05/25 samisa
  - * Added copy constructor
  - */
  -
  -/*
  - * Revision 1.11  2004/06/13 susantha
  - * Added support for writing C web services and handlers
  - */
  -
  -typedef struct {
  -	void (AXISCALL* setValue)(void* pObj, const AxisChar* value);
  -	/*add all other API functions here*/
  -} AttributeFunctions;
  -
  -#ifdef __cplusplus
  -
   class Attribute : public IAttribute
   {
   public:        
  -	static AttributeFunctions ms_VFtable;
  -	static bool bInitialized;
  -
   #ifdef UNIT_TESTING_ON
       int initializeForTesting();
   #endif
  @@ -105,18 +80,7 @@
   
   };
   
  -#endif
  -
  -typedef struct { 
  -	void* _object; /* this will be C++ Call Object */
  -	AttributeFunctions* _functions; /* this is the static function table */
  -} Attribute_C;
  -
   AXIS_CPP_NAMESPACE_END
  -
  -#ifndef __cplusplus
  -typedef Attribute_C Attribute; 
  -#endif
   
   #endif
   
  
  
  
  1.3       +0 -2      ws-axis/c/include/axis/server/AxisException.hpp
  
  Index: AxisException.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisException.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AxisException.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ AxisException.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -28,7 +28,6 @@
   #define __AXISEXCEPTION_H_OF_AXIS_INCLUDED_
   
   #include <axis/server/GDefine.hpp>
  -
   #include <string>
   #include <exception>
   #include <new>
  @@ -36,7 +35,6 @@
   #include <stdexcept>
   
   AXIS_CPP_NAMESPACE_START
  -
   using namespace std;
   
   /*
  
  
  
  1.3       +1 -1      ws-axis/c/include/axis/server/AxisUserAPI.hpp
  
  Index: AxisUserAPI.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisUserAPI.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AxisUserAPI.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ AxisUserAPI.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -23,7 +23,7 @@
   #include <string.h>
   
    /**
  -  * @file AxisUserAPI.h
  +  * @file AxisUserAPI.hpp
     * This file contains types defined in Axis C++. The mapping of basic xsd types
     * to the C language types.
     * @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
  
  
  
  1.3       +1 -1      ws-axis/c/include/axis/server/AxisWrapperAPI.hpp
  
  Index: AxisWrapperAPI.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisWrapperAPI.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AxisWrapperAPI.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ AxisWrapperAPI.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -24,7 +24,7 @@
   #include "BasicHandler.hpp"
   
   /**
  - * @file AxisWrapperAPI.h
  + * @file AxisWrapperAPI.hpp
    * This file contains the API functions that are implemented by the WSDL2Ws
    * tool generated code to manipulate C/C++ type for each complex type in a xml
    * schema.
  
  
  
  1.3       +1 -4      ws-axis/c/include/axis/server/BasicHandler.hpp
  
  Index: BasicHandler.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/BasicHandler.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BasicHandler.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ BasicHandler.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -17,7 +17,7 @@
    */
   
   /**
  - * @file BasicHandler.h
  + * @file BasicHandler.hpp
    *
    * @author Susantha Kumara (skumara@virtusa.com)
    * @author Roshan Weerasuriya (roshan@opensource.lk, roshanw@jkcsworld.com) *
  @@ -50,8 +50,6 @@
       BasicHandlerFunctions* _functions;
   } BasicHandler;
   
  -#ifdef __cplusplus
  -
   /**
     * @class HandlerBase
     * @brief interface for the Handlers. This is the base class for:
  @@ -231,7 +229,6 @@
         */
       virtual int AXISCALL getType()=0;
   };
  -#endif
   
   AXIS_CPP_NAMESPACE_END
   
  
  
  
  1.3       +2 -32     ws-axis/c/include/axis/server/BasicNode.hpp
  
  Index: BasicNode.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/BasicNode.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BasicNode.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ BasicNode.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -16,7 +16,7 @@
   
   
   /**
  - * @file BasicNode.h
  + * @file BasicNode.hpp
    *
    * @author Roshan Weerasuriya (roshan@opensource.lk, roshanw@jkcsworld.com)
    */
  @@ -25,12 +25,9 @@
   #define _BASICNODE_H____OF_AXIS_INCLUDED_
   
   #include "GDefine.hpp"
  -
  -#ifdef __cplusplus
  -
  +#include <axis/IAttribute.hpp>
   #include <list>
   
  -
   AXIS_CPP_NAMESPACE_START
   using namespace std;
   
  @@ -38,10 +35,6 @@
   
   AXIS_CPP_NAMESPACE_END
   
  -#endif
  -
  -#include <axis/IAttribute.hpp>
  -
   enum NODE_TYPE { ELEMENT_NODE=1, CHARACTER_NODE};
   
   /*
  @@ -68,14 +61,6 @@
    * Added the method getLocalName()
    */
   
  -
  -typedef struct {
  -	int (AXISCALL* getNoOfChildren)(void* pObj);
  -	/*add akk itger aou fybctuibs gere.*/
  -} BasicNodeFunctions;
  -
  -#ifdef __cplusplus
  -
   AXIS_CPP_NAMESPACE_START
   using namespace std;
   
  @@ -297,21 +282,6 @@
   };
   
   AXIS_CPP_NAMESPACE_END
  -
  -#endif
  -
  -AXIS_CPP_NAMESPACE_START
  -
  -typedef struct { 
  -	void* _object; /* this will be C++ Call Object */
  -	BasicNodeFunctions* _functions; /* this is the static function table */
  -} BasicNode_C;
  -
  -AXIS_CPP_NAMESPACE_END
  -
  -#ifndef __cplusplus
  -typedef BasicNode_C BasicNode; 
  -#endif
   
   #endif 
   
  
  
  
  1.3       +0 -17     ws-axis/c/include/axis/server/IHandlerSoapDeSerializer.hpp
  
  Index: IHandlerSoapDeSerializer.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/IHandlerSoapDeSerializer.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IHandlerSoapDeSerializer.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ IHandlerSoapDeSerializer.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -36,8 +36,6 @@
    * to the DeSerialzer.
    */
   
  -#ifdef __cplusplus
  -
   AXIS_CPP_NAMESPACE_START
   
   class IHandlerSoapDeSerializer : public IWrapperSoapDeSerializer
  @@ -78,21 +76,6 @@
   };
   
   AXIS_CPP_NAMESPACE_END
  -
  -#else
  -
  -typedef struct 
  -{ 
  -    void* unused; 
  -    /* this corresponds to C++ virtual function 
  -     * pointer which is ignored in C 
  -     */ 
  -    void* unused_; 
  -    /* this corresponds to IWrapperSoapDeSerializerFunctions pointer */
  -    IHandlerSoapDeSerializerFunctions* __vfptr;
  -} IHandlerSoapDeSerializer;
  -
  -#endif
   
   #endif 
   
  
  
  
  1.3       +2 -24     ws-axis/c/include/axis/server/IHeaderBlock.hpp
  
  Index: IHeaderBlock.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/IHeaderBlock.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IHeaderBlock.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ IHeaderBlock.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -21,16 +21,12 @@
   #include "SoapEnvVersions.hpp"
   #include <axis/IAttribute.hpp>
   
  -#ifdef __cplusplus
  -
   AXIS_CPP_NAMESPACE_START
   
   class Attribute;
   
   AXIS_CPP_NAMESPACE_END
   
  -#endif
  -
   enum HEADER_BLOCK_STD_ATTR_TYPE 
   {   ROLE_NEXT=1, ROLE_NONE=2, 
       ROLE_ULTIMATE_RECEIVER=3, 
  @@ -65,13 +61,7 @@
    * Added support for writing C web services and handlers
    */
   AXIS_CPP_NAMESPACE_START
  -typedef struct {
  -	const BasicNode* (AXISCALL* getFirstChild)(void* pObj);
  -	/*add all other API functions here*/
  -} HeaderBlockFunctions;
  -AXIS_CPP_NAMESPACE_END
  -#ifdef __cplusplus
  -AXIS_CPP_NAMESPACE_START
  +
   class IHeaderBlock
   {
   public:
  @@ -336,21 +326,9 @@
         * The Destructor.
         */
       virtual ~IHeaderBlock() {};
  -
  -	static HeaderBlockFunctions ms_VFtable;
  -	static bool bInitialized;
   };
  +
   AXIS_CPP_NAMESPACE_END
  -#endif
  -AXIS_CPP_NAMESPACE_START
  -typedef struct { 
  -	void* _object; /* this will be C++ Call Object */
  -	HeaderBlockFunctions* _functions; /* this is the static function table */
  -} HeaderBlock_C;
  -AXIS_CPP_NAMESPACE_END
  -#ifndef __cplusplus
  -typedef HeaderBlock_C HeaderBlock; 
  -#endif
   
   #endif 
   
  
  
  
  1.3       +3 -57     ws-axis/c/include/axis/server/IMessageData.hpp
  
  Index: IMessageData.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/IMessageData.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IMessageData.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ IMessageData.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -17,52 +17,23 @@
   #if !defined(_IMESSAGEDATA_H___OF_AXIS_INCLUDED_)
   #define _IMESSAGEDATA_H___OF_AXIS_INCLUDED_
   
  -#ifdef __cplusplus
  -
   #include "GDefine.hpp"
  -
  -AXIS_CPP_NAMESPACE_START
  -
  -class WSDDService;
  -class IAdminUtils;
  -
  -AXIS_CPP_NAMESPACE_END
  -
   #include "IHandlerSoapDeSerializer.hpp"
   #include "IHandlerSoapSerializer.hpp"
  -
  -#endif
  -
   #include "IWrapperSoapDeSerializer.hpp"
   #include "IWrapperSoapSerializer.hpp"
   
  -typedef struct 
  -{
  -    const AxisChar* (AXISCALL* getOperationName)(void* pObj);
  -    void (AXISCALL* getSoapSerializer)(void* pObj, 
  -        IWrapperSoapSerializer_C* pIWSS);
  -    void (AXISCALL* getSoapDeSerializer)(void* pObj, 
  -        IWrapperSoapDeSerializer_C* pIWSDS);
  -} IMessageDataFunctions;
  +AXIS_CPP_NAMESPACE_START
   
  -typedef struct
  -{
  -    void* _object; /* this will be C++ MessageData Object */
  -    IMessageDataFunctions* _functions; /* this is the static function table */
  -} IMessageData_C;
  +class WSDDService;
  +class IAdminUtils;
   
  -#ifndef __cplusplus
  -typedef IMessageData_C IMessageData;
  -#else
   /*
    *   @class IMessageData
    *   @brief interface for the IMessageData class.
    *   @author Susantha Kumara (skumara@virtusa.com, susantha@opensource.lk)
    *   @author Roshan Weerasuriya (roshan@jkcs.slt.lk, roshan@opensource.lk)
    */
  -
  -AXIS_CPP_NAMESPACE_START
  -
   class IMessageData
   {
       /* Allow AxisAdminService access to the private methods */
  @@ -89,36 +60,11 @@
       virtual const WSDDService* getService() = 0; 
       virtual bool isPastPivot()=0;
       virtual int setPastPivotState(bool bState)=0;
  -
  -    /* following stuff is needed to provide the interface for C web services */
  -public:
  -    static IMessageDataFunctions ms_VFtable;
  -    static const AxisChar* AXISCALL s_GetOperationName(void* pObj) 
  -    { return ((IMessageData*)pObj)->getOperationName();};
  -    static void AXISCALL s_GetSoapSerializer(void* pObj, 
  -        IWrapperSoapSerializer_C* pIWSS)
  -    { ((IMessageData*)pObj)->getSoapSerializer
  -    ((IWrapperSoapSerializer**)&(pIWSS->_object)); 
  -    pIWSS->_functions = &(IWrapperSoapSerializer::ms_VFtable);};
  -    static void AXISCALL s_GetSoapDeSerializer(void* pObj, 
  -        IWrapperSoapDeSerializer_C* pIWSDS)
  -    { ((IMessageData*)pObj)->getSoapDeSerializer
  -    ((IWrapperSoapDeSerializer**)&(pIWSDS->_object)); 
  -    pIWSDS->_functions = &(IWrapperSoapDeSerializer::ms_VFtable);};
  -    static void s_Initialize()
  -    {
  -        ms_VFtable.getOperationName = s_GetOperationName;
  -        ms_VFtable.getSoapSerializer = s_GetSoapSerializer;
  -        ms_VFtable.getSoapDeSerializer = s_GetSoapDeSerializer;
  -    }
   };
   
   AXIS_CPP_NAMESPACE_END
   
   #endif
  -
  -#endif 
  -
   
   
   
  
  
  
  1.3       +0 -1      ws-axis/c/include/axis/server/IParam.hpp
  
  Index: IParam.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/IParam.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IParam.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ IParam.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -21,7 +21,6 @@
   #include "AxisWrapperAPI.hpp"
   #include "TypeMapping.hpp"
   #include "time.h"
  -
   #include <string>
   
   AXIS_CPP_NAMESPACE_START
  
  
  
  1.4       +0 -398    ws-axis/c/include/axis/server/IWrapperSoapDeSerializer.hpp
  
  Index: IWrapperSoapDeSerializer.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/IWrapperSoapDeSerializer.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IWrapperSoapDeSerializer.hpp	28 Oct 2004 11:14:00 -0000	1.3
  +++ IWrapperSoapDeSerializer.hpp	29 Oct 2004 15:34:55 -0000	1.4
  @@ -20,137 +20,8 @@
   #include "AxisUserAPI.hpp"
   #include "TypeMapping.hpp"
   #include "WSDDDefines.hpp"
  -
  -#ifdef __cplusplus
  -
   #include "ISoapDeSerializer.hpp"
   
  -#endif
  -
  -typedef struct {
  -    int (AXISCALL* checkMessageBody)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    void* (AXISCALL* checkForFault)(void* pObj, const AxisChar* pName,
  -		            const AxisChar* pNamespace);
  -    /* Method used by wrappers to get a deserialized Array of complex types */
  -    Axis_Array (AXISCALL* getCmplxArray)(void* pObj, void* pDZFunct, 
  -        void* pCreFunct, void* pDelFunct, void* pSizeFunct, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    /* Method used by wrappers to get a deserialized Array of basic types */
  -    Axis_Array (AXISCALL* getBasicArray)(void* pObj, XSDTYPE nType, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    /* Method used by wrappers to get a deserialized single object of 
  -     * complex type 
  -     */
  -    void* (AXISCALL* getCmplxObject)(void* pObj, void* pDZFunct, 
  -        void* pCreFunct, void* pDelFunct, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    
  -    /* Methods used by wrappers to get a deserialized value of basic types */
  -    int (AXISCALL* getElementAsInt)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    int (AXISCALL* getFaultDetail)(void* pObj, char** ppcDetail);
  -    xsd__boolean (AXISCALL* getElementAsBoolean)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    unsigned int (AXISCALL* getElementAsUnsignedInt)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    short (AXISCALL* getElementAsShort)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    unsigned short (AXISCALL* getElementAsUnsignedShort)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    char (AXISCALL* getElementAsByte)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    unsigned char (AXISCALL* getElementAsUnsignedByte)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    long (AXISCALL* getElementAsLong)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    long (AXISCALL* getElementAsInteger)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    unsigned long (AXISCALL* getElementAsUnsignedLong)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    float (AXISCALL* getElementAsFloat)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    double (AXISCALL* getElementAsDouble)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    double (AXISCALL* getElementAsDecimal)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    AxisChar* (AXISCALL* getElementAsString)(void* pObj, const AxisChar* pName,
  -        const AxisChar* pNamespace);
  -    AxisChar* (AXISCALL* getElementAsAnyURI)(void* pObj, const AxisChar* pName,
  -        const AxisChar* pNamespace);
  -    AxisChar* (AXISCALL* getElementAsQName)(void* pObj, const AxisChar* pName,
  -        const AxisChar* pNamespace);
  -    xsd__hexBinary (AXISCALL* getElementAsHexBinary)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    xsd__base64Binary (AXISCALL* getElementAsBase64Binary)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    struct tm (AXISCALL* getElementAsDateTime)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    struct tm (AXISCALL* getElementAsDate)(void* pObj, const AxisChar* pName,
  -        const AxisChar* pNamespace);
  -    struct tm (AXISCALL* getElementAsTime)(void* pObj, const AxisChar* pName,
  -        const AxisChar* pNamespace);
  -    long (AXISCALL* getElementAsDuration)(void* pObj, const AxisChar* pName,
  -        const AxisChar* pNamespace);
  -
  -    int (AXISCALL* getAttributeAsInt)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    xsd__boolean (AXISCALL* getAttributeAsBoolean)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    unsigned int (AXISCALL* getAttributeAsUnsignedInt)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    short (AXISCALL* getAttributeAsShort)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    unsigned short (AXISCALL* getAttributeAsUnsignedShort)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    char (AXISCALL* getAttributeAsByte)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    unsigned char (AXISCALL* getAttributeAsUnsignedByte)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    long (AXISCALL* getAttributeAsLong)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    long (AXISCALL* getAttributeAsInteger)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    unsigned long (AXISCALL* getAttributeAsUnsignedLong)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    float (AXISCALL* getAttributeAsFloat)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    double (AXISCALL* getAttributeAsDouble)(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -    double (AXISCALL* getAttributeAsDecimal)(void* pObj, const AxisChar* pName,
  -        const AxisChar* pNamespace);
  -    AxisChar* (AXISCALL* getAttributeAsString)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    AxisChar* (AXISCALL* getAttributeAsAnyURI)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    AxisChar* (AXISCALL* getAttributeAsQName)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    xsd__hexBinary (AXISCALL* getAttributeAsHexBinary)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    xsd__base64Binary (AXISCALL* getAttributeAsBase64Binary)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    struct tm (AXISCALL* getAttributeAsDateTime)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -    struct tm (AXISCALL* getAttributeAsDate)(void* pObj, const AxisChar* pName,
  -        const AxisChar* pNamespace);
  -    struct tm (AXISCALL* getAttributeAsTime)(void* pObj, const AxisChar* pName,
  -        const AxisChar* pNamespace);
  -    long (AXISCALL* getAttributeAsDuration)(void* pObj, const AxisChar* pName,
  -        const AxisChar* pNamespace);
  -    int (AXISCALL* getStatus)(void* pObj);
  -    AnyType* (AXISCALL* getAnyObject)(void* pObj);
  -    void (AXISCALL* getChardataAs)(void* pObj, void* pValue, XSDTYPE type);
  -} IWrapperSoapDeSerializerFunctions;
  -
  -typedef struct { 
  -    void* _object; /* this will be C++ SoapDeSerializer Object */
  -    IWrapperSoapDeSerializerFunctions* _functions; 
  -    /* this is the static function table */
  -} IWrapperSoapDeSerializer_C;
  -
  -#ifndef __cplusplus
  -typedef IWrapperSoapDeSerializer_C IWrapperSoapDeSerializer;
  -#else
   /**
       @class IWrapperSoapDeSerializer
       @brief interface for the IWrapperSoapDeSerializer class.
  @@ -288,276 +159,7 @@
       virtual int getHeader()=0;    
   	virtual AnyType* AXISCALL getAnyObject()=0;            
       virtual void getChardataAs(void* pValue, XSDTYPE type)=0;
  -
  -    /* following stuff is needed to provide the interface for C web services */
  -public:
  -    static IWrapperSoapDeSerializerFunctions ms_VFtable;
  -    static int AXISCALL s_CheckMessageBody(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace)
  -    {return ((IWrapperSoapDeSerializer*)pObj)->checkMessageBody(pName, 
  -    pNamespace);};
  -    static void* AXISCALL s_CheckForFault(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace)
  -    {return ((IWrapperSoapDeSerializer*)pObj)->checkForFault(pName, 
  -    pNamespace);};
  -    static Axis_Array AXISCALL s_GetCmplxArray(void* pObj, void* pDZFunct, 
  -        void* pCreFunct, void* pDelFunct, void* pSizeFunct, const AxisChar* 
  -        pName, const AxisChar* pNamespace)
  -    {return ((IWrapperSoapDeSerializer*)pObj)->getCmplxArray(pDZFunct, 
  -    pCreFunct, pDelFunct, pSizeFunct, pName, pNamespace);};
  -    static Axis_Array AXISCALL s_GetBasicArray(void* pObj, XSDTYPE nType, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    {return ((IWrapperSoapDeSerializer*)pObj)->getBasicArray(nType, pName, 
  -    pNamespace);};
  -    static void* AXISCALL s_GetCmplxObject(void* pObj, void* pDZFunct, 
  -        void* pCreFunct, void* pDelFunct, const AxisChar* pName, 
  -        const AxisChar* pNamespace)
  -    {return ((IWrapperSoapDeSerializer*)pObj)->getCmplxObject(pDZFunct, 
  -    pCreFunct, pDelFunct, pName, pNamespace);};
  -    static int AXISCALL s_GetElementAsInt(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsInt(pName, 
  -    pNamespace);};
  -    static int AXISCALL s_GetFaultDetail(void* pObj, char** ppcDetail)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getFaultDetail(ppcDetail);};
  -    static xsd__boolean AXISCALL s_GetElementAsBoolean(void* pObj, const 
  -        AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsBoolean(pName, 
  -    pNamespace);};
  -    static unsigned int AXISCALL s_GetElementAsUnsignedInt(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsUnsignedInt(pName, 
  -    pNamespace);};
  -    static short AXISCALL s_GetElementAsShort(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsShort(pName, 
  -    pNamespace);};
  -    static unsigned short AXISCALL s_GetElementAsUnsignedShort(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsUnsignedShort
  -    (pName, pNamespace);};
  -    static char AXISCALL s_GetElementAsByte(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsByte(pName, 
  -    pNamespace);};
  -    static unsigned char AXISCALL s_GetElementAsUnsignedByte(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsUnsignedByte(pName,
  -    pNamespace);};
  -    static long AXISCALL s_GetElementAsLong(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsLong(pName, 
  -    pNamespace);};
  -    static long AXISCALL s_GetElementAsInteger(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsInteger(pName, 
  -    pNamespace);};
  -    static unsigned long AXISCALL s_GetElementAsUnsignedLong(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsUnsignedLong(pName,
  -    pNamespace);};
  -    static float AXISCALL s_GetElementAsFloat(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsFloat(pName, 
  -    pNamespace);};
  -    static double AXISCALL s_GetElementAsDouble(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsDouble(pName, 
  -    pNamespace);};
  -    static double AXISCALL s_GetElementAsDecimal(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsDecimal(pName, 
  -    pNamespace);};
  -    static AxisChar* AXISCALL s_GetElementAsString(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsString(pName, 
  -    pNamespace);};
  -    static AxisChar* AXISCALL s_GetElementAsAnyURI(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsAnyURI(pName, 
  -    pNamespace);};
  -    static AxisChar* AXISCALL s_GetElementAsQName(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsQName(pName, 
  -    pNamespace);};
  -    static xsd__hexBinary AXISCALL s_GetElementAsHexBinary(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsHexBinary(pName, 
  -    pNamespace);};
  -    static xsd__base64Binary AXISCALL s_GetElementAsBase64Binary(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsBase64Binary(pName,
  -    pNamespace);};
  -    static struct tm AXISCALL s_GetElementAsDateTime(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsDateTime(pName, 
  -    pNamespace);};
  -    static struct tm AXISCALL s_GetElementAsDate(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsDate(pName, 
  -    pNamespace);};
  -    static struct tm AXISCALL s_GetElementAsTime(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsTime(pName, 
  -    pNamespace);};
  -    static long AXISCALL s_GetElementAsDuration(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getElementAsDuration(pName, 
  -    pNamespace);};
  -    static int AXISCALL s_GetAttributeAsInt(void* pObj, const AxisChar* pName, 
  -        const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsInt(pName, 
  -    pNamespace);};
  -    static xsd__boolean AXISCALL s_GetAttributeAsBoolean(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsBoolean(pName, 
  -    pNamespace);};
  -    static unsigned int AXISCALL s_GetAttributeAsUnsignedInt(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsUnsignedInt
  -    (pName, pNamespace);};
  -    static short AXISCALL s_GetAttributeAsShort(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsShort(pName, 
  -    pNamespace);};
  -    static unsigned short AXISCALL s_GetAttributeAsUnsignedShort(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsUnsignedShort
  -    (pName, pNamespace);};
  -    static char AXISCALL s_GetAttributeAsByte(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsByte(pName, 
  -    pNamespace);};
  -    static unsigned char AXISCALL s_GetAttributeAsUnsignedByte(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsUnsignedByte
  -    (pName, pNamespace);};
  -    static long AXISCALL s_GetAttributeAsLong(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsLong(pName, 
  -    pNamespace);};
  -    static long AXISCALL s_GetAttributeAsInteger(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsInteger(pName, 
  -    pNamespace);};
  -    static unsigned long AXISCALL s_GetAttributeAsUnsignedLong(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsUnsignedLong
  -    (pName, pNamespace);};
  -    static float AXISCALL s_GetAttributeAsFloat(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsFloat(pName, 
  -    pNamespace);};
  -    static double AXISCALL s_GetAttributeAsDouble(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsDouble(pName, 
  -    pNamespace);};
  -    static double AXISCALL s_GetAttributeAsDecimal(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsDecimal(pName, 
  -    pNamespace);};
  -    static AxisChar* AXISCALL s_GetAttributeAsString(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsString(pName, 
  -    pNamespace);};
  -    static AxisChar* AXISCALL s_GetAttributeAsAnyURI(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsAnyURI(pName, 
  -    pNamespace);};
  -    static AxisChar* AXISCALL s_GetAttributeAsQName(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsQName(pName, 
  -    pNamespace);};
  -    static xsd__hexBinary AXISCALL s_GetAttributeAsHexBinary(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsHexBinary(pName, 
  -    pNamespace);};
  -    static xsd__base64Binary AXISCALL s_GetAttributeAsBase64Binary(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsBase64Binary
  -    (pName, pNamespace);};
  -    static struct tm AXISCALL s_GetAttributeAsDateTime(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsDateTime(pName, 
  -    pNamespace);};
  -    static struct tm AXISCALL s_GetAttributeAsDate(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsDate(pName, 
  -    pNamespace);};
  -    static struct tm AXISCALL s_GetAttributeAsTime(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsTime(pName, 
  -    pNamespace);};
  -    static long AXISCALL s_GetAttributeAsDuration(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getAttributeAsDuration(pName, 
  -    pNamespace);};
  -    static int AXISCALL s_GetStatus(void* pObj)
  -    { return ((IWrapperSoapDeSerializer*)pObj)->getStatus();};
  -	static 	AnyType* AXISCALL s_GetAnyObject(void* pObj)
  -	{ return ((IWrapperSoapDeSerializer*)pObj)->getAnyObject();};
  -    static void AXISCALL s_GetChardataAs(void* pObj, void* pValue, XSDTYPE type)
  -    { ((IWrapperSoapDeSerializer*)pObj)->getChardataAs(pValue, type);};
  -
  -
  -    static void s_Initialize()
  -    {
  -        ms_VFtable.checkMessageBody = s_CheckMessageBody;
  -        ms_VFtable.checkForFault = s_CheckForFault;
  -        ms_VFtable.getCmplxArray = s_GetCmplxArray;
  -        ms_VFtable.getBasicArray = s_GetBasicArray;
  -        ms_VFtable.getCmplxObject = s_GetCmplxObject;
  -        ms_VFtable.getElementAsInt = s_GetElementAsInt;
  -        ms_VFtable.getFaultDetail = s_GetFaultDetail;
  -        ms_VFtable.getElementAsBoolean = s_GetElementAsBoolean;
  -        ms_VFtable.getElementAsUnsignedInt = s_GetElementAsUnsignedInt;
  -        ms_VFtable.getElementAsShort = s_GetElementAsShort;
  -        ms_VFtable.getElementAsUnsignedShort = s_GetElementAsUnsignedShort;
  -        ms_VFtable.getElementAsByte = s_GetElementAsByte;
  -        ms_VFtable.getElementAsUnsignedByte = s_GetElementAsUnsignedByte;
  -        ms_VFtable.getElementAsLong = s_GetElementAsLong;
  -        ms_VFtable.getElementAsInteger = s_GetElementAsInteger;
  -        ms_VFtable.getElementAsUnsignedLong = s_GetElementAsUnsignedLong;
  -        ms_VFtable.getElementAsFloat = s_GetElementAsFloat;
  -        ms_VFtable.getElementAsDouble = s_GetElementAsDouble;
  -        ms_VFtable.getElementAsDecimal = s_GetElementAsDecimal;
  -        ms_VFtable.getElementAsString = s_GetElementAsString;
  -        ms_VFtable.getElementAsAnyURI = s_GetElementAsAnyURI;
  -        ms_VFtable.getElementAsQName = s_GetElementAsQName;
  -        ms_VFtable.getElementAsHexBinary = s_GetElementAsHexBinary;
  -        ms_VFtable.getElementAsBase64Binary = s_GetElementAsBase64Binary;
  -        ms_VFtable.getElementAsDateTime = s_GetElementAsDateTime;
  -        ms_VFtable.getElementAsDate = s_GetElementAsDate;
  -        ms_VFtable.getElementAsTime = s_GetElementAsTime;
  -        ms_VFtable.getElementAsDuration = s_GetElementAsDuration;
  -        ms_VFtable.getAttributeAsInt = s_GetAttributeAsInt;
  -        ms_VFtable.getAttributeAsBoolean = s_GetAttributeAsBoolean;
  -        ms_VFtable.getAttributeAsUnsignedInt = s_GetAttributeAsUnsignedInt;
  -        ms_VFtable.getAttributeAsShort = s_GetAttributeAsShort;
  -        ms_VFtable.getAttributeAsUnsignedShort = s_GetAttributeAsUnsignedShort;
  -        ms_VFtable.getAttributeAsByte = s_GetAttributeAsByte;
  -        ms_VFtable.getAttributeAsUnsignedByte = s_GetAttributeAsUnsignedByte;
  -        ms_VFtable.getAttributeAsLong = s_GetAttributeAsLong;
  -        ms_VFtable.getAttributeAsInteger = s_GetAttributeAsInteger;
  -        ms_VFtable.getAttributeAsUnsignedLong = s_GetAttributeAsUnsignedLong;
  -        ms_VFtable.getAttributeAsFloat = s_GetAttributeAsFloat;
  -        ms_VFtable.getAttributeAsDouble = s_GetAttributeAsDouble;
  -        ms_VFtable.getAttributeAsDecimal = s_GetAttributeAsDecimal;
  -        ms_VFtable.getAttributeAsString = s_GetAttributeAsString;
  -        ms_VFtable.getAttributeAsAnyURI = s_GetAttributeAsAnyURI;
  -        ms_VFtable.getAttributeAsQName = s_GetAttributeAsQName;
  -        ms_VFtable.getAttributeAsHexBinary = s_GetAttributeAsHexBinary;
  -        ms_VFtable.getAttributeAsBase64Binary = s_GetAttributeAsBase64Binary;
  -        ms_VFtable.getAttributeAsDateTime = s_GetAttributeAsDateTime;
  -        ms_VFtable.getAttributeAsDate = s_GetAttributeAsDate;
  -        ms_VFtable.getAttributeAsTime = s_GetAttributeAsTime;
  -        ms_VFtable.getAttributeAsDuration = s_GetAttributeAsDuration;
  -        ms_VFtable.getStatus = s_GetStatus;
  -		ms_VFtable.getAnyObject = s_GetAnyObject;
  -        ms_VFtable.getChardataAs = s_GetChardataAs;
  -    }
   };
  -#endif
   
   AXIS_CPP_NAMESPACE_END
   
  
  
  
  1.3       +0 -209    ws-axis/c/include/axis/server/IWrapperSoapSerializer.hpp
  
  Index: IWrapperSoapSerializer.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/IWrapperSoapSerializer.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IWrapperSoapSerializer.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ IWrapperSoapSerializer.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -18,90 +18,10 @@
   #define _IWRAPPERSOAPSERIALIZER_H____OF_AXIS_INCLUDED_
   
   #include "AxisUserAPI.hpp"
  -#ifdef __cplusplus
   #include "TypeMapping.hpp"
   #include "ISoapSerializer.hpp"
   #include "WSDDDefines.hpp"
   
  -#endif
  -
  -typedef struct 
  -{
  -    int (AXISCALL* createSoapMethod)(void* pObj, const AxisChar* sLocalName, 
  -        const AxisChar* sURI);
  -
  -    int (AXISCALL* createSoapFault)(void* pObj, const AxisChar* sLocalName, 
  -        const AxisChar* sURI, const AxisChar* sFaultCode,
  -	const AxisChar* sFaultString);
  -
  -    const AxisChar* (AXISCALL* getNamespacePrefix)(void* pObj, 
  -        const AxisChar* pNamespace);
  -
  -    void (AXISCALL* removeNamespacePrefix)(void* pObj, 
  -        const AxisChar* pNamespace);
  -
  -    /* for basic types */
  -    int (AXISCALL* addOutputParam)(void* pObj, const AxisChar* pchName, 
  -        void* pValue, XSDTYPE type);
  -
  -    /* for arrays */
  -    int (AXISCALL* addOutputCmplxArrayParam)(void* pObj, 
  -        const Axis_Array* pArray, void* pSZFunct, void* pDelFunct, 
  -        void* pSizeFunct, const AxisChar* pName, const AxisChar* pNamespace);
  -
  -    int (AXISCALL* addOutputBasicArrayParam)(void* pObj, 
  -        const Axis_Array* pArray, XSDTYPE nType, const AxisChar* pName);
  -
  -    /* for complex types */
  -    int (AXISCALL* addOutputCmplxParam)(void* pObj, void* pObject, 
  -        void* pSZFunct, void* pDelFunct, const AxisChar* pName, 
  -        const AxisChar* pNamespace);
  -
  -    int (AXISCALL* addFaultDetail)(void* pObj, void* pObject, void* pSZFunct,
  -        void* pDelFunct, const AxisChar* pName, const AxisChar* pNamespace );
  -
  -    /* Methods used to serialize arrays */
  -    int (AXISCALL* serializeCmplxArray)(void* pObj, const Axis_Array* pArray, 
  -        void* pSZFunct, void* pDelFunct, void* pSizeFunct, 
  -        const AxisChar* pName, const AxisChar* pNamespace);
  -
  -    int (AXISCALL* serializeBasicArray)(void* pObj, 
  -        const Axis_Array* pArray, XSDTYPE nType, const AxisChar* pName);
  -
  -    /* Basic Type Serializing methods */
  -    int (AXISCALL* serializeAsElement)(void* pObj, const AxisChar* sName, 
  -        void* pValue, XSDTYPE type);
  -
  -    int (AXISCALL* serializeAsAttribute)(void* pObj, const AxisChar* sName, 
  -        const AxisChar* pNamespace, void* pValue, XSDTYPE type);
  -
  -    void (AXISCALL* serialize)(void* pObj, const char* pFirst);
  -
  -    void (AXISCALL* serializeStartElementOfType)(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace, 
  -        const AxisChar* pPrefix);
  -
  -    void (AXISCALL* serializeEndElementOfType)(void* pObj, 
  -        const AxisChar* pName);
  -
  -    int (AXISCALL* addOutputAnyObject)(void* pObj, AnyType* pAnyObject);
  -
  -    int (AXISCALL* serializeAnyObject)(void* pObj, AnyType* pAnyObject); 
  -    
  -    int (AXISCALL* serializeAsChardata)(void* pObj, void* pValue, XSDTYPE type);
  -
  -}IWrapperSoapSerializerFunctions;
  -
  -typedef struct 
  -{ 
  -    void* _object; /* this will be C++ SoapSerializer Object */
  -    IWrapperSoapSerializerFunctions* _functions; 
  -    /* this is the static function table */
  -} IWrapperSoapSerializer_C;
  -
  -#ifndef __cplusplus
  -typedef IWrapperSoapSerializer_C IWrapperSoapSerializer;
  -#else
   /*
    *  @class IWrapperSoapSerializer
    *  @brief interface for the IWrapperSoapSerializer class.
  @@ -201,138 +121,9 @@
       virtual int serializeAnyObject(AnyType* pAnyObject)=0;
   
       virtual int serializeAsChardata(void* pValue, XSDTYPE type)=0;
  -
  -    /* following stuff is needed to provide the interface for C web services */
  -public:
  -    static IWrapperSoapSerializerFunctions ms_VFtable;
  -
  -    static int AXISCALL s_CreateSoapMethod(void* pObj, 
  -        const AxisChar* sLocalName, const AxisChar* sURI)
  -    { return ((IWrapperSoapSerializer*)pObj)->createSoapMethod
  -    (sLocalName, sURI);};
  -
  -    static int AXISCALL s_CreateSoapFault(void* pObj, 
  -        const AxisChar* sLocalName, const AxisChar* sURI,
  -	const AxisChar* sFaultCode, const AxisChar* sFaultString)
  -    { return ((IWrapperSoapSerializer*)pObj)->createSoapFault
  -        (sLocalName, sURI, sFaultCode, sFaultString);};
  -
  -    static const AxisChar* AXISCALL s_GetNamespacePrefix(void* pObj, 
  -        const AxisChar* pNamespace)
  -    { return ((IWrapperSoapSerializer*)pObj)->getNamespacePrefix(pNamespace);};
  -
  -    static void AXISCALL s_RemoveNamespacePrefix(void* pObj, 
  -        const AxisChar* pNamespace)
  -    { ((IWrapperSoapSerializer*)pObj)->removeNamespacePrefix(pNamespace);};
  -
  -    static int AXISCALL s_AddOutputParam(void* pObj, const AxisChar* pchName, 
  -        void* pValue, XSDTYPE type)
  -    { return ((IWrapperSoapSerializer*)pObj)->addOutputParam
  -        (pchName, pValue, type);};
  -
  -    static int AXISCALL s_AddOutputCmplxArrayParam(void* pObj, 
  -        const Axis_Array* pArray, void* pSZFunct, void* pDelFunct, 
  -        void* pSizeFunct, const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapSerializer*)pObj)->addOutputCmplxArrayParam
  -    (pArray, pSZFunct, pDelFunct, pSizeFunct, pName, pNamespace);};
  -
  -    static int AXISCALL s_AddOutputBasicArrayParam(void* pObj, 
  -        const Axis_Array* pArray, XSDTYPE nType, const AxisChar* pName)
  -    { return ((IWrapperSoapSerializer*)pObj)->addOutputBasicArrayParam
  -    (pArray, nType, pName);};
  -
  -    static int AXISCALL s_AddOutputCmplxParam(void* pObj, void* pObject, 
  -        void* pSZFunct, void* pDelFunct, const AxisChar* pName, 
  -        const AxisChar* pNamespace)
  -    {   return ((IWrapperSoapSerializer*)pObj)->addOutputCmplxParam
  -        (pObject, pSZFunct, pDelFunct, pName, pNamespace);};
  -
  -    static int AXISCALL s_AddFaultDetail(void* pObj, void* pObject, 
  -        void* pSZFunct, void* pDelFunct, const AxisChar* pName, 
  -        const AxisChar* pNamespace)
  -    {   return ((IWrapperSoapSerializer*)pObj)->addFaultDetail
  -        (pObject, pSZFunct, pDelFunct, pName, pNamespace);};
  -    
  -    static int AXISCALL s_SerializeCmplxArray(void* pObj, 
  -        const Axis_Array* pArray, void* pSZFunct, void* pDelFunct, 
  -        void* pSizeFunct, const AxisChar* pName, const AxisChar* pNamespace)
  -    { return ((IWrapperSoapSerializer*)pObj)->serializeCmplxArray
  -    (pArray, pSZFunct, pDelFunct, pSizeFunct, pName, pNamespace);};
  -
  -    static int AXISCALL s_SerializeBasicArray(void* pObj, 
  -        const Axis_Array* pArray, XSDTYPE nType, const AxisChar* pName)
  -    { return ((IWrapperSoapSerializer*)pObj)->serializeBasicArray
  -    (pArray, nType, pName);};
  -
  -    static int AXISCALL s_SerializeAsElement(void* pObj, 
  -        const AxisChar* sName, void* pValue, XSDTYPE type)
  -    { return ((IWrapperSoapSerializer*)pObj)->serializeAsElement
  -    (sName, pValue, type);};
  -
  -    static int AXISCALL s_SerializeAsAttribute(void* pObj, 
  -        const AxisChar* sName, const AxisChar* pNamespace, 
  -        void* pValue, XSDTYPE type)
  -    { return ((IWrapperSoapSerializer*)pObj)->serializeAsAttribute
  -    (sName, pNamespace, pValue, type);};
  -
  -    static void AXISCALL s_Serialize(void* pObj, const char* pFirst)
  -    { ((IWrapperSoapSerializer*)pObj)->serialize(pFirst, 0);};
  -
  -    static void AXISCALL s_SerializeStartElementOfType(void* pObj, 
  -        const AxisChar* pName, const AxisChar* pNamespace, 
  -        const AxisChar* pPrefix)
  -    { ((IWrapperSoapSerializer*)pObj)->serializeStartElementOfType
  -    (pName, pNamespace, pPrefix);}
  -
  -    static void AXISCALL s_SerializeEndElementOfType(void* pObj, 
  -        const AxisChar* pName)
  -    { ((IWrapperSoapSerializer*)pObj)->serializeEndElementOfType(pName);}
  -
  -    static int AXISCALL s_AddOutputAnyObject(void* pObj,
  -        AnyType* pAnyObject)
  -    {
  -        return ((IWrapperSoapSerializer*)pObj)->addOutputAnyObject(pAnyObject);
  -    }
  -
  -    static int AXISCALL s_SerializeAnyObject(void* pObj,
  -        AnyType* pAnyObject)
  -    {
  -        return ((IWrapperSoapSerializer*)pObj)->serializeAnyObject(pAnyObject);
  -    }
  -
  -    static int AXISCALL s_SerializeAsChardata(void* pObj,
  -        void* pValue, XSDTYPE type)
  -    {
  -        return ((IWrapperSoapSerializer*)pObj)->serializeAsChardata(pValue, type);
  -    }
  -
  -    static void s_Initialize()
  -    {
  -        ms_VFtable.createSoapMethod = s_CreateSoapMethod;
  -        ms_VFtable.createSoapFault = s_CreateSoapFault;
  -        ms_VFtable.getNamespacePrefix = s_GetNamespacePrefix;
  -        ms_VFtable.removeNamespacePrefix = s_RemoveNamespacePrefix;
  -        ms_VFtable.addOutputParam = s_AddOutputParam;
  -        ms_VFtable.addOutputCmplxArrayParam = s_AddOutputCmplxArrayParam;
  -        ms_VFtable.addOutputBasicArrayParam = s_AddOutputBasicArrayParam;
  -        ms_VFtable.addOutputCmplxParam = s_AddOutputCmplxParam;
  -        ms_VFtable.addFaultDetail = s_AddFaultDetail;
  -        ms_VFtable.serializeCmplxArray = s_SerializeCmplxArray;
  -        ms_VFtable.serializeBasicArray = s_SerializeBasicArray;
  -        ms_VFtable.serializeAsElement = s_SerializeAsElement;
  -        ms_VFtable.serializeAsAttribute = s_SerializeAsAttribute;
  -        ms_VFtable.serialize = s_Serialize;
  -        ms_VFtable.serializeStartElementOfType = s_SerializeStartElementOfType;
  -        ms_VFtable.serializeEndElementOfType = s_SerializeEndElementOfType;
  -        ms_VFtable.addOutputAnyObject = s_AddOutputAnyObject;
  -        ms_VFtable.serializeAnyObject = s_SerializeAnyObject;
  -        ms_VFtable.serializeAsChardata = s_SerializeAsChardata;
  -    }
   };
   
   AXIS_CPP_NAMESPACE_END
   
   #endif
  -#endif 
  -
   
  
  
  
  1.3       +0 -4      ws-axis/c/include/axis/server/Packet.hpp
  
  Index: Packet.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/Packet.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Packet.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ Packet.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -248,10 +248,8 @@
    */
   #define NO_OF_SERIALIZE_BUFFERS 20
   
  -#ifdef __cplusplus
   extern "C"
   {
  -#endif
   /*
    * Functions to manipulate Ax_soapstream object. Implemented in Packet.cpp
    *
  @@ -303,9 +301,7 @@
                                               const void* bufferid, 
                                               const void* stream);
   
  -#ifdef __cplusplus
   }
  -#endif
   
   #endif
   
  
  
  
  1.2       +0 -4      ws-axis/c/include/axis/server/SoapEnvVersions.hpp
  
  Index: SoapEnvVersions.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/SoapEnvVersions.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SoapEnvVersions.hpp	25 Oct 2004 13:39:28 -0000	1.1
  +++ SoapEnvVersions.hpp	29 Oct 2004 15:34:55 -0000	1.2
  @@ -62,8 +62,6 @@
       VERSION_LAST
   } SOAP_VERSION;
   
  -#ifdef __cplusplus
  -
   AXIS_CPP_NAMESPACE_START
   
   class Attribute;
  @@ -130,6 +128,4 @@
       }
   };
   #endif
  -
  -#endif 
   
  
  
  
  1.3       +2 -9      ws-axis/c/include/axis/server/TypeMapping.hpp
  
  Index: TypeMapping.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/TypeMapping.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TypeMapping.hpp	26 Oct 2004 09:11:04 -0000	1.2
  +++ TypeMapping.hpp	29 Oct 2004 15:34:55 -0000	1.3
  @@ -23,6 +23,8 @@
   #define _TYPEMAPPING_H____OF_AXIS_INCLUDED_
   
   #include "GDefine.hpp"
  +#include <map>
  +#include <string>
   
   typedef enum XSDTYPETag 
   { XSD_UNKNOWN=1, XSD_INT, XSD_FLOAT, XSD_STRING, XSD_LONG, XSD_SHORT, \
  @@ -38,11 +40,6 @@
                   XSD_ARRAY, USER_TYPE, ACCESSOR, XSD_NMTOKEN, XSD_ANY
   } XSDTYPE;
   
  -#ifdef __cplusplus
  -
  -#include <map>
  -#include <string>
  -
   AXIS_CPP_NAMESPACE_START
   
   using namespace std;
  @@ -75,7 +72,3 @@
   AXIS_CPP_NAMESPACE_END
   
   #endif
  -
  -#endif 
  -
  -
  
  
  
  1.28      +5 -26     ws-axis/c/src/common/ArrayBean.cpp
  
  Index: ArrayBean.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/ArrayBean.cpp,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ArrayBean.cpp	23 Sep 2004 15:12:56 -0000	1.27
  +++ ArrayBean.cpp	29 Oct 2004 15:34:55 -0000	1.28
  @@ -180,21 +180,10 @@
                   pItem = reinterpret_cast<void*>(ptrval+x*itemsize);
                   pSZ.serialize("<", m_ItemName.c_str(), NULL); 
                   /* note : ">" is not serialized to enable the type's serializer
  -		 * to add attributes 
  -		 */
  -                if (C_DOC_PROVIDER == pSZ.getCurrentProviderType())
  -                {
  -                    IWrapperSoapSerializer_C cWSS;
  -                    cWSS._object = &pSZ;
  -                    cWSS._functions = &IWrapperSoapSerializer::ms_VFtable;
  -                    m_value.cta->pSZFunct(pItem, &cWSS, true); 
  -                    /* no matter true or false is passed */
  -                }
  -                else
  -                {
  -                    m_value.cta->pSZFunct(pItem, &pSZ, true); 
  -                    /* no matter true or false is passed */
  -                }
  +                 * to add attributes 
  +                 */
  +                m_value.cta->pSZFunct(pItem, &pSZ, true); 
  +                /* no matter true or false is passed */
                   pSZ.serialize("</", m_ItemName.c_str(), ">", NULL);
               }
           }
  @@ -209,17 +198,7 @@
               for (int x=0; x<m_nSize; x++)
               {
                   pItem = reinterpret_cast<void*>(ptrval+x*itemsize);
  -                if (C_RPC_PROVIDER == pSZ.getCurrentProviderType())
  -                {
  -                    IWrapperSoapSerializer_C cWSS;
  -                    cWSS._object = &pSZ;
  -                    cWSS._functions = &IWrapperSoapSerializer::ms_VFtable;
  -                    m_value.cta->pSZFunct(pItem, &cWSS, true); 
  -                }
  -                else
  -                {
  -                    m_value.cta->pSZFunct(pItem, &pSZ, true);
  -                }
  +                m_value.cta->pSZFunct(pItem, &pSZ, true);
               }
           }
       }
  
  
  
  1.28      +0 -1      ws-axis/c/src/common/MessageData.cpp
  
  Index: MessageData.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/MessageData.cpp,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- MessageData.cpp	23 Sep 2004 15:12:56 -0000	1.27
  +++ MessageData.cpp	29 Oct 2004 15:34:55 -0000	1.28
  @@ -29,7 +29,6 @@
   AXIS_CPP_NAMESPACE_START
   
   const AxisChar* MessageData::m_pachBlankPropertyValue = "";
  -IMessageDataFunctions IMessageData::ms_VFtable;
   AdminUtils MessageData::m_AdminUtil;
   
   MessageData::MessageData ()
  
  
  
  1.41      +5 -29     ws-axis/c/src/common/Param.cpp
  
  Index: Param.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/Param.cpp,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- Param.cpp	26 Oct 2004 09:37:57 -0000	1.40
  +++ Param.cpp	29 Oct 2004 15:34:55 -0000	1.41
  @@ -159,39 +159,15 @@
   	case USER_TYPE:
               if (RPC_ENCODED == pSZ.getStyle ())
               {
  -                if (C_RPC_PROVIDER == pSZ.getCurrentProviderType ())
  -                {
  -                    IWrapperSoapSerializer_C cWSS;
  -                    cWSS._object = &pSZ;
  -                    cWSS._functions = &IWrapperSoapSerializer::ms_VFtable;
  -                    m_Value.pCplxObj->pSZFunct (m_Value.pCplxObj->pObject,
  -                        &cWSS, false);
  -                }
  -                else
  -                {
  -                    m_Value.pCplxObj->pSZFunct (m_Value.pCplxObj->pObject,
  -                                                  &pSZ, false);
  -                }
  +                m_Value.pCplxObj->pSZFunct (m_Value.pCplxObj->pObject, &pSZ, false);
               }
               else
               {
                   pSZ.serialize ("<", m_sName.c_str (), NULL); 
  -		/* note : ">" is not serialized to enable the type's serializer
  -		 * to add attributes 
  -		 */
  -                if (C_DOC_PROVIDER == pSZ.getCurrentProviderType ())
  -                {
  -                    IWrapperSoapSerializer_C cWSS;
  -                    cWSS._object = &pSZ;
  -                    cWSS._functions = &IWrapperSoapSerializer::ms_VFtable;
  -                    m_Value.pCplxObj->pSZFunct (m_Value.pCplxObj->pObject,
  -                        &cWSS, false);
  -                }
  -                else
  -                {
  -                    m_Value.pCplxObj->pSZFunct (m_Value.pCplxObj->pObject,
  -                        &pSZ, false);
  -                }
  +                /* note : ">" is not serialized to enable the type's serializer
  +                 * to add attributes 
  +                 */
  +                m_Value.pCplxObj->pSZFunct (m_Value.pCplxObj->pObject, &pSZ, false);
                   pSZ.serialize ("</", m_sName.c_str (), ">", NULL);
               }
               break;
  
  
  
  1.78      +0 -3      ws-axis/c/src/engine/Axis.cpp
  
  Index: Axis.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/Axis.cpp,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- Axis.cpp	29 Oct 2004 09:53:35 -0000	1.77
  +++ Axis.cpp	29 Oct 2004 15:34:56 -0000	1.78
  @@ -254,9 +254,6 @@
       TypeMapping::initialize ();
       URIMapping::initialize ();
       SoapFault::initialize ();
  -    IWrapperSoapDeSerializer::s_Initialize ();
  -    IWrapperSoapSerializer::s_Initialize ();
  -    IMessageData::s_Initialize ();
       ModuleInitialize ();
       if (bServer) // no client side wsdd processing at the moment
       {
  
  
  
  1.24      +6 -5      ws-axis/c/src/engine/server/ServerAxisEngine.cpp
  
  Index: ServerAxisEngine.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/server/ServerAxisEngine.cpp,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ServerAxisEngine.cpp	20 Oct 2004 09:14:36 -0000	1.23
  +++ ServerAxisEngine.cpp	29 Oct 2004 15:34:57 -0000	1.24
  @@ -420,11 +420,12 @@
               if (0 != m_pWebService->_functions)
               /* C web service */
               {
  -                IMessageData_C cMC = { 0, 0 };
  -                cMC._object = pMsg;
  -                cMC._functions = &IMessageData::ms_VFtable;
  -                Status = m_pWebService->_functions->invoke (m_pWebService->
  -                    _object, &cMC);
  +                // Disable C support
  +                //IMessageData_C cMC = { 0, 0 };
  +                //cMC._object = pMsg;
  +                //cMC._functions = &IMessageData::ms_VFtable;
  +                //Status = m_pWebService->_functions->invoke (m_pWebService->
  +                //    _object, &cMC);
               }
               else if (0 != m_pWebService->_object)
               {
  
  
  
  1.26      +0 -3      ws-axis/c/src/soap/Attribute.cpp
  
  Index: Attribute.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/Attribute.cpp,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Attribute.cpp	26 Oct 2004 10:40:55 -0000	1.25
  +++ Attribute.cpp	29 Oct 2004 15:34:57 -0000	1.26
  @@ -43,9 +43,6 @@
   
   AXIS_CPP_NAMESPACE_START
   
  -AttributeFunctions Attribute::ms_VFtable;
  -bool Attribute::bInitialized = false;
  -
   Attribute::Attribute()
   {
       
  
  
  
  1.27      +2 -3      ws-axis/c/src/soap/ComplexElement.cpp
  
  Index: ComplexElement.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/ComplexElement.cpp,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ComplexElement.cpp	26 Oct 2004 10:40:55 -0000	1.26
  +++ ComplexElement.cpp	29 Oct 2004 15:34:57 -0000	1.27
  @@ -41,11 +41,10 @@
   
   /* ComplexElement.cpp: implementation of the ComplexElement class. */
   
  -
  -#include "ComplexElement.h"
  -#include "SoapSerializer.h"
   #include <axis/server/GDefine.hpp>
   #include <axis/server/Attribute.hpp>
  +#include "ComplexElement.h"
  +#include "SoapSerializer.h"
   
   AXIS_CPP_NAMESPACE_START
   
  
  
  
  1.34      +0 -3      ws-axis/c/src/soap/HeaderBlock.cpp
  
  Index: HeaderBlock.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/HeaderBlock.cpp,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- HeaderBlock.cpp	26 Oct 2004 10:40:55 -0000	1.33
  +++ HeaderBlock.cpp	29 Oct 2004 15:34:58 -0000	1.34
  @@ -62,9 +62,6 @@
   
   AXIS_CPP_NAMESPACE_START
   
  -HeaderBlockFunctions IHeaderBlock::ms_VFtable;
  -bool IHeaderBlock::bInitialized = false;
  -
   HeaderBlock::HeaderBlock()
   {
       iNoOFChildren = 0;
  
  
  
  1.94      +33 -29    ws-axis/c/src/soap/SoapDeSerializer.cpp
  
  Index: SoapDeSerializer.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.cpp,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- SoapDeSerializer.cpp	26 Oct 2004 10:40:55 -0000	1.93
  +++ SoapDeSerializer.cpp	29 Oct 2004 15:34:58 -0000	1.94
  @@ -73,8 +73,6 @@
   
   #define INITIAL_ARRAY_SIZE 1
   
  -IWrapperSoapDeSerializerFunctions IWrapperSoapDeSerializer::ms_VFtable;
  -
   SoapDeSerializer::SoapDeSerializer()
   {
   	m_pParser = XMLParserFactory::getParserObject();
  @@ -519,10 +517,11 @@
                   pItem = reinterpret_cast<void*>(ptrval+nIndex*itemsize);
                   if (C_RPC_PROVIDER == getCurrentProviderType())
                   {
  -                    IWrapperSoapDeSerializer_C cWSD;
  -                    cWSD._object = this;
  -                    cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  -                    ((AXIS_DESERIALIZE_FUNCT)pDZFunct)(pItem, &cWSD);
  +                    // Disable C support
  +                    //IWrapperSoapDeSerializer_C cWSD;
  +                    //cWSD._object = this;
  +                    //cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  +                    //((AXIS_DESERIALIZE_FUNCT)pDZFunct)(pItem, &cWSD);
                   }
                   else
                   {
  @@ -577,11 +576,12 @@
                       pItem = reinterpret_cast<void*>(ptrval+nIndex*itemsize);
                       if (C_DOC_PROVIDER == getCurrentProviderType())
                       {
  -                        IWrapperSoapDeSerializer_C cWSD;
  -                        cWSD._object = this;
  -                        cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  -                        m_nStatus = ((AXIS_DESERIALIZE_FUNCT)pDZFunct)
  -                            (pItem, &cWSD);
  +                        // Disable C support
  +                        //IWrapperSoapDeSerializer_C cWSD;
  +                        //cWSD._object = this;
  +                        //cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  +                        //m_nStatus = ((AXIS_DESERIALIZE_FUNCT)pDZFunct)
  +                        //   (pItem, &cWSD);
                       }
                       else
                       {
  @@ -1169,10 +1169,11 @@
           {
               if (C_RPC_PROVIDER == getCurrentProviderType())
               {
  -                IWrapperSoapDeSerializer_C cWSD;
  -                cWSD._object = this;
  -                cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  -                m_nStatus = ((AXIS_DESERIALIZE_FUNCT)pDZFunct)(pObject, &cWSD);
  +                // Disable C support
  +                //IWrapperSoapDeSerializer_C cWSD;
  +                //cWSD._object = this;
  +                //cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  +                //m_nStatus = ((AXIS_DESERIALIZE_FUNCT)pDZFunct)(pObject, &cWSD);
               }
               else
               {
  @@ -1222,11 +1223,12 @@
               {
                   if (C_DOC_PROVIDER == getCurrentProviderType())
                   {
  -                    IWrapperSoapDeSerializer_C cWSD;
  -                    cWSD._object = this;
  -                    cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  -                    m_nStatus = ((AXIS_DESERIALIZE_FUNCT)pDZFunct)
  -                        (pObject, &cWSD);
  +                    // Disable C support
  +                    //IWrapperSoapDeSerializer_C cWSD;
  +                    //cWSD._object = this;
  +                    //cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  +                    //m_nStatus = ((AXIS_DESERIALIZE_FUNCT)pDZFunct)
  +                    //    (pObject, &cWSD);
                   }
                   else
                   {
  @@ -1302,10 +1304,11 @@
           {
               if (C_RPC_PROVIDER == getCurrentProviderType())
               {
  -                IWrapperSoapDeSerializer_C cWSD;
  -                cWSD._object = this;
  -                cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  -                m_nStatus = ((AXIS_DESERIALIZE_FUNCT)pDZFunct)(pObject, &cWSD);
  +                // Disable C support
  +                //IWrapperSoapDeSerializer_C cWSD;
  +                //cWSD._object = this;
  +                //cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  +                //m_nStatus = ((AXIS_DESERIALIZE_FUNCT)pDZFunct)(pObject, &cWSD);
               }
               else
               {
  @@ -1349,11 +1352,12 @@
               {
                   if (C_DOC_PROVIDER == getCurrentProviderType())
                   {
  -                    IWrapperSoapDeSerializer_C cWSD;
  -                    cWSD._object = this;
  -                    cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  -                    m_nStatus = ((AXIS_DESERIALIZE_FUNCT)pDZFunct)
  -                        (pObject, &cWSD);
  +                    // Disable C support
  +                    //IWrapperSoapDeSerializer_C cWSD;
  +                    //cWSD._object = this;
  +                    //cWSD._functions = &IWrapperSoapDeSerializer::ms_VFtable;
  +                    //m_nStatus = ((AXIS_DESERIALIZE_FUNCT)pDZFunct)
  +                    //    (pObject, &cWSD);
                   }
                   else
                   {
  
  
  
  1.72      +0 -2      ws-axis/c/src/soap/SoapSerializer.cpp
  
  Index: SoapSerializer.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.cpp,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- SoapSerializer.cpp	26 Oct 2004 10:40:56 -0000	1.71
  +++ SoapSerializer.cpp	29 Oct 2004 15:34:58 -0000	1.72
  @@ -46,8 +46,6 @@
   
   AXIS_CPP_NAMESPACE_START
   
  -IWrapperSoapSerializerFunctions IWrapperSoapSerializer::ms_VFtable;
  -
   SoapSerializer::SoapSerializer()
   {
       m_pSoapEnvelope = NULL;
  
  
  

Mime
View raw message