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/04/10 09:12:14 UTC
cvs commit: ws-axis/c/samples/server/simple Makefile.am
damitha 2004/04/10 00:12:14
Modified: c/samples/client Makefile.am configure.ac
c/samples/server Makefile.am configure.ac
c/deploy/conf server.wsdd_linux client.wsdd_linux
client.wsdd
c/samples/client/simple Calculator.h Makefile.am
c/samples/server/simple Makefile.am
Log:
changes to make simple sample and handler sample to work
Revision Changes Path
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 29 Mar 2004 04:26:24 -0000 1.3
+++ Makefile.am 10 Apr 2004 07:12:14 -0000 1.4
@@ -1 +1 @@
-SUBDIRS = ssl_client interoptests
+SUBDIRS = simple interoptests
1.14 +1 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- configure.ac 8 Apr 2004 03:28:41 -0000 1.13
+++ configure.ac 10 Apr 2004 07:12:14 -0000 1.14
@@ -11,4 +11,4 @@
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LIBTOOL
-AC_OUTPUT(Makefile ssl_client/Makefile interoptests/Makefile interoptests/base/Makefile interoptests/cbase/Makefile interoptests/groupB/Makefile interoptests/cgroupB/Makefile interoptests/doclitbase/Makefile interoptests/doclitgroupB/Makefile)
+AC_OUTPUT(Makefile interoptests/Makefile interoptests/base/Makefile interoptests/cbase/Makefile interoptests/groupB/Makefile interoptests/cgroupB/Makefile interoptests/doclitbase/Makefile interoptests/doclitgroupB/Makefile simple/Makefile)
1.2 +1 -1 ws-axis/c/samples/server/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 24 Mar 2004 13:21:30 -0000 1.1
+++ Makefile.am 10 Apr 2004 07:12:14 -0000 1.2
@@ -1 +1 @@
-SUBDIRS = interoptests
+SUBDIRS = interoptests simple
1.8 +1 -1 ws-axis/c/samples/server/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.ac 6 Apr 2004 06:12:51 -0000 1.7
+++ configure.ac 10 Apr 2004 07:12:14 -0000 1.8
@@ -8,4 +8,4 @@
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LIBTOOL
-AC_OUTPUT(Makefile interoptests/Makefile interoptests/base/Makefile interoptests/cbase/Makefile interoptests/groupB/Makefile interoptests/cgroupB/Makefile interoptests/doclitbase/Makefile interoptests/doclitgroupB/Makefile)
+AC_OUTPUT(Makefile interoptests/Makefile interoptests/base/Makefile interoptests/cbase/Makefile interoptests/groupB/Makefile interoptests/cgroupB/Makefile interoptests/doclitbase/Makefile interoptests/doclitgroupB/Makefile simple/Makefile)
1.3 +4 -0 ws-axis/c/deploy/conf/server.wsdd_linux
Index: server.wsdd_linux
===================================================================
RCS file: /home/cvs/ws-axis/c/deploy/conf/server.wsdd_linux,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- server.wsdd_linux 7 Apr 2004 10:35:49 -0000 1.2
+++ server.wsdd_linux 10 Apr 2004 07:12:14 -0000 1.3
@@ -6,6 +6,10 @@
<parameter name="allowedMethods" value="updateWSDD "/>
<parameter name="className" value="/usr/local/apache2/Axis/webservices/libAdminService.so" />
</service>
+ <service name="Calculator" provider="CPP:RPC" description="Simple Calculator Axis C++ Service ">
+ <parameter name="allowedMethods" value="add sub mul div "/>
+ <parameter name="className" value="/usr/local/apache2/Axis/webservices/libcalculator.so" />
+ </service>
<service name="baseDL" provider="CPP:DOCUMENT" description="SOAPBuilders Interoperability Lab Round 2 base test suite described at http://www.whitemesa.com/interop/proposal2.html ">
<parameter name="allowedMethods" value="echoString EchoInt echoStringArray echoInteger echoIntegerArray echoFloat echoFloatArray echoStruct echoStructArray echoVoid echoBase64 echoDate echoHexBinary echoDecimal echoBoolean "/>
1.2 +3 -11 ws-axis/c/deploy/conf/client.wsdd_linux
Index: client.wsdd_linux
===================================================================
RCS file: /home/cvs/ws-axis/c/deploy/conf/client.wsdd_linux,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- client.wsdd_linux 9 Apr 2004 10:57:49 -0000 1.1
+++ client.wsdd_linux 10 Apr 2004 07:12:14 -0000 1.2
@@ -1,16 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:C="http://xml.apache.org/axis/wsdd/providers/c">
-<service name="base" provider="CPP:DOCUMENT" description="Interop Base web service">
-<requestFlow name="InteropBaseHandlers">
-<handler name="TestHandler" type="/usr/local/apache2/Axis/handlers/client/test_handler/libtest_client_handler.so">
-<parameter name="logAccessCountFile" value="/usr/local/apache/Axis/handlers/custom/loghandler/LogAccessCountFile"/>
-</handler>
-</requestFlow>
-</service>
-<service name="Test" provider="CPP:DOCUMENT" description="Test web service">
-<requestFlow name="TestHandler1Handlers">
-<handler name="TestHandler1" type="/usr/local/apache2/Axis/handlers/client/test_handler/libtest_client_handler.so">
-<parameter name="logAccessCountFile" value="/usr/local/apache/Axis/handlers/custom/loghandler/LogAccessCountFile"/>
+<service name="Calculator" provider="CPP:DOCUMENT" description="Simple Calculator">
+<requestFlow name="test-handler-req">
+<handler name="TestHandler" type="/usr/local/apache/Axis/handlers/client2/test_handler/libtest_client_handler.so">/>
</handler>
</requestFlow>
</service>
1.3 +4 -12 ws-axis/c/deploy/conf/client.wsdd
Index: client.wsdd
===================================================================
RCS file: /home/cvs/ws-axis/c/deploy/conf/client.wsdd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- client.wsdd 31 Mar 2004 16:38:04 -0000 1.2
+++ client.wsdd 10 Apr 2004 07:12:14 -0000 1.3
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:C="http://xml.apache.org/axis/wsdd/providers/c">
-<service name="InteropBaseDL" provider="CPP:DOCUMENT" description="Interop Base web service">
-<requestFlow name="InteropBaseDLHandlers">
-<handler name="TestHandler" type="d:/axiscppdev/ws-axis/c/bin/testHandler.dll">
-<parameter name="logAccessCountFile" value="/usr/local/apache/Axis/handlers/custom/loghandler/LogAccessCountFile"/>
+<service name="Calculator" provider="CPP:DOCUMENT" description="Simple Calculator">
+<requestFlow name="test-handler-req">
+<handler name="TestHandler" type="/usr/local/apache/Axis/handlers/client2/test_handler/libtest_client_handler.so">/>
</handler>
</requestFlow>
</service>
-<service name="Test" provider="CPP:DOCUMENT" description="Interop Base web service">
-<requestFlow name="TestHandler1">
-<handler name="ESHHandler" type="d:/axiscppdev/ws-axis/c/bin/testHandler.dll">
-<parameter name="logAccessCountFile" value="/usr/local/apache/Axis/handlers/custom/loghandler/LogAccessCountFile"/>
-</handler>
-</requestFlow>
-</service>
-</deployment>
\ No newline at end of file
+</deployment>
1.2 +1 -0 ws-axis/c/samples/client/simple/Calculator.h
Index: Calculator.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/simple/Calculator.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Calculator.h 8 Apr 2004 13:23:52 -0000 1.1
+++ Calculator.h 10 Apr 2004 07:12:14 -0000 1.2
@@ -7,6 +7,7 @@
#define __CALCULATOR_CLIENTSTUB_H__INCLUDED_
#include <axis/client/Call.h>
+#include <ctype.h>
class Calculator
{
1.2 +3 -3 ws-axis/c/samples/client/simple/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/simple/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 8 Apr 2004 13:23:52 -0000 1.1
+++ Makefile.am 10 Apr 2004 07:12:14 -0000 1.2
@@ -1,7 +1,7 @@
-bin_PROGRAMS = Calculator
+bin_PROGRAMS = calculator
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS)
-adminclient_SOURCES = Calculator.cpp CalcClient.cpp
+calculator_SOURCES = Calculator.cpp CalcClient.cpp
-adminclient_LDADD = $(LDFLAGS) -L$(AXISCPP_HOME)/bin -laxiscpp_client -lltdl
+calculator_LDADD = $(LDFLAGS) -L$(AXISCPP_HOME)/bin -laxiscpp_client -lltdl
INCLUDES = -I$(AXISCPP_HOME)/include
1.2 +3 -3 ws-axis/c/samples/server/simple/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/simple/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 8 Apr 2004 13:23:52 -0000 1.1
+++ Makefile.am 10 Apr 2004 07:12:14 -0000 1.2
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libCalculator.la
+lib_LTLIBRARIES = libcalculator.la
SUBDIRS =
-libAdminService_la_SOURCES = Calculator.cpp CalculatorWrapper.cpp CalculatorService.cpp
-libAdminService_la_LIBADD = $(LDFLAGS)
+libcalculator_la_SOURCES = Calculator.cpp CalculatorWrapper.cpp CalculatorService.cpp
+libcalculator_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(AXISCPP_HOME)/include