ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From di...@apache.org
Subject cvs commit: ws-axis/c/src/engine/client Call.cpp
Date Tue, 22 Mar 2005 14:24:23 GMT
dicka       2005/03/22 06:24:23

  Modified:    c/include/axis IMessageData.hpp
               c/src/common MessageData.cpp MessageData.h
               c/src/engine Axis.cpp AxisEngine.cpp AxisEngine.h
               c/src/engine/client Call.cpp
  Log:
  Backing out recent changes, as they broke the compilation of all the automated tests.  In
addition they would prevent customers from compiling clients stubs (and probably also server
skeletons) due to dependency from include/ files to src/ files, which are not available to
the customer.
  
  IMessageData.hpp must not be dependent on anything that is outside the include/axis tree.
 Is there an alternative, or do we need to seperate out a portion of the included file, such
that it is suitable to be kept within the include/axis tree.
  
  Submitted by: Adrian Dick
  
  Revision  Changes    Path
  1.6       +0 -7      ws-axis/c/include/axis/IMessageData.hpp
  
  Index: IMessageData.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/IMessageData.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- IMessageData.hpp	22 Mar 2005 04:11:48 -0000	1.5
  +++ IMessageData.hpp	22 Mar 2005 14:24:23 -0000	1.6
  @@ -22,8 +22,6 @@
   #include "IHandlerSoapSerializer.hpp"
   #include "IWrapperSoapDeSerializer.hpp"
   #include "IWrapperSoapSerializer.hpp"
  -#include "../../src/transport/SOAPTransport.h"
  -
   
   AXIS_CPP_NAMESPACE_START
   
  @@ -62,11 +60,6 @@
       virtual string& getUserName()=0;
       virtual bool isPastPivot()=0;
       virtual int setPastPivotState(bool bState)=0;
  -    virtual void setTransport(SOAPTransport* pStream)=0;
  -    virtual int setTransportProperty(const char* pcKey, const char* pcValue)=0;
  -    virtual const char* getTransportProperty(const char* pcKey)=0;
  -	    
  -    
   };
   
   AXIS_CPP_NAMESPACE_END
  
  
  
  1.35      +0 -17     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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- MessageData.cpp	22 Mar 2005 04:11:48 -0000	1.34
  +++ MessageData.cpp	22 Mar 2005 14:24:23 -0000	1.35
  @@ -201,22 +201,5 @@
       *pIAdminUtils = &m_AdminUtil;
   }
   
  -void MessageData::setTransport(SOAPTransport* pStream)
  -{
  -    pSoapTransport= pStream;
  -}
  -
  -int MessageData::setTransportProperty(const char* pcKey, const char* pcValue)
  -{
  -   return pSoapTransport->setTransportProperty(pcKey, pcValue);
  -}
  -
  -const char* MessageData::getTransportProperty(const char* pcKey)
  -{
  -
  -   return pSoapTransport->getTransportProperty(pcKey);
  -}
  -
  -
   
   AXIS_CPP_NAMESPACE_END
  
  
  
  1.25      +0 -6      ws-axis/c/src/common/MessageData.h
  
  Index: MessageData.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/MessageData.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- MessageData.h	22 Mar 2005 04:11:48 -0000	1.24
  +++ MessageData.h	22 Mar 2005 14:24:23 -0000	1.25
  @@ -19,8 +19,6 @@
   
   #include <axis/IMessageData.hpp>
   #include "AdminUtils.h"
  -#include "../transport/SOAPTransport.h"
  -
   
   /*
    *  @class MessageData
  @@ -49,7 +47,6 @@
   public:
       IWrapperSoapSerializer* m_pSZ;
       IWrapperSoapDeSerializer* m_pDZ;
  -    SOAPTransport* pSoapTransport ;
   private:
       void getAdminUtils(IAdminUtils** pIAdminUtils);
   public:
  @@ -72,9 +69,6 @@
       void setUserName(string& m_sUserName);
       string& getUserName();
       AXIS_PROTOCOL_TYPE m_Protocol;
  -    void setTransport(SOAPTransport* pStream);
  -    int setTransportProperty(const char* pcKey, const char* pcValue);
  -    const char* getTransportProperty(const char* pcKey);    
       
   protected:
       string m_sUserName;
  
  
  
  1.94      +1 -1      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.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- Axis.cpp	22 Mar 2005 04:11:48 -0000	1.93
  +++ Axis.cpp	22 Mar 2005 14:24:23 -0000	1.94
  @@ -148,7 +148,7 @@
                   AxisEngine *engine = new ServerAxisEngine ();
                   if (engine)
                   {
  -                    if (AXIS_SUCCESS == engine->initialize (pStream))
  +                    if (AXIS_SUCCESS == engine->initialize ())
                       {
                           Status = engine->process(pStream);
   						if (AXIS_SUCCESS == Status)
  
  
  
  1.36      +1 -4      ws-axis/c/src/engine/AxisEngine.cpp
  
  Index: AxisEngine.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngine.cpp,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- AxisEngine.cpp	22 Mar 2005 04:11:48 -0000	1.35
  +++ AxisEngine.cpp	22 Mar 2005 14:24:23 -0000	1.36
  @@ -26,8 +26,6 @@
   #include "SerializerPool.h"
   #include "../common/AxisTrace.h"
   
  -
  -
   extern AXIS_CPP_NAMESPACE_PREFIX DeserializerPool* g_pDeserializerPool;
   extern AXIS_CPP_NAMESPACE_PREFIX SerializerPool* g_pSerializerPool;
   extern AXIS_CPP_NAMESPACE_PREFIX HandlerPool* g_pHandlerPool;
  @@ -59,7 +57,7 @@
           delete m_pMsgData;
   }
   
  -int AxisEngine::initialize (SOAPTransport* pStream)
  +int AxisEngine::initialize ()
   {
       int Status;
       m_pMsgData = new MessageData ();
  @@ -72,7 +70,6 @@
           return Status;
       m_pMsgData->setSerializer (m_pSZ);
       m_pMsgData->setDeSerializer (m_pDZ);
  -    m_pMsgData->setTransport(pStream);    
   
       return AXIS_SUCCESS;
   }
  
  
  
  1.14      +1 -2      ws-axis/c/src/engine/AxisEngine.h
  
  Index: AxisEngine.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngine.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AxisEngine.h	22 Mar 2005 04:11:48 -0000	1.13
  +++ AxisEngine.h	22 Mar 2005 14:24:23 -0000	1.14
  @@ -33,7 +33,6 @@
   #include "../soap/SoapDeSerializer.h"
   #include "../common/MessageData.h"
   #include "HandlerChain.h"
  -#include "../transport/SOAPTransport.h"
   
   /*
    *   @class AxisEngine
  @@ -62,7 +61,7 @@
   public:
       AxisEngine();
       virtual ~AxisEngine();
  -    virtual int initialize(SOAPTransport* pStream);
  +    virtual int initialize();
       virtual void unInitialize();
       virtual int process(SOAPTransport* pSoap)=0;
   protected:
  
  
  
  1.107     +1 -1      ws-axis/c/src/engine/client/Call.cpp
  
  Index: Call.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/client/Call.cpp,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- Call.cpp	22 Mar 2005 04:11:48 -0000	1.106
  +++ Call.cpp	22 Mar 2005 14:24:23 -0000	1.107
  @@ -179,7 +179,7 @@
           	m_nStatus = AXIS_FAIL;
               return AXIS_FAIL;
           }
  -        if (AXIS_SUCCESS == m_pAxisEngine->initialize (m_pTransport))
  +        if (AXIS_SUCCESS == m_pAxisEngine->initialize ())
           {
               MessageData *msgData = m_pAxisEngine->getMessageData ();
               if (msgData)
  
  
  

Mime
View raw message