ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prest...@apache.org
Subject cvs commit: ws-axis/c/src/transport/axis3 ChannelFactory.hpp ChannelFactory.cpp HTTPTransportInstantiator.cpp HTTPTransport.cpp URL.cpp URL.hpp
Date Thu, 20 Jan 2005 19:35:48 GMT
prestonf    2005/01/20 11:35:48

  Modified:    c/src/transport/axis3 ChannelFactory.hpp ChannelFactory.cpp
                        HTTPTransportInstantiator.cpp HTTPTransport.cpp
                        URL.cpp URL.hpp
  Log:
  Hi All,
  These are modifications needed for the draft of the new http transport implementation AXIS3
(see AXISCPP-361).
  Regards,
  Fred Preston.
  
  Revision  Changes    Path
  1.4       +0 -6      ws-axis/c/src/transport/axis3/ChannelFactory.hpp
  
  Index: ChannelFactory.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/ChannelFactory.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ChannelFactory.hpp	20 Jan 2005 14:50:27 -0000	1.3
  +++ ChannelFactory.hpp	20 Jan 2005 19:35:47 -0000	1.4
  @@ -29,19 +29,13 @@
   
   #include <axis/GDefine.hpp>
   #include "IChannel.hpp"
  -#include "../../common/AxisTrace.h"
   
   #define ChannelFactory_MaxListSize	2
   #define CREATE_FUNCTION3			"CreateInstance"
   #define DELETE_FUNCTION3			"DestroyInstance"
  -#define INIT_FUNCTION3  			"initializeLibrary"
  -#define UNINIT_FUNCTION3			"uninitializeLibrary"
   
   typedef int (* CREATE_OBJECT3) (IChannel** inst);
   typedef int (* DELETE_OBJECT3) (IChannel* inst);
  -typedef void (* INIT_OBJECT3) (AxisTraceEntrypoints& ep);
  -typedef void (* UNINIT_OBJECT3) ();
  -
   AXIS_CPP_NAMESPACE_START
   class ChannelFactory  
   {
  
  
  
  1.5       +7 -14     ws-axis/c/src/transport/axis3/ChannelFactory.cpp
  
  Index: ChannelFactory.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/ChannelFactory.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ChannelFactory.cpp	20 Jan 2005 11:23:18 -0000	1.4
  +++ ChannelFactory.cpp	20 Jan 2005 19:35:48 -0000	1.5
  @@ -47,11 +47,6 @@
   {
   	for( int iCount = 0; iCount < m_iLibCount; iCount++)
   	{
  -		if( m_pLibName[iCount] != NULL)
  -		{
  -			delete m_pLibName[iCount];
  -		}
  -
   		if( m_pChannel[iCount] != NULL)
   		{
   			if( m_LibHandler[iCount] != NULL)
  @@ -64,6 +59,11 @@
   			m_pChannel[iCount] = 0;
   		}
   
  +		if( m_pLibName[iCount] != NULL)
  +		{
  +			delete m_pLibName[iCount];
  +		}
  +
   		if( m_LibHandler[iCount] != NULL)
   		{
   		    PLATFORM_UNLOADLIB( m_LibHandler[iCount]);
  @@ -102,8 +102,8 @@
   
   #ifdef ENABLE_AXISTRACE
               // Load function to do lib level inits
  -            INIT_OBJECT3 initializeLibrary;
  -            initializeLibrary = (INIT_OBJECT3) PLATFORM_GETPROCADDR(sLibHandler, INIT_FUNCTION3);
  +            void (*initializeLibrary) (AxisTraceEntrypoints&);
  +            initializeLibrary = (void (*)(AxisTraceEntrypoints&))PLATFORM_GETPROCADDR(sLibHandler,
"initializeLibrary");
   
               AxisTraceEntrypoints ep;
               AxisTrace::getTraceEntrypoints(ep);
  @@ -144,13 +144,6 @@
   			DELETE_OBJECT3 sDelete = (DELETE_OBJECT3) PLATFORM_GETPROCADDR( m_LibHandler[iCount],
DELETE_FUNCTION3);
   
   			sDelete( pIChannel);
  -
  -#ifdef ENABLE_AXISTRACE
  -            UNINIT_OBJECT3 uninitializeLibrary;
  -            uninitializeLibrary = (UNINIT_OBJECT3) PLATFORM_GETPROCADDR(m_LibHandler[iCount],
UNINIT_FUNCTION3);
  -            if (uninitializeLibrary)
  -                 (*uninitializeLibrary)();
  -#endif
   
   			m_pChannel[iCount] = 0;
   
  
  
  
  1.7       +0 -3      ws-axis/c/src/transport/axis3/HTTPTransportInstantiator.cpp
  
  Index: HTTPTransportInstantiator.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPTransportInstantiator.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HTTPTransportInstantiator.cpp	20 Jan 2005 11:23:18 -0000	1.6
  +++ HTTPTransportInstantiator.cpp	20 Jan 2005 19:35:48 -0000	1.7
  @@ -67,9 +67,6 @@
       STORAGE_CLASS_INFO void uninitializeLibrary (void)
       {
           // Do uninit actions
  -#ifdef ENABLE_AXISTRACE
  -        AxisTrace::deleteTraceEntrypoints();
  -#endif
       }
   }
   
  
  
  
  1.6       +2 -2      ws-axis/c/src/transport/axis3/HTTPTransport.cpp
  
  Index: HTTPTransport.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPTransport.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HTTPTransport.cpp	11 Jan 2005 15:06:59 -0000	1.5
  +++ HTTPTransport.cpp	20 Jan 2005 19:35:48 -0000	1.6
  @@ -67,7 +67,7 @@
       {
   	delete[] m_pcEndpointUri;
       }
  -
  +/* This is done by delete m_pChannelFactory!
       if( m_pNormalChannel)
   	{
   		delete m_pNormalChannel;
  @@ -81,7 +81,7 @@
   
   		m_pSecureChannel = 0;
   	}
  -
  +*/
       if( m_pChannelFactory)
   	{
   		delete m_pChannelFactory;
  
  
  
  1.3       +6 -1      ws-axis/c/src/transport/axis3/URL.cpp
  
  Index: URL.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/URL.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- URL.cpp	10 Jan 2005 15:25:43 -0000	1.2
  +++ URL.cpp	20 Jan 2005 19:35:48 -0000	1.3
  @@ -25,13 +25,18 @@
   #include "URL.hpp"
   #include <ctype.h>
   #include <iostream>
  -using namespace std;
   
  +using namespace std;
   
   URL::URL()
       : m_Protocol(unknown), m_Port(0), m_URL("")
   {
      /* cout << "inside URL constructor" << endl;  */
  +    m_Host = "";
  +    m_Path = "";
  +    m_Query = "";
  +    m_Password = "";
  +    m_User = "";
   }
   
   URL::URL(std::string url)
  
  
  
  1.2       +1 -0      ws-axis/c/src/transport/axis3/URL.hpp
  
  Index: URL.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/URL.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- URL.hpp	6 Jan 2005 17:33:15 -0000	1.1
  +++ URL.hpp	20 Jan 2005 19:35:48 -0000	1.2
  @@ -32,6 +32,7 @@
   const unsigned short HTTPS_PORT = 443;
   const unsigned short FTP_PORT   = 21;
   
  +using namespace std;
   
   /*
    *    Implementation of URL to manupulate URLs.  
  
  
  

Mime
View raw message