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/05/14 10:30:19 UTC
cvs commit: ws-axis/c/src/transport/axis Makefile.am
damitha 2004/05/14 01:30:19
Modified: c configure.ac
c/src/common Makefile.am
c/src/engine/client Makefile.am
c/src/engine/server Makefile.am
c/src/server Makefile.am
c/src/server/apache Makefile.am mod_axis.cpp
c/src/transport SOAPTransportFactory.cpp
c/src/transport/axis Makefile.am
Log:
Revision Changes Path
1.16 +2 -2 ws-axis/c/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/ws-axis/c/configure.ac,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- configure.ac 9 Apr 2004 16:01:13 -0000 1.15
+++ configure.ac 14 May 2004 08:30:18 -0000 1.16
@@ -16,9 +16,9 @@
#if you use apache2
-AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/soap/Makefile src/wsdd/Makefile src/xml/Makefile src/transport/Makefile src/transport/axis/Makefile src/engine/Makefile src/engine/server/Makefile src/engine/client/Makefile src/server/Makefile src/server/apache2/Makefile src/server/simple_axis_server/Makefile src/server/adminservice/Makefile src/client/Makefile src/client/adminclient/Makefile)
+#AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/soap/Makefile src/wsdd/Makefile src/xml/Makefile src/transport/Makefile src/transport/axis/Makefile src/engine/Makefile src/engine/server/Makefile src/engine/client/Makefile src/server/Makefile src/server/apache2/Makefile src/server/simple_axis_server/Makefile src/server/adminservice/Makefile src/client/Makefile src/client/adminclient/Makefile)
#if you use apache1.3
-#AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/soap/Makefile src/wsdd/Makefile src/xml/Makefile src/transport/Makefile src/transport/axis/Makefile src/engine/Makefile src/engine/server/Makefile src/engine/client/Makefile src/server/Makefile src/server/apache/Makefile src/server/simple_axis_server/Makefile src/server/adminservice/Makefile src/client/Makefile src/client/adminclient/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/soap/Makefile src/wsdd/Makefile src/xml/Makefile src/transport/Makefile src/transport/axis/Makefile src/engine/Makefile src/engine/server/Makefile src/engine/client/Makefile src/server/Makefile src/server/apache/Makefile src/server/simple_axis_server/Makefile src/server/adminservice/Makefile src/client/Makefile src/client/adminclient/Makefile)
1.15 +1 -1 ws-axis/c/src/common/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.am 5 Apr 2004 13:51:09 -0000 1.14
+++ Makefile.am 14 May 2004 08:30:18 -0000 1.15
@@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libcommon.la
AM_CPPFLAGS = $(CPPFLAGS)
-libcommon_la_SOURCES = Param.cpp TypeMapping.cpp Packet.cpp MessageData.cpp \
+libcommon_la_SOURCES = Param.cpp TypeMapping.cpp MessageData.cpp \
BasicTypeSerializer.cpp ArrayBean.cpp AxisTime.cpp \
GDefine.cpp AxisUtils.cpp AxisTrace.cpp AxisException.cpp AxisConfig.cpp \
AxisSocketUtils.cpp AdminUtils.cpp
1.10 +2 -1 ws-axis/c/src/engine/client/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am 26 Apr 2004 12:56:21 -0000 1.9
+++ Makefile.am 14 May 2004 08:30:18 -0000 1.10
@@ -12,7 +12,8 @@
../SerializerPool.cpp \
../SessionScopeHandlerPool.cpp \
../SharedObject.cpp \
+ ../../transport/SOAPTransportFactory.cpp \
Call.cpp
-libaxiscpp_client_la_LIBADD = $(LDFLAGS) ../../common/libcommon.la ../../soap/libsoap.la ../../wsdd/libwsdd.la ../../xml/libxml.la ../../transport/axis/libtransport.la
+libaxiscpp_client_la_LIBADD = $(LDFLAGS) ../../common/libcommon.la ../../soap/libsoap.la ../../wsdd/libwsdd.la ../../xml/libxml.la
INCLUDES = -I$(AXISCPP_HOME)/include
1.6 +2 -1 ws-axis/c/src/engine/server/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/server/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am 26 Apr 2004 12:56:21 -0000 1.5
+++ Makefile.am 14 May 2004 08:30:19 -0000 1.6
@@ -11,7 +11,8 @@
../RequestScopeHandlerPool.cpp \
../SerializerPool.cpp \
../SessionScopeHandlerPool.cpp \
- ../SharedObject.cpp
+ ../SharedObject.cpp \
+ ../../transport/SOAPTransportFactory.cpp
libserver_engine_la_LIBADD = $(LDFLAGS) ../../common/libcommon.la ../../soap/libsoap.la ../../wsdd/libwsdd.la ../../xml/libxml.la
INCLUDES = -I$(AXISCPP_HOME)/include
1.7 +2 -1 ws-axis/c/src/server/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 9 Apr 2004 16:01:13 -0000 1.6
+++ Makefile.am 14 May 2004 08:30:19 -0000 1.7
@@ -1,5 +1,6 @@
#if you use apache2
-SUBDIRS = apache2 adminservice simple_axis_server
+#SUBDIRS = apache adminservice simple_axis_server
+SUBDIRS = apache adminservice
#if you use apache1.3
#SUBDIRS = apache adminservice simple_axis_server
1.12 +1 -1 ws-axis/c/src/server/apache/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.am 13 May 2004 04:42:30 -0000 1.11
+++ Makefile.am 14 May 2004 08:30:19 -0000 1.12
@@ -1,6 +1,6 @@
lib_LTLIBRARIES = libaxiscpp_mod.la
AM_CFLAGS = $(CFLAGS)
-libaxiscpp_mod_la_SOURCES = mod_axis.c
+libaxiscpp_mod_la_SOURCES = mod_axis.cpp ApacheTransport.cpp
libaxiscpp_mod_la_LIBADD = $(LDFLAGS) -L$(AXISCPP_HOME)/src/engine/server -lserver_engine -ldl
1.2 +22 -19 ws-axis/c/src/server/apache/mod_axis.cpp
Index: mod_axis.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache/mod_axis.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_axis.cpp 12 May 2004 07:36:46 -0000 1.1
+++ mod_axis.cpp 14 May 2004 08:30:19 -0000 1.2
@@ -26,22 +26,6 @@
extern int process_request (SOAPTransport* str);
extern unsigned char chEBuf[1024];
-/* Call initialize_module() [of Packet.h] from within this method */
-extern "C" static void module_init(server_rec* svr_rec, pool* p)
-{
- initialize_module (1);
-}
-
-/* Call initialize_process() [of Packet.h] from within this method */
-extern "C" static void axis_Init (server_rec* svr_rec, pool* p)
-{
-}
-
-/*Call finalize_process() [of Packet.h] from within this method*/
-extern "C" static void axis_Fini (server_rec* svr_rec, pool* p)
-{
-}
-
int axis_handler_helper(request_rec* req_rec)
{
int rc;
@@ -73,16 +57,34 @@
return OK;
}
-extern "C" static int axis_handler(request_rec* req_rec)
+/* Call initialize_module() [of Packet.h] from within this method */
+extern "C"
+{
+static void module_init(server_rec* svr_rec, pool* p)
+{
+ initialize_module (1);
+}
+
+/* Call initialize_process() [of Packet.h] from within this method */
+static void axis_Init (server_rec* svr_rec, pool* p)
+{
+}
+
+/*Call finalize_process() [of Packet.h] from within this method*/
+static void axis_Fini (server_rec* svr_rec, pool* p)
+{
+}
+
+static int axis_handler(request_rec* req_rec)
{
return axis_handler_helper(req_rec);
}
/* Make the name of the content handler known to Apache */
-extern "C" static handler_rec axis_handlers[] = { {"axis", axis_handler}, {NULL} };
+static handler_rec axis_handlers[] = { {"axis", axis_handler}, {NULL} };
/* Tell Apache what phases of the transaction we handle */
-extern "C" module MODULE_VAR_EXPORT axis_module = {
+ module MODULE_VAR_EXPORT axis_module = {
STANDARD_MODULE_STUFF,
module_init, /* module initializer */
NULL, /* per-directory config creator */
@@ -103,3 +105,4 @@
axis_Fini, /* process exit/cleanup */
NULL /* [1] post read_request handling */
};
+}
1.3 +1 -1 ws-axis/c/src/transport/SOAPTransportFactory.cpp
Index: SOAPTransportFactory.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/SOAPTransportFactory.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SOAPTransportFactory.cpp 12 May 2004 10:46:07 -0000 1.2
+++ SOAPTransportFactory.cpp 14 May 2004 08:30:19 -0000 1.3
@@ -49,7 +49,7 @@
m_pcLibraryPath = "AxisTransport.dll"; //this will be taken from configuration file
#endif
#else
- m_pcLibraryPath = "libAxisTransport.so"; //this will be taken from configuration file
+ m_pcLibraryPath = "/usr/local/Axis/libs/libaxis_transport.so"; //this will be taken from configuration file
#endif
if (!loadLib())
{
1.10 +2 -2 ws-axis/c/src/transport/axis/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am 5 Apr 2004 13:51:10 -0000 1.9
+++ Makefile.am 14 May 2004 08:30:19 -0000 1.10
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libtransport.la
+lib_LTLIBRARIES = libaxis_transport.la
AM_CPPFLAGS = $(CPPFLAGS)
-libtransport_la_SOURCES = Channel.cpp HttpTransport.cpp Receiver.cpp Sender.cpp \
+libaxis_transport_la_SOURCES = Channel.cpp HttpTransport.cpp Receiver.cpp Sender.cpp \
Transport.cpp TransportFactory.cpp Url.cpp AxisTransport.cpp
libtransport_la_LIBADD = -lstdc++