axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject cvs commit: ws-axis/c/src/xml/xerces Makefile.am
Date Mon, 19 Jul 2004 11:33:39 GMT
damitha     2004/07/19 04:33:39

  Modified:    c        Makefile.am build.sh configure.ac
               c/deploy axiscpp.conf_linux axiscpp.conf_sample
                        deploy_apache.sh deploy_apache2.sh
               c/deploy/conf client.wsdd server.wsdd_linux
               c/samples Makefile.am
               c/samples/client/doclitfault Makefile.am
               c/samples/client/interoptests/base Makefile.am
               c/samples/client/interoptests/cbase Makefile.am
               c/samples/client/interoptests/cgroupB Makefile.am
               c/samples/client/interoptests/doclitbase Makefile.am
               c/samples/client/interoptests/doclitgroupB Makefile.am
               c/samples/client/interoptests/groupB Makefile.am
               c/samples/client/rpcfault Makefile.am
               c/samples/client/simple Makefile.am
               c/samples/client/testHandler Makefile.am
               c/src/common AxisConfig.cpp
               c/src/server Makefile.am
               c/src/server/apache Makefile.am
               c/src/server/apache2 Apache2Transport.h Makefile.am
               c/src/xml Makefile.am
               c/src/xml/expat Makefile.am XMLParserExpat.h
               c/src/xml/txpp/lib xpp.c
               c/src/xml/xerces Makefile.am
  Log:
  Changed the axiscpp installation procedure. Please see INSTALL document at the
  root of the src
  
  Revision  Changes    Path
  1.3       +1 -1      ws-axis/c/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/Makefile.am,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.am	17 Jun 2004 06:02:10 -0000	1.2
  +++ Makefile.am	19 Jul 2004 11:33:37 -0000	1.3
  @@ -1 +1 @@
  -SUBDIRS = src
  +SUBDIRS = src samples
  
  
  
  1.5       +14 -8     ws-axis/c/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.sh	9 Jun 2004 12:04:22 -0000	1.4
  +++ build.sh	19 Jul 2004 11:33:37 -0000	1.5
  @@ -15,18 +15,24 @@
   echo "run automake."            && 
   automake --add-missing --gnu    &&
   
  -echo "configure --libdir=$AXISCPP_HOME/bin --bindir=$AXISCPP_HOME/bin"
  -./configure --libdir=$AXISCPP_HOME/bin --bindir=$AXISCPP_HOME/bin
  +echo "configure --prefix=$AXISCPP_DEPLOY --libdir=$AXISCPP_DEPLOY/lib --bindir=$AXISCPP_DEPLOY/bin"
  +./configure --prefix=$AXISCPP_DEPLOY \
  +    --libdir=$AXISCPP_DEPLOY/lib \
  +    --bindir=$AXISCPP_DEPLOY/bin \
  +    --enable-apache2=yes \
  +    --enable-apache=yes \
  +    --enable-expat=yes \
  +    --enable-xercesc=yes
   echo "make"
   make 2> build_errors
   echo "make install"
   make install
   
  -cd ${AXISCPP_HOME}/samples/server
  -echo "building server samples"
  -sh build.sh
  +#cd ${AXISCPP_HOME}/samples/server
  +#echo "building server samples"
  +#sh build.sh
   
  -cd ${AXISCPP_HOME}/samples/client
  -echo "building client samples"
  -sh build.sh
  +#cd ${AXISCPP_HOME}/samples/client
  +#echo "building client samples"
  +#sh build.sh
   
  
  
  
  1.28      +156 -1    ws-axis/c/configure.ac
  
  Index: configure.ac
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/configure.ac,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- configure.ac	15 Jul 2004 11:26:59 -0000	1.27
  +++ configure.ac	19 Jul 2004 11:33:37 -0000	1.28
  @@ -1,6 +1,116 @@
   AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
   AM_INIT_AUTOMAKE(0.3)
   AM_CONFIG_HEADER(config.h)
  +
  +
  +dnl find the apache2 include dir in /usr/local/apache2
  +if test -d '/usr/local/apache2/include'; then
  +  apache2inc="-I/usr/local/apache2/include"
  +dnl else find it in the APACHE2_HOME env variable
  +elif test -d ${APACHE2_HOME}; then
  +  apache2inc="-I${APACHE2_HOME}/include"
  +fi
  +dnl find the apache include dir in /usr/local/apache
  +if test -d '/usr/local/apache/include'; then
  +    apacheinc="-I/usr/local/apache/include"
  +dnl else find it in the APACHE_HOME env variable
  +elif test -d ${APACHE_HOME}; then
  +    apacheinc="-I${APACHE_HOME}/include"
  +fi
  +dnl find the xercesc include dir in XERCESC_HOME
  +if test -d ${XERCESC_HOME}; then
  +    xercescinc="-I${XERCESC_HOME}/include"
  +    xercesclib="-L${XERCESC_HOME}/lib"
  +fi
  +dnl find the expat include dir in EXPAT_HOME
  +if test -d ${EXPAT_HOME}; then
  +    expatinc="-I${EXPAT_HOME}/include"
  +    expatlib="-I${EXPAT_HOME}/lib"
  +fi
  +
  +
  +
  +AC_MSG_CHECKING(whether to use apache2 as server transport)
  +AC_ARG_ENABLE(apache2, [  --enable-apache2        use apache2 as server transport.],
  +[ case "${enableval}" in
  +  no)
  +    AC_MSG_RESULT(no)
  +    APACHE2BUILD=""
  +    ;;
  +  *)
  +    AC_MSG_RESULT(yes)
  +    APACHE2BUILD="apache2"
  +    ;;
  +  esac ],
  +  AC_MSG_RESULT(no)
  +)
  +
  +AC_MSG_CHECKING(whether to use apache as server transport)
  +AC_ARG_ENABLE(apache, [  --enable-apache        use apache as server transport.],
  +[ case "${enableval}" in
  +  no)
  +    AC_MSG_RESULT(no)
  +    APACHEBUILD=""
  +    ;;
  +  *)
  +    AC_MSG_RESULT(yes)
  +    APACHEBUILD="apache"
  +    ;;
  +  esac ],
  +  AC_MSG_RESULT(no)
  +)
  +
  +AC_MSG_CHECKING(whether to build xercesc parser library)
  +AC_ARG_ENABLE(xercesc, [  --enable-xercesc    build xercesc parser library.],
  +[ case "${enableval}" in
  +  no)
  +    AC_MSG_RESULT(no)
  +    XERCESCBUILD=""
  +    ;;
  +  *)
  +    AC_MSG_RESULT(yes)
  +    XERCESCBUILD="xerces"
  +    
  +    ;;
  +  esac ],
  +  AC_MSG_RESULT(no)
  +)
  +
  +AC_MSG_CHECKING(whether to build expat parser library)
  +AC_ARG_ENABLE(expat, [  --enable-expat        build expat parser library.],
  +[ case "${enableval}" in
  +  no)
  +    AC_MSG_RESULT(no)
  +    EXPATBUILD=""
  +    ;;
  +  *)
  +    AC_MSG_RESULT(yes)
  +    EXPATBUILD="expat"
  +    
  +    ;;
  +  esac ],
  +  AC_MSG_RESULT(no)
  +)
  +
  +APACHE2INC=$apache2inc
  +APACHEINC=$apacheinc
  +XERCESCINC=$xercescinc
  +XERCESCLIB=$xercesclib
  +EXPATINC=$expatinc
  +EXPATLIB=$expatlib
  +LINKCLIENTLIB="-L${AXISCPP_DEPLOY}/lib -laxiscpp_client -ldl"
  +AC_SUBST(APACHE2INC)
  +AC_SUBST(APACHEINC)
  +AC_SUBST(XERCESCINC)
  +AC_SUBST(XERCESCLIB)
  +AC_SUBST(EXPATINC)
  +AC_SUBST(EXPATLIB)
  +AC_SUBST(XERCESCBUILD)
  +AC_SUBST(EXPATBUILD)
  +AC_SUBST(APACHE2BUILD)
  +AC_SUBST(APACHEBUILD)
  +AC_SUBST(LINKCLIENTLIB)
  +
   CFLAGS="-Wall -Wshadow -DENABLE_AXISTRACE"
   CPPFLAGS="-Wall -Wshadow -DENABLE_AXISTRACE"
   LDFLAGS="-s -lstdc++"
  @@ -9,12 +119,57 @@
   AC_PROG_INSTALL
   AC_PROG_LIBTOOL
   
  +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/apache/Makefile \
  +    src/server/simple_axis_server/Makefile \
  +    src/server/adminservice/Makefile \
  +    src/client/Makefile \
  +    src/client/adminclient/Makefile \
  +    src/xml/expat/Makefile \
  +    src/xml/xerces/Makefile \
  +    samples/Makefile \
  +    samples/server/Makefile \
  +    samples/server/interoptests/Makefile \
  +    samples/server/interoptests/base/Makefile \
  +    samples/server/interoptests/cbase/Makefile \
  +    samples/server/interoptests/groupB/Makefile \
  +    samples/server/interoptests/cgroupB/Makefile \
  +    samples/server/interoptests/doclitbase/Makefile \
  +    samples/server/interoptests/doclitgroupB/Makefile \
  +    samples/server/simple/Makefile \
  +    samples/server/rpcfault/Makefile \
  +    samples/server/doclitfault/Makefile \
  +    samples/server/echoStringHeaderHandler/Makefile \
  +    samples/client/Makefile \
  +    samples/client/interoptests/Makefile \
  +    samples/client/interoptests/base/Makefile \
  +    samples/client/interoptests/cbase/Makefile \
  +    samples/client/interoptests/groupB/Makefile \
  +    samples/client/interoptests/cgroupB/Makefile \
  +    samples/client/interoptests/doclitbase/Makefile \
  +    samples/client/interoptests/doclitgroupB/Makefile \
  +    samples/client/simple/Makefile \
  +    samples/client/rpcfault/Makefile \
  +    samples/client/doclitfault/Makefile \
  +    samples/client/testHandler/Makefile)
   #{apache2 block starts
   #if you use apache2
   
   #if you need to build both axis_expat and axis_xerces libraries
   
  -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 src/xml/expat/Makefile
