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 da...@apache.org on 2004/03/25 17:55:36 UTC
cvs commit: ws-axis/c/src/engine ServerAxisEngine.h
damitha 2004/03/25 08:55:36
Modified: c/include/axis/client Call.h
c/include/axis/server GDefine.h Packet.h
c/samples/client Makefile.am configure.ac run.sh
c/src/client Call.cpp
c/src/client/transport/axis AxisTransport.cpp
AxisTransport.h HttpTransport.cpp HttpTransport.hpp
Removed: c/src/engine ServerAxisEngine.h
Log:
Revision Changes Path
1.3 +6 -6 ws-axis/c/include/axis/client/Call.h
Index: Call.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/client/Call.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Call.h 24 Mar 2004 06:57:29 -0000 1.2
+++ Call.h 25 Mar 2004 16:55:36 -0000 1.3
@@ -83,7 +83,7 @@
void (AXISCALL* SetSOAPVersion)(void* pObj, SOAP_VERSION version);
int (AXISCALL* SetTransportProperty)(void* pObj, AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value);
int (AXISCALL* SetProtocol)(void* pObj, AXIS_PROTOCOL_TYPE protocol);
- int (AXISCALL* Initialize)(void* pObj, PROVIDERTYPE nStyle);
+ int (AXISCALL* Initialize)(void* pObj, PROVIDERTYPE nStyle, int secure);
int (AXISCALL* Invoke)(void* pObj);
int (AXISCALL* UnInitialize)(void* pObj);
@@ -166,7 +166,7 @@
virtual void AXISCALL SetSOAPVersion(SOAP_VERSION version)=0;
virtual int AXISCALL SetTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value)=0;
virtual int AXISCALL SetProtocol(AXIS_PROTOCOL_TYPE protocol)=0;
- virtual int AXISCALL Initialize(PROVIDERTYPE nStyle)=0;
+ virtual int AXISCALL Initialize(PROVIDERTYPE nStyle, int secure)=0;
virtual int AXISCALL Invoke()=0;
virtual int AXISCALL UnInitialize()=0;
@@ -250,8 +250,8 @@
{ return ((CallBase*)pObj)->SetTransportProperty(type,value);};
static int AXISCALL s_SetProtocol(void* pObj, AXIS_PROTOCOL_TYPE protocol)
{ return ((CallBase*)pObj)->SetProtocol(protocol);};
- static int AXISCALL s_Initialize(void* pObj, PROVIDERTYPE nStyle)
- { return ((CallBase*)pObj)->Initialize(nStyle);};
+ static int AXISCALL s_Initialize(void* pObj, PROVIDERTYPE nStyle, int secure)
+ { return ((CallBase*)pObj)->Initialize(nStyle, secure);};
static int AXISCALL s_Invoke(void* pObj)
{ return ((CallBase*)pObj)->Invoke();};
static int AXISCALL s_UnInitialize(void* pObj)
@@ -449,7 +449,7 @@
int AXISCALL SetTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value);
int AXISCALL SetProtocol(AXIS_PROTOCOL_TYPE protocol);
int AXISCALL UnInitialize();
- int AXISCALL Initialize(PROVIDERTYPE nStyle);
+ int AXISCALL Initialize(PROVIDERTYPE nStyle, int secure);
int AXISCALL Invoke();
/* Method for adding complex parameters */
@@ -526,7 +526,7 @@
int AXISCALL CheckMessage(const AxisChar* pName, const AxisChar* pNamespace);
private:
- int OpenConnection(bool secure);
+ int OpenConnection(int secure);
void CloseConnection();
int MakeArray();
1.6 +1 -1 ws-axis/c/include/axis/server/GDefine.h
Index: GDefine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/GDefine.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GDefine.h 3 Feb 2004 14:17:11 -0000 1.5
+++ GDefine.h 25 Mar 2004 16:55:36 -0000 1.6
@@ -68,7 +68,7 @@
/* This file contains all global definitions that are valid across whole Axis C++ project.*/
typedef enum { AXIS_SUCCESS=0, AXIS_FAIL = -1, AXIS_OBJECT_ALREADY_EXISTS=1} AXIS_GLOBAL_ERROR;
-typedef enum { APTHTTP=1, APTFTP, APTSMTP, APTOTHER } AXIS_PROTOCOL_TYPE;
+typedef enum { APTHTTP=1, APTFTP, APTSMTP, APTHTTPS, APTOTHER } AXIS_PROTOCOL_TYPE;
typedef enum { CRITICAL=1, WARN, INFO, TRIVIAL} AXIS_SEVERITY_LEVEL;
#define SOAPACTIONHEADER "SOAPAction"
1.5 +12 -0 ws-axis/c/include/axis/server/Packet.h
Index: Packet.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/Packet.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Packet.h 15 Jan 2004 13:45:22 -0000 1.4
+++ Packet.h 25 Mar 2004 16:55:36 -0000 1.5
@@ -115,6 +115,17 @@
typedef struct
{
+ const char* uri_path;
+ Ax_header* ip_headers;
+ int ip_headercount;
+ Ax_header* op_headers;
+ int op_headercount;
+ AXIS_HTTP_METHOD ip_method;
+ AXIS_HTTP_METHOD op_method;
+} Ax_stream_https;
+
+typedef struct
+{
int dummy;
} Ax_stream_smtp;
@@ -122,6 +133,7 @@
{
Ax_stream_http* http;
Ax_stream_smtp* smtp;
+ Ax_stream_https* https;
void* other; /*transport specific other protocols can have its own structs here*/
} Ax_soapcontent;
1.2 +1 -1 ws-axis/c/samples/client/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 24 Mar 2004 13:21:29 -0000 1.1
+++ Makefile.am 25 Mar 2004 16:55:36 -0000 1.2
@@ -1 +1 @@
-SUBDIRS = interoptests
+SUBDIRS = ssl_client
1.2 +2 -1 ws-axis/c/samples/client/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure.ac 24 Mar 2004 13:21:30 -0000 1.1
+++ configure.ac 25 Mar 2004 16:55:36 -0000 1.2
@@ -6,4 +6,5 @@
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LIBTOOL
-AC_OUTPUT(Makefile interoptests/Makefile interoptests/cbase/Makefile)
+AC_OUTPUT(Makefile ssl_client/Makefile)
+#AC_OUTPUT(Makefile ssl_client/Makefile interoptests/Makefile interoptests/cbase/Makefile)
1.2 +2 -2 ws-axis/c/samples/client/run.sh
Index: run.sh
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/run.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- run.sh 24 Mar 2004 13:32:27 -0000 1.1
+++ run.sh 25 Mar 2004 16:55:36 -0000 1.2
@@ -1,6 +1,6 @@
-echo "running interoptests/cbase..."
+echo "running sslclient..."
echo "-----------------------------"
-./cbase
+./sslclient
echo "-----------------------------"
1.32 +12 -3 ws-axis/c/src/client/Call.cpp
Index: Call.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/Call.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Call.cpp 24 Mar 2004 06:57:30 -0000 1.31
+++ Call.cpp 25 Mar 2004 16:55:36 -0000 1.32
@@ -93,6 +93,8 @@
case APTHTTP:
delete m_Soap.so.http;
/* do for other protocols too */
+ case APTHTTPS:
+ delete m_Soap.so.http;
}
}
@@ -135,7 +137,7 @@
return m_pAxisEngine->Process(&m_Soap);
}
-int Call::Initialize(PROVIDERTYPE nStyle)
+int Call::Initialize(PROVIDERTYPE nStyle, int secure)
/* does this mean that the stub that uses this Call object as well as all client side
* handlers have the same PROVIDERTYPE ? */
{
@@ -146,7 +148,7 @@
try {
m_Soap.sessionid = "somesessionid1234";
//remove_headers(&m_Soap);
- if (AXIS_SUCCESS != OpenConnection(false)) return AXIS_FAIL;
+ if (AXIS_SUCCESS != OpenConnection(secure)) return AXIS_FAIL;
if (m_pAxisEngine) delete m_pAxisEngine;
m_pAxisEngine = new ClientAxisEngine();
if (!m_pAxisEngine) return AXIS_FAIL;
@@ -223,6 +225,13 @@
m_Soap.so.http->op_headers = NULL;
break;
/* do for other protocols too */
+ case APTHTTPS:
+ m_Soap.so.https = new Ax_stream_https;
+ m_Soap.so.https->ip_headercount = 0;
+ m_Soap.so.https->ip_headers = NULL;
+ m_Soap.so.https->op_headercount = 0;
+ m_Soap.so.https->op_headers = NULL;
+ break;
}
return 0;
}
@@ -241,7 +250,7 @@
* functions with those streams at any time it wants to send/receive
* bytes to/from the server.
*/
-int Call::OpenConnection(bool secure)
+int Call::OpenConnection(int secure)
{
m_pTransport = new AxisTransport(&m_Soap);
return m_pTransport->OpenConnection(secure);
1.18 +1 -1 ws-axis/c/src/client/transport/axis/AxisTransport.cpp
Index: AxisTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/AxisTransport.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AxisTransport.cpp 24 Mar 2004 06:57:30 -0000 1.17
+++ AxisTransport.cpp 25 Mar 2004 16:55:36 -0000 1.18
@@ -84,7 +84,7 @@
delete m_pHttpTransport;
}
-int AxisTransport::OpenConnection(bool secure)
+int AxisTransport::OpenConnection(int secure)
{
//Step 1 - Open Transport layer connection taking into account protocol and endpoint URI in m_Soap
Url objUrl(m_pSoap->so.http->uri_path);
1.3 +1 -1 ws-axis/c/src/client/transport/axis/AxisTransport.h
Index: AxisTransport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/AxisTransport.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AxisTransport.h 24 Mar 2004 06:57:30 -0000 1.2
+++ AxisTransport.h 25 Mar 2004 16:55:36 -0000 1.3
@@ -72,7 +72,7 @@
AxisTransport(Ax_soapstream* pSoap);
virtual ~AxisTransport();
- int OpenConnection(bool secure);
+ int OpenConnection(int secure);
void CloseConnection();
AXIS_TRANSPORT_STATUS Send_bytes(const char* pSendBuffer, const void* bufferid, const void* pSStream);
AXIS_TRANSPORT_STATUS Get_bytes(const char** res, int* retsize, const void* pSStream);
1.19 +2 -2 ws-axis/c/src/client/transport/axis/HttpTransport.cpp
Index: HttpTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/HttpTransport.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- HttpTransport.cpp 24 Mar 2004 06:57:31 -0000 1.18
+++ HttpTransport.cpp 25 Mar 2004 16:55:36 -0000 1.19
@@ -75,7 +75,7 @@
* Create HTTP transport with provided URL as remote address,
* set HTTP category default to POST
*/
-HttpTransport::HttpTransport(Url url, bool secure) : m_Typ(POST)
+HttpTransport::HttpTransport(Url url, int secure) : m_Typ(POST)
{
m_Url = url;
m_IsHttpHeader = 0;
@@ -95,7 +95,7 @@
* Create HTTP transport with provided remote address as URL-string,
* set HTTP category default to POST
*/
-HttpTransport::HttpTransport(std::string& strUrl, bool secure) : m_Typ(POST)
+HttpTransport::HttpTransport(std::string& strUrl, int secure) : m_Typ(POST)
{
m_Url = Url(strUrl);
m_strUrl = strUrl;
1.2 +2 -2 ws-axis/c/src/client/transport/axis/HttpTransport.hpp
Index: HttpTransport.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/HttpTransport.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpTransport.hpp 23 Mar 2004 05:38:58 -0000 1.1
+++ HttpTransport.hpp 25 Mar 2004 16:55:36 -0000 1.2
@@ -102,9 +102,9 @@
//HttpTransport(std::string& strUrl) : m_Typ(POST) {m_Url = Url(strUrl); m_IsHttpHeader = 0;m_strUrl = strUrl; m_HttpBindDone = false;}
~HttpTransport();
- HttpTransport(std::string& strUrl, bool secure);
+ HttpTransport(std::string& strUrl, int secure);
- HttpTransport(Url url, bool secure);
+ HttpTransport(Url url, int secure);
/// Initialize HTTP transport by establishing a channel to the remote end.
bool Init();