You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2004/12/16 06:54:21 UTC
cvs commit: ws-axis/c/src/transport/axis2 SSLChannelFactory.cpp SSLChannelFactory.hpp SecureChannel.h Axis2Transport.cpp Axis2Transport.h Makefile.am SecureChannel.cpp ChannelFactory.cpp ChannelFactory.hpp SecureChannel.hpp
damitha 2004/12/15 21:54:20
Modified: c/src/transport/axis2 Tag: release1-4-final-branch
Axis2Transport.cpp Axis2Transport.h Makefile.am
SecureChannel.cpp
Added: c/src/transport/axis2 Tag: release1-4-final-branch
SSLChannelFactory.cpp SSLChannelFactory.hpp
SecureChannel.h
Removed: c/src/transport/axis2 Tag: release1-4-final-branch
ChannelFactory.cpp ChannelFactory.hpp
SecureChannel.hpp
Log:
In the process of reverting back ssl channel framework
Revision Changes Path
No revision
No revision
1.29.2.2 +1 -1 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.29.2.1
retrieving revision 1.29.2.2
diff -u -r1.29.2.1 -r1.29.2.2
--- Axis2Transport.cpp 15 Dec 2004 11:55:47 -0000 1.29.2.1
+++ Axis2Transport.cpp 16 Dec 2004 05:54:20 -0000 1.29.2.2
@@ -49,7 +49,7 @@
m_iContentLength = 0;
m_pcReceived = 0;
m_pChannel = new Channel ();
- m_pFactory = new ChannelFactory();
+ m_pFactory = new SSLChannelFactory();
m_bChannelSecure = false;
m_bMimeTrue = false;
m_viCurrentHeader = m_vHTTPHeaders.begin();
1.18.2.1 +3 -3 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.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- Axis2Transport.h 6 Dec 2004 10:13:06 -0000 1.18
+++ Axis2Transport.h 16 Dec 2004 05:54:20 -0000 1.18.2.1
@@ -24,8 +24,8 @@
#include "../SOAPTransport.h"
#include "Channel.h"
-#include "SecureChannel.hpp"
-#include "ChannelFactory.hpp"
+#include "SecureChannel.h"
+#include "SSLChannelFactory.hpp"
#include <string>
#include <vector>
@@ -370,7 +370,7 @@
std::string m_strMimeContentID;
std::string m_strMimeContentLocation;
std::string m_strMimeReceived;
- ChannelFactory* m_pFactory;
+ SSLChannelFactory* m_pFactory;
};
#endif
1.6.2.1 +1 -1 ws-axis/c/src/transport/axis2/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Makefile.am 6 Dec 2004 10:13:06 -0000 1.6
+++ Makefile.am 16 Dec 2004 05:54:20 -0000 1.6.2.1
@@ -7,7 +7,7 @@
Axis2Transport.cpp \
AxisTransportException.cpp \
Axis2TransportInstantiator.cpp \
- ChannelFactory.cpp
+ SSLChannelFactory.cpp
libaxis2_transport_la_LIBADD = -lstdc++
INCLUDES = -I../../../include
1.5.2.2 +3 -3 ws-axis/c/src/transport/axis2/SecureChannel.cpp
Index: SecureChannel.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/SecureChannel.cpp,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- SecureChannel.cpp 15 Dec 2004 11:55:47 -0000 1.5.2.1
+++ SecureChannel.cpp 16 Dec 2004 05:54:20 -0000 1.5.2.2
@@ -1,9 +1,9 @@
-#include "SecureChannel.hpp"
-#include "ChannelFactory.hpp"
+#include "SecureChannel.h"
+#include "SSLChannelFactory.hpp"
SecureChannel::SecureChannel()
{
- m_pFactory = new ChannelFactory();
+ m_pFactory = new SSLChannelFactory();
//m_pFactory->initialize();
//m_pSSLChannel = m_pFactory->getSSLChannelObject();
//m_pSSLChannel->SSLInit();
No revision
Index: SecureChannel.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/SecureChannel.cpp,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- SecureChannel.cpp 15 Dec 2004 11:55:47 -0000 1.5.2.1
+++ SecureChannel.cpp 16 Dec 2004 05:54:20 -0000 1.5.2.2
@@ -1,9 +1,9 @@
-#include "SecureChannel.hpp"
-#include "ChannelFactory.hpp"
+#include "SecureChannel.h"
+#include "SSLChannelFactory.hpp"
SecureChannel::SecureChannel()
{
- m_pFactory = new ChannelFactory();
+ m_pFactory = new SSLChannelFactory();
//m_pFactory->initialize();
//m_pSSLChannel = m_pFactory->getSSLChannelObject();
//m_pSSLChannel->SSLInit();
No revision
Index: SecureChannel.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/SecureChannel.cpp,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- SecureChannel.cpp 15 Dec 2004 11:55:47 -0000 1.5.2.1
+++ SecureChannel.cpp 16 Dec 2004 05:54:20 -0000 1.5.2.2
@@ -1,9 +1,9 @@
-#include "SecureChannel.hpp"
-#include "ChannelFactory.hpp"
+#include "SecureChannel.h"
+#include "SSLChannelFactory.hpp"
SecureChannel::SecureChannel()
{
- m_pFactory = new ChannelFactory();
+ m_pFactory = new SSLChannelFactory();
//m_pFactory->initialize();
//m_pSSLChannel = m_pFactory->getSSLChannelObject();
//m_pSSLChannel->SSLInit();
1.6.2.1 +0 -0 ws-axis/c/src/transport/axis2/Attic/SSLChannelFactory.cpp
1.3.2.1 +0 -0 ws-axis/c/src/transport/axis2/Attic/SSLChannelFactory.hpp
1.6.2.1 +21 -17 ws-axis/c/src/transport/axis2/Attic/SecureChannel.h