src/xml/xerces/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 src/xml/expat/Makefile
src/xml/xerces/Makefile)
   
   #if you need to build only axis_expat
   
  
  
  
  1.8       +5 -5      ws-axis/c/deploy/axiscpp.conf_linux
  
  Index: axiscpp.conf_linux
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/deploy/axiscpp.conf_linux,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- axiscpp.conf_linux	6 Jul 2004 08:34:40 -0000	1.7
  +++ axiscpp.conf_linux	19 Jul 2004 11:33:37 -0000	1.8
  @@ -12,8 +12,8 @@
   #NodeName:Node name
   #ListenPort:Listening port
   
  -LogPath:/usr/local/Axis/logs/AxisLog
  -WSDDFilePath:/usr/local/Axis/conf/server.wsdd
  -ClientLogPath:/usr/local/Axis/logs/AxisClientLog
  -XMLParser:/usr/local/Axis/libs/libaxis_xmlparser.so
  -Transport_http:/usr/local/Axis/libs/libaxis_transport.so
  +LogPath:/usr/local/axiscpp_deploy/log/AxisLog
  +WSDDFilePath:/usr/local/axiscpp_deploy/conf/server.wsdd
  +ClientLogPath:/usr/local/axiscpp_deploy/log/AxisClientLog
  +XMLParser:/usr/local/axiscpp_deploy/lib/libaxis_xmlparser.so
  +Transport_http:/usr/local/axiscpp_deploy/lib/libaxis_transport.so
  
  
  
  1.4       +4 -4      ws-axis/c/deploy/axiscpp.conf_sample
  
  Index: axiscpp.conf_sample
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/deploy/axiscpp.conf_sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- axiscpp.conf_sample	29 Apr 2004 06:53:43 -0000	1.3
  +++ axiscpp.conf_sample	19 Jul 2004 11:33:37 -0000	1.4
  @@ -1,5 +1,5 @@
  -AXISLOGPATH:/usr/local/Axis/logs/AxisLog
  -WSDDFILEPATH:/usr/local/Axis/conf/server.wsdd
  -CLIENTWSDDFILEPATH:/usr/local/Axis/conf/client.wsdd
  -AXISCLIENTLOGPATH:/usr/local/Axis/logs/AxisClientLog
  +AXISLOGPATH:/usr/local/axiscpp_deploy/logs/AxisLog
  +WSDDFILEPATH:/usr/local/axiscpp_deploy/conf/server.wsdd
  +CLIENTWSDDFILEPATH:/usr/local/axiscpp_deploy/conf/client.wsdd
  +AXISCLIENTLOGPATH:/usr/local/axiscpp_deploy/logs/AxisClientLog
   
  
  
  
  1.2       +3 -9      ws-axis/c/deploy/deploy_apache.sh
  
  Index: deploy_apache.sh
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/deploy/deploy_apache.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- deploy_apache.sh	10 Jun 2004 04:24:51 -0000	1.1
  +++ deploy_apache.sh	19 Jul 2004 11:33:37 -0000	1.2
  @@ -1,15 +1,9 @@
   #!/bin/bash
   
   rm /usr/local/apache/libexec/libaxiscpp_mod.so
  -rm webservices/libAdminService.so
  -rm libs/libserver_engine.so
  -rm libs/libaxis_transport.so
  -rm libs/libaxis_xmlparser.so
  -cp -f $AXISCPP_HOME/bin/libAdminService.so webservices/
  -cp -f $AXISCPP_HOME/bin/libserver_engine.so libs/
  -cp -f $AXISCPP_HOME/bin/libaxiscpp_mod.so /usr/local/apache/libexec/
  -cp -f $AXISCPP_HOME/bin/libaxis_transport.so libs/
  -cp -f $AXISCPP_HOME/bin/libaxis_expat.so libs/libaxis_xmlparser.so
  +rm lib/libaxis_xmlparser.so
  +cp -f lib/libaxiscpp_mod.so /usr/local/apache/libexec/
  +cp -f lib/libaxis_expat.so lib/libaxis_xmlparser.so
   /usr/local/apache/bin/apachectl stop
   sleep 2
   /usr/local/apache/bin/apachectl start
  
  
  
  1.3       +3 -9      ws-axis/c/deploy/deploy_apache2.sh
  
  Index: deploy_apache2.sh
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/deploy/deploy_apache2.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- deploy_apache2.sh	10 Jun 2004 04:34:17 -0000	1.2
  +++ deploy_apache2.sh	19 Jul 2004 11:33:37 -0000	1.3
  @@ -1,15 +1,9 @@
   #!/bin/bash
   
   rm /usr/local/apache2/modules/libaxiscpp_mod2.so
  -rm webservices/libAdminService.so
  -rm libs/libserver_engine.so
  -rm libs/libaxis_transport.so
  -rm libs/libaxis_xmlparser.so
  -cp -f $AXISCPP_HOME/bin/libAdminService.so webservices/
  -cp -f $AXISCPP_HOME/bin/libserver_engine.so libs/
  -cp -f $AXISCPP_HOME/bin/libaxiscpp_mod2.so /usr/local/apache2/modules/
  -cp -f $AXISCPP_HOME/bin/libaxis_transport.so libs/
  -cp -f $AXISCPP_HOME/bin/libaxis_expat.so libs/libaxis_xmlparser.so
  +rm lib/libaxis_xmlparser.so
  +cp -f lib/libaxiscpp_mod2.so /usr/local/apache2/modules/
  +cp -f lib/libaxis_expat.so lib/libaxis_xmlparser.so
   /usr/local/apache2/bin/apachectl stop
   sleep 2
   /usr/local/apache2/bin/apachectl start
  
  
  
  1.5       +1 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- client.wsdd	28 Apr 2004 11:41:54 -0000	1.4
  +++ client.wsdd	19 Jul 2004 11:33:38 -0000	1.5
  @@ -2,7 +2,7 @@
   <deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:C="http://xml.apache.org/axis/wsdd/providers/c">
 
   <service name="Calculator" provider="CPP:DOCUMENT" description="Simple Calculator">
   <requestFlow name="test-handler-req">        
  -<handler name="TestHandler" type="/usr/local/Axis/handlers/client2/test_handler/libtest_client_handler.so">/>
       
  +<handler name="TestHandler" type="/usr/local/axiscpp_deploy/handlers/client2/test_handler/libtest_client_handler.so">/>
       
   </handler>  
   </requestFlow>
   </service>
  
  
  
  1.6       +10 -10    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- server.wsdd_linux	28 May 2004 03:17:34 -0000	1.5
  +++ server.wsdd_linux	19 Jul 2004 11:33:38 -0000	1.6
  @@ -4,43 +4,43 @@
   	</globalConfiguration>
   	<service name="AxisAdmin" provider="CPP:DOCUMENT" description="Axis C++ Administration
