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 sa...@apache.org on 2005/02/25 06:06:46 UTC
cvs commit: ws-axis/c/src/transport/axis2 Axis2Transport.cpp Axis2Transport.h
samisa 2005/02/24 21:06:46
Modified: c/src/server/apache ApacheTransport.cpp ApacheTransport.h
c/src/server/apache2 Apache2Transport.cpp Apache2Transport.h
c/src/server/simple_axis_server SimpleAxisTransport.cpp
SimpleAxisTransport.h
c/src/transport/axis2 Axis2Transport.cpp Axis2Transport.h
Log:
Changes to fix compilation problems triggered through changes to SOAPTransport
Revision Changes Path
1.7 +4 -3 ws-axis/c/src/server/apache/ApacheTransport.cpp
Index: ApacheTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache/ApacheTransport.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApacheTransport.cpp 11 Feb 2005 11:53:10 -0000 1.6
+++ ApacheTransport.cpp 25 Feb 2005 05:06:45 -0000 1.7
@@ -89,7 +89,7 @@
#endif
}
-void ApacheTransport::setTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value)
+int ApacheTransport::setTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value)
{
const char* key = NULL;
switch (type)
@@ -114,6 +114,7 @@
/* Should we remove the sent headers ? */
#endif
}
+ return 0;
}
AXIS_TRANSPORT_STATUS ApacheTransport::flushOutput()
@@ -217,7 +218,7 @@
return NULL;
}
-void ApacheTransport::setTransportProperty(const char* pcKey, const char* pcValue)
+int ApacheTransport::setTransportProperty(const char* pcKey, const char* pcValue)
{
if (pcKey && pcValue)
{
@@ -227,7 +228,7 @@
/* Should we remove the sent headers ? */
#endif
}
-
+ return 0;
}
1.11 +2 -2 ws-axis/c/src/server/apache/ApacheTransport.h
Index: ApacheTransport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache/ApacheTransport.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApacheTransport.h 21 Jan 2005 17:16:28 -0000 1.10
+++ ApacheTransport.h 25 Feb 2005 05:06:45 -0000 1.11
@@ -59,9 +59,9 @@
{ m_pReleaseBufferCallback = pFunct; };
AXIS_TRANSPORT_STATUS getBytes(char* pBuffer, int* piSize);
void releaseBuffer(const char* pBuffer);
- void setTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value);
+ int setTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value);
const char* getTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE eType);
- void setTransportProperty(const char* pcKey, const char* pcValue);
+ int setTransportProperty(const char* pcKey, const char* pcValue);
const char* getTransportProperty(const char* pcKey);
void setAttachment(const char* pcAttachmentid, const char* pcAttachment){};
1.8 +4 -3 ws-axis/c/src/server/apache2/Apache2Transport.cpp
Index: Apache2Transport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache2/Apache2Transport.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Apache2Transport.cpp 27 Jan 2005 06:52:09 -0000 1.7
+++ Apache2Transport.cpp 25 Feb 2005 05:06:45 -0000 1.8
@@ -77,7 +77,7 @@
#endif
}
-void Apache2Transport::setTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value)
+int Apache2Transport::setTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value)
{
const char* key = NULL;
switch (type)
@@ -105,6 +105,7 @@
/* Should we remove the sent headers ? */
#endif
}
+ return 0;
}
AXIS_TRANSPORT_STATUS Apache2Transport::flushOutput()
@@ -221,11 +222,11 @@
return NULL;
}
-void Apache2Transport::setTransportProperty(const char* pcKey, const char* pcValue)
+int Apache2Transport::setTransportProperty(const char* pcKey, const char* pcValue)
{
/*ap_table_set(((request_rec*)m_pContext)->headers_out, pcKey, pcValue);*/
//ap_send_http_header((request_rec*)m_pContext);
-
+ return 0;
}
const char* Apache2Transport::getTransportProperty(const char* pcKey)
1.12 +2 -2 ws-axis/c/src/server/apache2/Apache2Transport.h
Index: Apache2Transport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache2/Apache2Transport.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Apache2Transport.h 24 Jan 2005 20:46:22 -0000 1.11
+++ Apache2Transport.h 25 Feb 2005 05:06:45 -0000 1.12
@@ -65,9 +65,9 @@
{ m_pReleaseBufferCallback = pFunct; };
AXIS_TRANSPORT_STATUS getBytes(char* pBuffer, int* piSize);
void releaseBuffer(const char* pBuffer);
- void setTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value);
+ int setTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value);
const char* getTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE eType);
- void setTransportProperty(const char* pcKey, const char* pcValue);
+ int setTransportProperty(const char* pcKey, const char* pcValue);
const char* getTransportProperty(const char* pcKey);
void setAttachment(const char* pcAttachmentid, const char* pcAttachment){};
ISoapAttachment* getAttachment(const char* pcAttachmentid);
1.7 +2 -2 ws-axis/c/src/server/simple_axis_server/SimpleAxisTransport.cpp
Index: SimpleAxisTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/simple_axis_server/SimpleAxisTransport.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimpleAxisTransport.cpp 25 Nov 2004 09:08:14 -0000 1.6
+++ SimpleAxisTransport.cpp 25 Feb 2005 05:06:45 -0000 1.7
@@ -69,7 +69,7 @@
return TRANSPORT_IN_PROGRESS;
}
-void
+int
SimpleAxisTransport::
setTransportProperty (AXIS_TRANSPORT_INFORMATION_TYPE type, const char *value)
{
@@ -260,7 +260,7 @@
return NULL;
}
-void
+int
SimpleAxisTransport::setTransportProperty (const char *pcKey,
const char *pcValue)
{
1.6 +2 -2 ws-axis/c/src/server/simple_axis_server/SimpleAxisTransport.h
Index: SimpleAxisTransport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/simple_axis_server/SimpleAxisTransport.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleAxisTransport.h 24 Jan 2005 07:38:02 -0000 1.5
+++ SimpleAxisTransport.h 25 Feb 2005 05:06:45 -0000 1.6
@@ -51,10 +51,10 @@
};
AXIS_TRANSPORT_STATUS getBytes (char *pBuffer, int *piSize);
void releaseBuffer (const char *pBuffer);
- void setTransportProperty (AXIS_TRANSPORT_INFORMATION_TYPE type,
+ int setTransportProperty (AXIS_TRANSPORT_INFORMATION_TYPE type,
const char *value);
const char *getTransportProperty (AXIS_TRANSPORT_INFORMATION_TYPE eType);
- void setTransportProperty (const char *pcKey, const char *pcValue);
+ int setTransportProperty (const char *pcKey, const char *pcValue);
const char *getTransportProperty (const char *pcKey);
void setAttachment (const char *pcAttachmentid, const char *pcAttachment)
{
1.39 +6 -3 ws-axis/c/src/transport/axis2/Axis2Transport.cpp
Index: Axis2Transport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/Axis2Transport.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Axis2Transport.cpp 13 Jan 2005 12:29:37 -0000 1.38
+++ Axis2Transport.cpp 25 Feb 2005 05:06:45 -0000 1.39
@@ -738,7 +738,7 @@
* @param const char* Value is a NULL terminated character string containing
* the value associated with the type.
*/
-void
+int
Axis2Transport::setTransportProperty (AXIS_TRANSPORT_INFORMATION_TYPE type,
const char *value)
throw (AxisTransportException)
@@ -798,6 +798,7 @@
{
setTransportProperty (key, value);
}
+ return 0;
}
/* Axis2Transport::setTransportProperty( Key, Value) Is an overloaded public
@@ -809,12 +810,12 @@
* @param const char* Value is a NULL terminated character string containing
* the value associated with the type.
*/
-void
+int
Axis2Transport::setTransportProperty (const char *pcKey, const char *pcValue)
throw (AxisTransportException)
{
if (!pcKey || !pcValue) // Samisa - fix for AXISCPP-295. We must check for valid values here.
- return;
+ return 0;
bool b_KeyFound = false;
@@ -841,6 +842,8 @@
m_vHTTPHeaders.
push_back (std::make_pair ((string) pcKey, (string) pcValue));
}
+
+ return 0;
}
/* Axis2Transport::getTransportProperty( Type) Is a public method that will
1.21 +2 -2 ws-axis/c/src/transport/axis2/Axis2Transport.h
Index: Axis2Transport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/Axis2Transport.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Axis2Transport.h 21 Jan 2005 12:26:14 -0000 1.20
+++ Axis2Transport.h 25 Feb 2005 05:06:45 -0000 1.21
@@ -53,11 +53,11 @@
AXIS_TRANSPORT_STATUS getBytes (char *, int *) throw (AxisException,
AxisTransportException);
- void setTransportProperty (AXIS_TRANSPORT_INFORMATION_TYPE,
+ int setTransportProperty (AXIS_TRANSPORT_INFORMATION_TYPE,
const char *) throw (AxisTransportException);
const char *getTransportProperty (AXIS_TRANSPORT_INFORMATION_TYPE)
throw (AxisTransportException);
- void setTransportProperty (const char *,
+ int setTransportProperty (const char *,
const char *) throw (AxisTransportException);
const char *getTransportProperty (const char *pcKey)
throw (AxisTransportException);