Hi Nithya,
this just broke the build.
Can I ask why you are doing this now? We are in Beta phase for 1.5 and no more function should be added.
We are trying to get stability and adding in new function like this is not going to help.
If you would like to put new function in then can you please create a branch and merge them in post 1.5 release please?
In the mean time we're going to back out the changes.
many thanks,
John.
| [EMAIL PROTECTED]
22/03/2005 04:11 |
|
nithya 2005/03/21 20:11:48
Modified: c/src/engine Axis.cpp AxisEngine.h AxisEngine.cpp
c/include/axis IMessageData.hpp
c/src/common MessageData.h MessageData.cpp
c/src/engine/client Call.cpp
Log:
Added setTransport setTransportProperty getTransportProperty methods in ImessageData.hpp inorder to
set and get http headers
Revision Changes Path
1.93 +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.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- Axis.cpp 18 Mar 2005 15:47:34 -0000 1.92
+++ Axis.cpp 22 Mar 2005 04:11:48 -0000 1.93
@@ -148,7 +148,7 @@
AxisEngine *engine = new ServerAxisEngine ();
if (engine)
{
- if (AXIS_SUCCESS == engine->initialize ())
+ if (AXIS_SUCCESS == engine->initialize (pStream))
{
Status = engine->process(pStream);
if (AXIS_SUCCESS == Status)
1.13 +2 -1 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AxisEngine.h 6 Aug 2004 14:44:31 -0000 1.12
+++ AxisEngine.h 22 Mar 2005 04:11:48 -0000 1.13
@@ -33,6 +33,7 @@
#include "../soap/SoapDeSerializer.h"
#include "../common/MessageData.h"
#include "HandlerChain.h"
+#include "../transport/SOAPTransport.h"
/*
* @class AxisEngine
@@ -61,7 +62,7 @@
public:
AxisEngine();
virtual ~AxisEngine();
- virtual int initialize();
+ virtual int initialize(SOAPTransport* pStream);
virtual void unInitialize();
virtual int process(SOAPTransport* pSoap)=0;
protected:
1.35 +4 -1 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- AxisEngine.cpp 19 Nov 2004 16:22:06 -0000 1.34
+++ AxisEngine.cpp 22 Mar 2005 04:11:48 -0000 1.35
@@ -26,6 +26,8 @@
#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;
@@ -57,7 +59,7 @@
delete m_pMsgData;
}
-int AxisEngine::initialize ()
+int AxisEngine::initialize (SOAPTransport* pStream)
{
int Status;
m_pMsgData = new MessageData ();
@@ -70,6 +72,7 @@
return Status;
m_pMsgData->setSerializer (m_pSZ);
m_pMsgData->setDeSerializer (m_pDZ);
+ m_pMsgData->setTransport(pStream);
return AXIS_SUCCESS;
}
1.5 +7 -0 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IMessageData.hpp 8 Feb 2005 09:49:16 -0000 1.4
+++ IMessageData.hpp 22 Mar 2005 04:11:48 -0000 1.5
@@ -22,6 +22,8 @@
#include "IHandlerSoapSerializer.hpp"
#include "IWrapperSoapDeSerializer.hpp"
#include "IWrapperSoapSerializer.hpp"
+#include "../../src/transport/SOAPTransport.h"
+
AXIS_CPP_NAMESPACE_START
@@ -60,6 +62,11 @@
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.24 +6 -0 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- MessageData.h 8 Feb 2005 15:36:40 -0000 1.23
+++ MessageData.h 22 Mar 2005 04:11:48 -0000 1.24
@@ -19,6 +19,8 @@
#include <axis/IMessageData.hpp>
#include "AdminUtils.h"
+#include "../transport/SOAPTransport.h"
+
/*
* @class MessageData
@@ -47,6 +49,7 @@
public:
IWrapperSoapSerializer* m_pSZ;
IWrapperSoapDeSerializer* m_pDZ;
+ SOAPTransport* pSoapTransport ;
private:
void getAdminUtils(IAdminUtils** pIAdminUtils);
public:
@@ -69,6 +72,9 @@
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.34 +17 -0 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- MessageData.cpp 8 Feb 2005 09:49:16 -0000 1.33
+++ MessageData.cpp 22 Mar 2005 04:11:48 -0000 1.34
@@ -201,5 +201,22 @@
*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.106 +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.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- Call.cpp 18 Mar 2005 15:47:34 -0000 1.105
+++ Call.cpp 22 Mar 2005 04:11:48 -0000 1.106
@@ -179,7 +179,7 @@
m_nStatus = AXIS_FAIL;
return AXIS_FAIL;
}
- if (AXIS_SUCCESS == m_pAxisEngine->initialize ())
+ if (AXIS_SUCCESS == m_pAxisEngine->initialize (m_pTransport))
{
MessageData *msgData = m_pAxisEngine->getMessageData ();
if (msgData)