web service">
   		<parameter name="allowedMethods" value="updateWSDD "/>
  -		<parameter name="className" value="/usr/local/Axis/webservices/libAdminService.so"
/>
  +		<parameter name="className" value="/usr/local/axiscpp_deploy/lib/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/Axis/webservices/libcalculator.so"
/>
  +                <parameter name="className" value="/usr/local/axiscpp_deploy/lib/libcalculator.so"
/>
           </service>
   	<service name="MathOps" provider="CPP:RPC" description="Simple sample to demonstrate
fault mapping and exception handling">
                   <parameter name="allowedMethods" value="div "/>
  -                <parameter name="className" value="/usr/local/Axis/webservices/libmathops.so"
/>
  +                <parameter name="className" value="/usr/local/axiscpp_deploy/lib/libmathops.so"
/>
           </service>
   	<service name="MathOpsDL" provider="CPP:DOCUMENT" description="Simple sample to demonstrate
fault mapping and exception handling">
                   <parameter name="allowedMethods" value="div "/>
  -                <parameter name="className" value="/usr/local/Axis/webservices/libdoclitmathops.so"
/>
  +                <parameter name="className" value="/usr/local/axiscpp_deploy/lib/libdoclitmathops.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 "/>
  -		<parameter name="className" value="/usr/local/Axis/webservices/libdoclitbase.so" />
  +		<parameter name="className" value="/usr/local/axiscpp_deploy/lib/libdoclitbase.so"
/>
   	</service>
   	<service name="groupBDL" provider="CPP:DOCUMENT" description="SOAPBuilders Interoperability
Lab Round 2 GroupB test suite described at http://www.whitemesa.com/interop/proposal2.html
">
   		<parameter name="allowedMethods" value="echoSimpleTypesAsStruct echoNestedStruct echoNestedArray
echoStructAsSimpleTypes "/>
  -		<parameter name="className" value="/usr/local/Axis/webservices/libdoclitgroupB.so"
/>
  +		<parameter name="className" value="/usr/local/axiscpp_deploy/lib/libdoclitgroupB.so"
/>
   	</service>
   	<service name="base" provider="CPP:RPC" 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 "/>
  -		<parameter name="className" value="/usr/local/Axis/webservices/libbase.so" />
  +		<parameter name="className" value="/usr/local/axiscpp_deploy/lib/libbase.so" />
   	</service>
   	<service name="cbase" provider="C:RPC" 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 "/>
  -		<parameter name="className" value="/usr/local/Axis/webservices/libcbase.so" />
  +		<parameter name="className" value="/usr/local/axiscpp_deploy/lib/libcbase.so" />
   	</service>
   	<service name="cgroupB" provider="C:RPC" description="SOAPBuilders Interoperability
Lab Round 2 GroupB test suite described at http://www.whitemesa.com/interop/proposal2.html
">
   		<parameter name="allowedMethods" value="echoSimpleTypesAsStruct echoNestedStruct echoNestedArray
echoStructAsSimpleTypes "/>
  -		<parameter name="className" value="/usr/local/Axis/webservices/libcgroupB.so" />
  +		<parameter name="className" value="/usr/local/axiscpp_deploy/lib/libcgroupB.so" />
   	</service>
   	<service name="groupB" provider="CPP:RPC" description="SOAPBuilders Interoperability
Lab Round 2 GroupB test suite described at http://www.whitemesa.com/interop/proposal2.html
">
   		<parameter name="allowedMethods" value="echoSimpleTypesAsStruct echoNestedStruct echoNestedArray
echoStructAsSimpleTypes "/>
  -		<parameter name="className" value="/usr/local/Axis/webservices/libgroupB.so" />
  +		<parameter name="className" value="/usr/local/axiscpp_deploy/lib/libgroupB.so" />
   	</service>
   </deployment>
  
  
  
  1.2       +1 -1      ws-axis/c/samples/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/Makefile.am,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.am	16 Jul 2004 12:15:48 -0000	1.1
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.2
  @@ -1 +1 @@
  -SUBDIRS = server
  +SUBDIRS = server client
  
  
  
  1.3       +1 -1      ws-axis/c/samples/client/doclitfault/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/doclitfault/Makefile.am,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.am	6 Jul 2004 08:34:41 -0000	1.2
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.3
  @@ -5,5 +5,5 @@
                     MathOpsClient.cpp \
                     DivByZeroStruct.cpp \
                     AxisClientException.cpp
  -doclitmathops_LDADD   =  $(LDFLAGS)
  +doclitmathops_LDADD   =  @LINKCLIENTLIB@
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.13      +1 -1      ws-axis/c/samples/client/interoptests/base/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/base/Makefile.am,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Makefile.am	27 May 2004 03:38:20 -0000	1.12
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.13
  @@ -3,5 +3,5 @@
   AM_CPPFLAGS = $(CPPFLAGS)
   base_SOURCES = InteropBaseClient.cpp InteropTestPortType.cpp  SOAPStruct.cpp 
   
  -base_LDADD   =  $(LDFLAGS)
  +base_LDADD   =  @LINKCLIENTLIB@
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.10      +1 -1      ws-axis/c/samples/client/interoptests/cbase/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cbase/Makefile.am,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.am	7 Apr 2004 06:00:24 -0000	1.9
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.10
  @@ -3,5 +3,5 @@
   AM_CFLAGS = $(CFLAGS)
   cbase_SOURCES = InteropBaseClient.c InteropTestPortType.c  SOAPStruct.c
   
  -cbase_LDADD   =  $(LDFLAGS)
  +cbase_LDADD   =  @LINKCLIENTLIB@
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.7       +1 -1      ws-axis/c/samples/client/interoptests/cgroupB/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cgroupB/Makefile.am,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.am	7 Apr 2004 06:00:24 -0000	1.6
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.7
  @@ -3,5 +3,5 @@
   AM_CFLAGS = $(CFLAGS)
   cgroupB_SOURCES = InteropGroupBClient.c InteropTestPortTypeB.c SOAPArrayStruct.c SOAPStruct.c
SOAPStructStruct.c
   
  -cgroupB_LDADD   =  $(LDFLAGS)
  +cgroupB_LDADD   =  @LINKCLIENTLIB@
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.7       +1 -1      ws-axis/c/samples/client/interoptests/doclitbase/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/doclitbase/Makefile.am,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.am	7 Apr 2004 06:00:24 -0000	1.6
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.7
  @@ -3,5 +3,5 @@
   AM_CPPFLAGS = $(CPPFLAGS)
   doclitbase_SOURCES = InteropBaseClient.cpp InteropTestPortType.cpp  SOAPStruct.cpp 
   
  -doclitbase_LDADD = $(LDFLAGS)
  +doclitbase_LDADD = @LINKCLIENTLIB@
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.7       +1 -1      ws-axis/c/samples/client/interoptests/doclitgroupB/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/doclitgroupB/Makefile.am,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.am	7 Apr 2004 06:00:24 -0000	1.6
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.7
  @@ -3,5 +3,5 @@
   AM_CPPFLAGS = $(CPPFLAGS)
   doclitgroupB_SOURCES = InteropGroupBClient.cpp InteropTestPortTypeB.cpp SOAPArrayStruct.cpp
SOAPStruct.cpp SOAPStructStruct.cpp
   
  -doclitgroupB_LDADD   = $(LDFLAGS)
  +doclitgroupB_LDADD   = @LINKCLIENTLIB@
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.10      +1 -1      ws-axis/c/samples/client/interoptests/groupB/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/groupB/Makefile.am,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.am	7 Apr 2004 06:00:24 -0000	1.9
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.10
  @@ -3,5 +3,5 @@
   AM_CPPFLAGS = $(CPPFLAGS)
   groupB_SOURCES = InteropGroupBClient.cpp InteropTestPortTypeB.cpp SOAPArrayStruct.cpp SOAPStruct.cpp
SOAPStructStruct.cpp
   
  -groupB_LDADD   =  $(LDFLAGS)
  +groupB_LDADD   =  @LINKCLIENTLIB@
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.6       +1 -1      ws-axis/c/samples/client/rpcfault/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/rpcfault/Makefile.am,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.am	6 Jul 2004 08:34:41 -0000	1.5
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.6
  @@ -5,5 +5,5 @@
                     MathOpsClient.cpp \
                     DivByZeroStruct.cpp \
                     AxisClientException.cpp
  -mathops_LDADD   =  $(LDFLAGS)
  +mathops_LDADD   =  @LINKCLIENTLIB@
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.6       +1 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.am	18 May 2004 11:17:46 -0000	1.5
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.6
  @@ -2,5 +2,5 @@
   SUBDIRS =
   AM_CPPFLAGS = $(CPPFLAGS)
   calculator_SOURCES = Calculator.cpp CalcClient.cpp
  -calculator_LDADD   =  $(LDFLAGS)
  +calculator_LDADD   =  @LINKCLIENTLIB@
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.2       +1 -1      ws-axis/c/samples/client/testHandler/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/testHandler/Makefile.am,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.am	9 Apr 2004 10:56:41 -0000	1.1
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.2
  @@ -1,6 +1,6 @@
   lib_LTLIBRARIES = libtest_client_handler.la
   SUBDIRS =
   libtest_client_handler_la_SOURCES = THandler.cpp TestHandler.cpp 
  -libtest_client_handler_la_LIBADD   =  $(LDFLAGS)
  +libtest_client_handler_la_LIBADD   =  @LINKCLIENTLIB@
   
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  
  1.39      +4 -4      ws-axis/c/src/common/AxisConfig.cpp
  
  Index: AxisConfig.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/AxisConfig.cpp,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- AxisConfig.cpp	19 Jul 2004 08:47:08 -0000	1.38
  +++ AxisConfig.cpp	19 Jul 2004 11:33:38 -0000	1.39
  @@ -36,7 +36,7 @@
   	m_pcKeyArray[AXCONF_CLIENTLOGPATH] = "ClientLogPath";
   	m_pcKeyArray[AXCONF_CLIENTWSDDFILEPATH] = "ClientWSDDFilePath";
   	/*
  -	The value for this is taken from the environment variable "AXIS_HOME".
  +	The value for this is taken from the environment variable "AXISCPP_DEPLOY".
   	So no need for a key for AXCONF_AXISHOME
   	*/
   	m_pcKeyArray[AXCONF_AXISHOME] = "\0";
  @@ -96,10 +96,10 @@
   	const char pcComment = '#';
   
   
  -    sConfPath = getenv ("AXIS_HOME");
  +    sConfPath = getenv ("AXISCPP_DEPLOY");
   	m_pcValueArray[AXCONF_AXISHOME] = sConfPath;
   	/*
  -	Even if the AXIS_HOME environment variable is not set default values 
  +	Even if the AXISCPP_DEPLOY environment variable is not set default values 
   	will be used. Therefore return AXIS_SUCCESS
   	*/
       if (!sConfPath || (sConfPath == '\0') )
  @@ -110,7 +110,7 @@
       strcpy (sNewConfPath, sConfPath);
       strcat (sNewConfPath, "/axiscpp.conf");
   	/*
  -	Even if axiscpp.conf does not exist in AXIS_HOME default values 
  +	Even if axiscpp.conf does not exist in AXISCPP_DEPLOY default values 
   	will be used. Therefore return AXIS_SUCCESS
   	*/
       if (AXIS_SUCCESS != fileConfig.fileOpen(sNewConfPath, "r"))
  
  
  
  1.12      +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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.am	10 Jun 2004 03:57:06 -0000	1.11
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.12
  @@ -1,6 +1,7 @@
   #if you use apache2
  +SUBDIRS = @APACHE2BUILD@
   #SUBDIRS = apache2 adminservice simple_axis_server
  -SUBDIRS = apache2 adminservice
  +#SUBDIRS = apache2 adminservice
   
   #if you use apache1.3
   #SUBDIRS = apache adminservice simple_axis_server
  
  
  
  1.13      +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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Makefile.am	14 May 2004 08:30:19 -0000	1.12
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.13
  @@ -4,4 +4,4 @@
   
   libaxiscpp_mod_la_LIBADD   = $(LDFLAGS) -L$(AXISCPP_HOME)/src/engine/server -lserver_engine
-ldl
   
  -INCLUDES = -I$(AXISCPP_HOME)/include
  +INCLUDES = @APACHEINC@ -I$(AXISCPP_HOME)/include
  
  
  
  1.4       +9 -1      ws-axis/c/src/server/apache2/Apache2Transport.h
  
  Index: Apache2Transport.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/apache2/Apache2Transport.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Apache2Transport.h	6 Jul 2004 14:16:46 -0000	1.3
  +++ Apache2Transport.h	19 Jul 2004 11:33:38 -0000	1.4
  @@ -26,13 +26,21 @@
   #if !defined(AXIS_APACHE2TRANSPORT_H__OF_AXIS_INCLUDED_)
   #define AXIS_APACHE2TRANSPORT_H__OF_AXIS_INCLUDED_
   
  -#include <apache2_0/httpd.h>
  +/*#include <apache2_0/httpd.h>
   #include <apache2_0/http_config.h>
   #include <apache2_0/http_core.h>
   #include <apache2_0/http_protocol.h>
   #include <apache2_0/http_log.h>
   #include <apache2_0/ap_compat.h>
   #include <apache2_0/apr_tables.h>
  +*/
  +#include <httpd.h>
  +#include <http_config.h>
  +#include <http_core.h>
  +#include <http_protocol.h>
  +#include <http_log.h>
  +#include <ap_compat.h>
  +#include <apr_tables.h>
   #include "../../transport/SOAPTransport.h"
   #include <string.h>
   
  
  
  
  1.11      +1 -1      ws-axis/c/src/server/apache2/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/apache2/Makefile.am,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.am	25 May 2004 06:38:02 -0000	1.10
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.11
  @@ -5,4 +5,4 @@
   libaxiscpp_mod2_la_LIBADD   = $(LDFLAGS) -L$(AXISCPP_HOME)/src/engine/server -lserver_engine
-ldl
   
   
  -INCLUDES = -I$(AXISCPP_HOME)/include
  +INCLUDES = @APACHE2INC@ -I$(AXISCPP_HOME)/include
  
  
  
  1.12      +2 -1      ws-axis/c/src/xml/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/Makefile.am,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.am	25 Jun 2004 13:32:45 -0000	1.11
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.12
  @@ -1,5 +1,6 @@
   noinst_LTLIBRARIES = libxml.la
  -SUBDIRS = expat xerces
  +SUBDIRS = @EXPATBUILD@ @XERCESCBUILD@
  +#SUBDIRS = expat xerces
   #SUBDIRS = expat
   #SUBDIRS = xerces
   
  
  
  
  1.5       +2 -2      ws-axis/c/src/xml/expat/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/expat/Makefile.am,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.am	13 Jun 2004 11:27:00 -0000	1.4
  +++ Makefile.am	19 Jul 2004 11:33:38 -0000	1.5
  @@ -2,6 +2,6 @@
   AM_CPPFLAGS = $(CPPFLAGS)
   libaxis_expat_la_SOURCES = XMLParserExpat.cpp ParserLoader.cpp ../AxisParseException.cpp
   
  -libaxis_expat_la_LIBADD = -L$(EXPAT_HOME) -lexpat -lstdc++
  -INCLUDES = -I$(AXISCPP_HOME)/include
  +libaxis_expat_la_LIBADD = @EXPATLIB@ -lexpat -lstdc++
  +INCLUDES = @EXPATINC@ -I$(AXISCPP_HOME)/include
   
  
  
  
  1.5       +4 -1      ws-axis/c/src/xml/expat/XMLParserExpat.h
  
  Index: XMLParserExpat.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/expat/XMLParserExpat.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLParserExpat.h	6 Jul 2004 14:16:48 -0000	1.4
  +++ XMLParserExpat.h	19 Jul 2004 11:33:38 -0000	1.5
  @@ -24,8 +24,11 @@
   
   #if !defined(__XMLPARSEREXPAT_H_OF_AXIS_INCLUDED__)
   #define __XMLPARSEREXPAT_H_OF_AXIS_INCLUDED__
  -
  +#ifdef WIN32
   #include <expat/expat.h>
  +#else
  +#include <expat.h>
  +#endif
   #include <axis/server/Packet.h>
   
   #include "../QName.h"
  
  
  
  1.8       +2 -3      ws-axis/c/src/xml/txpp/lib/xpp.c
  
  Index: xpp.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/txpp/lib/xpp.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- xpp.c	19 Jul 2004 03:30:43 -0000	1.7
  +++ xpp.c	19 Jul 2004 11:33:38 -0000	1.8
  @@ -116,7 +116,7 @@
           /* printf("versionend:%s\n", versionend); */
           *(protocolEncodingName + (ct->m_currentTokPoint - protocolEncodingName) - 3)
= '\0';
       
  -        printf("encodingName:%s\n", protocolEncodingName);
  +        /*printf("encodingName:%s\n", protocolEncodingName);*/
           /* if(standalone) */
           /* printf("standalone:%s\n", standalone); */
           initializeEncoding(ct);
  @@ -272,7 +272,7 @@
       int done;
       *numchars = 0;
       len = fread(buff, 1, toBeFilledSize, stdin);
  -    printf("len:%d\n", len);
  +    /*printf("len:%d\n", len);*/
       *numchars += len;
           if (ferror(stdin))
           {
  @@ -282,7 +282,6 @@
           done = feof(stdin);
       if(done) 
           isDone = 1;
  -    printf("came3\n");
       return SPP_ERROR_NONE;
   }
   
  
  
  
  1.5       +2 -2      ws-axis/c/src/xml/xerces/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/xerces/Makefile.am,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.am	13 Jun 2004 13:23:44 -0000	1.4
  +++ Makefile.am	19 Jul 2004 11:33:39 -0000	1.5
  @@ -7,6 +7,6 @@
                              XercesHandler.cpp \
   			   ../AxisParseException.cpp
   
  -libaxis_xercesc_la_LIBADD =  -L$(XERCESC_HOME)/lib -lxerces-c -lstdc++
  -INCLUDES = -I$(AXISCPP_HOME)/include
  +libaxis_xercesc_la_LIBADD =  @XERCESCLIB@ -lxerces-c -lstdc++
  +INCLUDES = @XERCESCINC@ -I$(AXISCPP_HOME)/include
   
  
  
  

Mime
View raw message