tomj 2002/10/14 14:59:31
Modified: java build.xml
java/test/wsdl/interop3 endpoints endpoints-local run.sh
java/test/wsdl/interop3/compound1 build.xml
java/test/wsdl/interop3/compound2 build.xml
Compound2TestCase.java
java/test/wsdl/interop3/docLit build.xml
java/test/wsdl/interop3/docLitParam build.xml
java/test/wsdl/interop3/import1 build.xml
java/test/wsdl/interop3/import2 build.xml
java/test/wsdl/interop3/import3 build.xml
java/test/wsdl/interop3/rpcEnc build.xml
java/test/wsdl/interop4/groupi client-config.wsdd
Added: java/test/wsdl/interop3 build.xml README.txt
java/test/wsdl/interop3/emptysa build.xml emptysa.wsdl
EmptySATestCase.java
SoapInteropEmptySABindingImpl.java
Removed: java/test/wsdl/interop3 emptysa.xml import1.xml RPCEncD.xml
Log:
Fix up the interop3 directory and added a README.txt file.
To build, you can
1. Run the interop3 target from the top level
2. Run 'ant' in the interop3 directory
3. Run 'ant' in each of the test directories
To deploy the Group D services:
- Run 'ant deploy' in the interop3 directory
To run the tests
- Execute the run.sh file with an endpoint file argument
Example: './run.sh endpoints-local' will execute against SimpleAxisServer
There is also a Java driver, Interop3TestCase.java, that Glen wrote, but I
don't use it. It should work if the test.properties file is set up correctly.
Revision Changes Path
1.206 +3 -2 xml-axis/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/build.xml,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- build.xml 11 Oct 2002 23:24:54 -0000 1.205
+++ build.xml 14 Oct 2002 21:59:29 -0000 1.206
@@ -417,8 +417,9 @@
<!-- =================================================================== -->
<!-- Interop 3 -->
<!-- =================================================================== -->
- <target name="interop3" depends="buildTest"
- description="run the round3 interop tests">
+ <target name="interop3" depends=""
+ description="compile the round3 interop tests">
+ <ant dir="test/wsdl/interop3/emptysa"/>
<ant dir="test/wsdl/interop3/import1"/>
<ant dir="test/wsdl/interop3/import2"/>
<ant dir="test/wsdl/interop3/import3"/>
1.3 +1 -3 xml-axis/java/test/wsdl/interop3/endpoints
Index: endpoints
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/endpoints,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- endpoints 3 Jun 2002 03:07:00 -0000 1.2
+++ endpoints 14 Oct 2002 21:59:29 -0000 1.3
@@ -4,6 +4,7 @@
# Where <endpointfile> has the syntax
# TESTNAME="<endpoint>"
#
+EmptySA=http://www.whitemesa.net/interop/r3/emptySA
Import1=http://www.whitemesa.net/interop/r3/import1
Import2=http://www.whitemesa.net/interop/r3/import2
Import3=http://www.whitemesa.net/interop/r3/import3
@@ -12,9 +13,6 @@
DocLit=http://www.whitemesa.net/interop/r3/doclit
DocLitParam=http://www.whitemesa.net/interop/r3/doclitparam
RpcEnc=http://www.whitemesa.net/interop/r3/rpcEnc
-
-# No client for this one yet
-EmptySA=http://www.whitemesa.net/interop/r3/emptySA
# Group E
1.3 +3 -3 xml-axis/java/test/wsdl/interop3/endpoints-local
Index: endpoints-local
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/endpoints-local,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- endpoints-local 4 Jun 2002 01:04:22 -0000 1.2
+++ endpoints-local 14 Oct 2002 21:59:29 -0000 1.3
@@ -7,7 +7,10 @@
# You will need to build the 'interop3' target from the top level ant
# file, then deploy the services from the build/work/test/wsdl/interop3/*
# directories.
+
+# Group D
#
+EmptySA=http://localhost:8080/axis/services/SoapInteropEmptySAPort
Import1=http://localhost:8080/axis/services/SoapInteropImport1Port
Import2=http://localhost:8080/axis/services/SoapInteropImport2Port
Import3=http://localhost:8080/axis/services/SoapInteropImport3Port
@@ -16,9 +19,6 @@
DocLit=http://localhost:8080/axis/services/WSDLInteropTestDocLitPort
DocLitParam=http://localhost:8080/axis/services/WSDLInteropTestDocLitParamPort
RpcEnc=http://localhost:8080/axis/services/WSDLInteropTestRpcEncPort
-
-# No client for this one yet
-EmptySA=
# Group E
1.3 +5 -3 xml-axis/java/test/wsdl/interop3/run.sh
Index: run.sh
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/run.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- run.sh 31 May 2002 21:31:17 -0000 1.2
+++ run.sh 14 Oct 2002 21:59:29 -0000 1.3
@@ -21,9 +21,11 @@
# EmptySA
-#if [ ! -z "${Import1}" ]; then
-#java test.wsdl.interop3.emptySA.EmptySATestCase ${EmptySA}
-#fi
+echo EmptySA
+if [ ! -z "${Import1}" ]; then
+ java test.wsdl.interop3.emptysa.EmptySATestCase ${EmptySA}
+echo "======================================================="
+fi
# Import1
echo Import1
1.1 xml-axis/java/test/wsdl/interop3/build.xml
Index: build.xml
===================================================================
<?xml version="1.0"?>
<!DOCTYPE project [
<!ENTITY properties SYSTEM "file:../../../xmls/properties.xml">
<!ENTITY paths SYSTEM "file:../../../xmls/path_refs.xml">
<!ENTITY taskdefs SYSTEM "file:../../../xmls/taskdefs.xml">
<!ENTITY taskdefs_post_compile SYSTEM
"file:../../../xmls/taskdefs_post_compile.xml">
<!ENTITY targets SYSTEM "file:../../../xmls/targets.xml">
]>
<project name="Round3" default="interop3">
<property name="axis.home" location="../../.." />
<property name="componentName" value="test/wsdl/interop3" />
&properties;
&paths;
&taskdefs;
&taskdefs_post_compile;
&targets;
<target name="interop3" depends="" description="compile the round3 interop tests">
<ant dir="emptysa"/>
<ant dir="import1"/>
<ant dir="import2"/>
<ant dir="import3"/>
<ant dir="compound1"/>
<ant dir="compound2"/>
<ant dir="docLit"/>
<ant dir="docLitParam"/>
<ant dir="rpcEnc"/>
</target>
<target name="clean">
<ant dir="emptysa" target="clean"/>
<ant dir="import1" target="clean"/>
<ant dir="import2" target="clean"/>
<ant dir="import3" target="clean"/>
<ant dir="compound1" target="clean"/>
<ant dir="compound2" target="clean"/>
<ant dir="docLit" target="clean"/>
<ant dir="docLitParam" target="clean"/>
<ant dir="rpcEnc" target="clean" />
</target>
<target name="deploy">
<path id="deploy.xml.files">
<fileset dir="${build.dir}">
<include name="work/${componentName}/**/deploy.wsdd"/>
</fileset>
</path>
<property name="deploy.xml.property" refid="deploy.xml.files"/>
<java classname="org.apache.axis.client.AdminClient" fork="yes">
<classpath refid="classpath" />
<arg line="${deploy.xml.property}"/>
</java>
</target>
</project>
1.1 xml-axis/java/test/wsdl/interop3/README.txt
Index: README.txt
===================================================================
These are the Round 3, Group D and E SOAP Builders interop tests.
To build, you can
1. Run the interop3 target from the top level
2. Run 'ant' in the interop3 directory
3. Run 'ant' in each of the test directories
To deploy the Group D services to Axis:
- Run 'ant deploy' in the this (the interop3) directory
To run the tests
- Execute the run.sh file with an endpoint file argument
Example:
./run.sh endpoints-local
will execute each test against the services running in SimpleAxisServer
There is also a Java driver, Interop3TestCase.java.
This reads the test.properties file in the classpath and exectes the test
classes listed with the endpoint URL provided.
It should work if the test.properties file is set up correctly.
Tom Jordahl
10/14/02
1.14 +13 -9 xml-axis/java/test/wsdl/interop3/compound1/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/compound1/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 19 Sep 2002 15:58:01 -0000 1.13
+++ build.xml 14 Oct 2002 21:59:30 -0000 1.14
@@ -51,23 +51,27 @@
</fileset>
</path>
- <taskdef name="wsdl2java"
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask">
- <classpath refid="test-classpath"/>
- </taskdef>
-
+ <target name="clean">
+ <echo message="Removing ${build.dir}/classes/${componentName} and
${build.dir}/work/${componentName}" />
+ <delete dir="${build.dir}/classes/${componentName}"/>
+ <delete dir="${build.dir}/work/${componentName}"/>
+ </target>
+
+
<target name="main">
<property name="testname" value="compound1"/>
<!-- generate skeletons -->
- <wsdl2java url="http://www.whitemesa.com/r3/${testname}.wsdl";
- output="${root.dir}/build/work" skeletonDeploy="no"
+ <!-- <wsdl2java url="http://www.whitemesa.com/r3/${testname}.wsdl"; -->
+ <wsdl2java url="${axis.home}/test/wsdl/interop3/${testname}/${testname}.wsdl"
+ output="${axis.home}/build/work" skeletonDeploy="no"
serverSide="yes"/>
<copy file="SoapInteropCompound1BindingImpl.java" overwrite="true"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
- <copy file="Compound1TestCase.java"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ <copy file="Compound1TestCase.java" overwrite="true"
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
<!-- compile the skeletons -->
<javac srcdir="${build.dir}/work"
1.16 +12 -9 xml-axis/java/test/wsdl/interop3/compound2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/compound2/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 19 Sep 2002 15:58:01 -0000 1.15
+++ build.xml 14 Oct 2002 21:59:30 -0000 1.16
@@ -51,23 +51,26 @@
</fileset>
</path>
- <taskdef name="wsdl2java"
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask">
- <classpath refid="test-classpath"/>
- </taskdef>
-
+ <target name="clean">
+ <echo message="Removing ${build.dir}/classes/${componentName} and
${build.dir}/work/${componentName}" />
+ <delete dir="${build.dir}/classes/${componentName}"/>
+ <delete dir="${build.dir}/work/${componentName}"/>
+ </target>
+
<target name="main">
<property name="testname" value="compound2"/>
<!-- generate skeletons -->
- <wsdl2java url="http://www.whitemesa.com/r3/${testname}.wsdl";
- output="${root.dir}/build/work" skeletonDeploy="no"
+ <!-- <wsdl2java url="http://www.whitemesa.com/r3/${testname}.wsdl"; -->
+ <wsdl2java url="${axis.home}/test/wsdl/interop3/${testname}/${testname}.wsdl"
+ output="${axis.home}/build/work" skeletonDeploy="no"
serverSide="yes"/>
<copy file="SoapInteropCompound2BindingImpl.java" overwrite="true"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
- <copy file="Compound2TestCase.java"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ <copy file="Compound2TestCase.java" overwrite="true"
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
<!-- compile the skeletons -->
<javac srcdir="${build.dir}/work"
1.5 +19 -0
xml-axis/java/test/wsdl/interop3/compound2/Compound2TestCase.java
Index: Compound2TestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop3/compound2/Compound2TestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Compound2TestCase.java 30 May 2002 23:46:03 -0000 1.4
+++ Compound2TestCase.java 14 Oct 2002 21:59:30 -0000 1.5
@@ -2,6 +2,7 @@
import java.net.URL;
+import java.util.Properties;
import test.wsdl.interop3.compound2.xsd.Employee;
import test.wsdl.interop3.compound2.xsd.Person;
@@ -63,6 +64,12 @@
Employee result = binding.echoEmployee(emp);
+ if (!emp.equals(result)) {
+ System.out.println("Expected:");
+ System.out.println(printEmployee(emp));
+ System.out.println("Received:");
+ System.out.println(printEmployee(result));
+ }
assertTrue("Results did not match", result.equals(emp));
}
@@ -71,6 +78,18 @@
}
}
+ String printEmployee(Employee e) {
+ String result = new String();
+
+ result += " ID: " + e.getID() + "\r\n";
+ result += " Salary: " + e.getSalary() + "\r\n";
+ Person p = e.getPerson();
+ result += " Person:\r\n";
+ result += " Name: " + p.getName() + "\r\n";
+ result += " Male: " + p.isMale() + "\r\n";
+
+ return result;
+ }
public static void main(String[] args) {
1.17 +12 -8 xml-axis/java/test/wsdl/interop3/docLit/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/docLit/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 19 Sep 2002 15:58:01 -0000 1.16
+++ build.xml 14 Oct 2002 21:59:30 -0000 1.17
@@ -51,25 +51,29 @@
</fileset>
</path>
- <taskdef name="wsdl2java"
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask">
- <classpath refid="test-classpath"/>
- </taskdef>
+ <target name="clean">
+ <echo message="Removing ${build.dir}/classes/${componentName} and
${build.dir}/work/${componentName}" />
+ <delete dir="${build.dir}/classes/${componentName}"/>
+ <delete dir="${build.dir}/work/${componentName}"/>
+ </target>
+
<target name="main">
<property name="testname" value="docLit"/>
<!-- generate skeletons -->
- <wsdl2java url="http://www.whitemesa.com/r3/interoptestdoclit.wsdl";
- output="${root.dir}/build/work" skeletonDeploy="no"
+ <!-- <wsdl2java url="http://www.whitemesa.com/r3/interoptestdoclit.wsdl"; -->
+ <wsdl2java
url="${axis.home}/test/wsdl/interop3/${testname}/interoptestdoclit.wsdl"
+ output="${axis.home}/build/work" skeletonDeploy="no"
serverSide="yes"/>
<mkdir dir="${build.dest}"/>
<copy file="WSDLInteropTestDocLitPortBindingImpl.java" overwrite="true"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
- <copy file="DocLitTestCase.java"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ <copy file="DocLitTestCase.java" overwrite="true"
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
<!-- compile the skeletons -->
<javac srcdir="${build.dir}/work"
1.17 +11 -8 xml-axis/java/test/wsdl/interop3/docLitParam/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/docLitParam/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 19 Sep 2002 15:58:01 -0000 1.16
+++ build.xml 14 Oct 2002 21:59:30 -0000 1.17
@@ -51,9 +51,12 @@
</fileset>
</path>
- <taskdef name="wsdl2java"
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask">
- <classpath refid="test-classpath"/>
- </taskdef>
+ <target name="clean">
+ <echo message="Removing ${build.dir}/classes/${componentName} and
${build.dir}/work/${componentName}" />
+ <delete dir="${build.dir}/classes/${componentName}"/>
+ <delete dir="${build.dir}/work/${componentName}"/>
+ </target>
+
<target name="main">
<property name="testname" value="docLitParam"/>
@@ -62,17 +65,17 @@
<!-- The white mesa WSDL has the same port name for this test as for the
docLit test, which means Axis gets two services with the same name -->
<!-- url="http://www.whitemesa.com/r3/InteropTestDocLitParameters.wsdl"; -->
- <wsdl2java url="test/wsdl/interop3/docLitParam/interoptestdoclitparameters.wsdl"
- output="${root.dir}/build/work" skeletonDeploy="no"
+ <wsdl2java
url="${axis.home}/test/wsdl/interop3/${testname}/interoptestdoclitparameters.wsdl"
+ output="${axis.home}/build/work" skeletonDeploy="no"
serverSide="yes"/>
<mkdir dir="${build.dest}"/>
<copy file="WSDLInteropTestDocLitPortBindingImpl.java" overwrite="true"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
- <copy file="DocLitParamTestCase.java"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ <copy file="DocLitParamTestCase.java" overwrite="true"
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
<!-- compile the skeletons -->
<javac srcdir="${build.dir}/work"
1.1 xml-axis/java/test/wsdl/interop3/emptysa/build.xml
Index: build.xml
===================================================================
<?xml version="1.0"?>
<!DOCTYPE project [
<!ENTITY properties SYSTEM "file:../../../../xmls/properties.xml">
<!ENTITY paths SYSTEM "file:../../../../xmls/path_refs.xml">
<!ENTITY taskdefs SYSTEM "file:../../../../xmls/taskdefs.xml">
<!ENTITY taskdefs_post_compile SYSTEM
"file:../../../../xmls/taskdefs_post_compile.xml">
<!ENTITY targets SYSTEM "file:../../../../xmls/targets.xml">
]>
<!-- ===================================================================
<description>
Test/Sample Component file for Axis
Notes:
This is a build file for use with the Jakarta Ant build tool.
Prerequisites:
jakarta-ant from http://jakarta.apache.org
Build Instructions:
To compile
ant compile
To execute
ant run
Author:
Matt Seibert [EMAIL PROTECTED]
Copyright:
Copyright (c) 2002-2003 Apache Software Foundation.
</description>
==================================================================== -->
<project name="Round3" default="main">
<property name="axis.home" location="../../../.." />
<property name="componentName" value="test/wsdl/interop3/compound2" />
&properties;
&paths;
&taskdefs;
&taskdefs_post_compile;
&targets;
<property name="root.dir" value="../../../.."/>
<path id="test-classpath">
<pathelement location="${build.dest}" />
<pathelement path="${java.class.path}" />
<pathelement location="${java.home}/../lib/tools.jar"/>
<fileset dir="${root.dir}/lib">
<include name="*.jar"/>
</fileset>
</path>
<target name="clean">
<echo message="Removing ${build.dir}/classes/${componentName} and
${build.dir}/work/${componentName}" />
<delete dir="${build.dir}/classes/${componentName}"/>
<delete dir="${build.dir}/work/${componentName}"/>
</target>
<target name="main">
<property file="axis.properties"/>
<!-- <wsdl2java url="http://www.whitemesa.com/r3/emptysa.wsdl"; -->
<wsdl2java url="${axis.home}/test/wsdl/interop3/emptysa/emptysa.wsdl"
output="${axis.home}/build/work"
serverside="yes"
skeletonDeploy="no">
<mapping namespace="http://soapinterop/";
package="test.wsdl.interop3.emptysa"/>
</wsdl2java>
<copy file="SoapInteropEmptySABindingImpl.java" overwrite="true"
todir="${build.dir}/work/test/wsdl/interop3/emptysa"/>
<copy file="EmptySATestCase.java" overwrite="true"
todir="${build.dir}/work/test/wsdl/interop3/emptysa"/>
<javac srcdir="${build.dir}/work" destdir="${build.dest}" debug="on">
<classpath refid="test-classpath" />
<include name="test/wsdl/interop3/emptysa/*.java" />
</javac>
</target>
</project>
1.1 xml-axis/java/test/wsdl/interop3/emptysa/emptysa.wsdl
Index: emptysa.wsdl
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<definitions name="SoapInterop" targetNamespace="http://soapinterop/";
xmlns:wsdlns="http://soapinterop/";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns="http://schemas.xmlsoap.org/wsdl/";>
<types/>
<message name="echoStringRequest">
<part name="a" type="xsd:string"/>
</message>
<message name="echoStringResponse">
<part name="Result" type="xsd:string"/>
</message>
<portType name="SoapInteropEmptySAPortType">
<operation name="echoString" parameterOrder="a">
<input message="wsdlns:echoStringRequest"/>
<output message="wsdlns:echoStringResponse"/>
</operation>
</portType>
<binding name="SoapInteropEmptySABinding"
type="wsdlns:SoapInteropEmptySAPortType">
<soap:binding style="rpc"
transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="echoString">
<soap:operation soapAction=""/>
<input>
<soap:body use="encoded"
namespace="http://soapinterop/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
</input>
<output>
<soap:body use="encoded"
namespace="http://soapinterop/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
</output>
</operation>
</binding>
<service name="EmptySA">
<port name="SoapInteropEmptySAPort"
binding="wsdlns:SoapInteropEmptySABinding">
<soap:address
location="http://mssoapinterop.org/stkv3/wsdl/emptysa.wsdl"/>
</port>
</service>
</definitions>
1.4 +37 -99 xml-axis/java/test/wsdl/interop3/emptysa/EmptySATestCase.java
1.1
xml-axis/java/test/wsdl/interop3/emptysa/SoapInteropEmptySABindingImpl.java
Index: SoapInteropEmptySABindingImpl.java
===================================================================
/**
* SoapInteropEmptySABindingImpl.java
*
* This file was auto-generated from WSDL
* by the Apache Axis WSDL2Java emitter.
*/
package test.wsdl.interop3.emptysa;
public class SoapInteropEmptySABindingImpl implements
test.wsdl.interop3.emptysa.SoapInteropEmptySAPortType{
public java.lang.String echoString(java.lang.String a) throws
java.rmi.RemoteException {
return a;
}
}
1.15 +12 -8 xml-axis/java/test/wsdl/interop3/import1/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/import1/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 19 Sep 2002 15:58:02 -0000 1.14
+++ build.xml 14 Oct 2002 21:59:30 -0000 1.15
@@ -51,25 +51,29 @@
</fileset>
</path>
- <taskdef name="wsdl2java"
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask">
- <classpath refid="test-classpath"/>
- </taskdef>
+ <target name="clean">
+ <echo message="Removing ${build.dir}/classes/${componentName} and
${build.dir}/work/${componentName}" />
+ <delete dir="${build.dir}/classes/${componentName}"/>
+ <delete dir="${build.dir}/work/${componentName}"/>
+ </target>
+
<target name="main">
<property name="testname" value="import1"/>
<!-- generate skeletons -->
- <wsdl2java url="http://www.whitemesa.com/r3/${testname}.wsdl";
- output="${root.dir}/build/work" skeletonDeploy="no"
+ <!-- <wsdl2java url="http://www.whitemesa.com/r3/${testname}.wsdl"; -->
+ <wsdl2java url="${axis.home}/test/wsdl/interop3/${testname}/${testname}.wsdl"
+ output="${axis.home}/build/work" skeletonDeploy="no"
serverSide="yes"/>
<mkdir dir="${build.dest}"/>
<copy file="SoapInteropImport1BindingImpl.java" overwrite="true"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ todir="${build.dir}work/test/wsdl/interop3/${testname}"/>
- <copy file="Import1TestCase.java"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ <copy file="Import1TestCase.java" overwrite="true"
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
<!-- compile the skeletons -->
<javac srcdir="${build.dir}/work"
1.15 +12 -8 xml-axis/java/test/wsdl/interop3/import2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/import2/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 19 Sep 2002 15:58:02 -0000 1.14
+++ build.xml 14 Oct 2002 21:59:30 -0000 1.15
@@ -51,25 +51,29 @@
</fileset>
</path>
- <taskdef name="wsdl2java"
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask">
- <classpath refid="test-classpath"/>
- </taskdef>
+ <target name="clean">
+ <echo message="Removing ${build.dir}/classes/${componentName} and
${build.dir}/work/${componentName}" />
+ <delete dir="${build.dir}/classes/${componentName}"/>
+ <delete dir="${build.dir}/work/${componentName}"/>
+ </target>
+
<target name="main">
<property name="testname" value="import2"/>
<!-- generate skeletons -->
- <wsdl2java url="http://www.whitemesa.com/r3/${testname}.wsdl";
- output="${root.dir}/build/work" skeletonDeploy="no"
+ <!-- <wsdl2java url="http://www.whitemesa.com/r3/${testname}.wsdl"; -->
+ <wsdl2java url="${axis.home}/test/wsdl/interop3/${testname}/${testname}.wsdl"
+ output="${axis.home}/build/work" skeletonDeploy="no"
serverSide="yes"/>
<mkdir dir="${build.dest}"/>
<copy file="SoapInteropImport2BindingImpl.java" overwrite="true"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
- <copy file="Import2TestCase.java"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ <copy file="Import2TestCase.java" overwrite="true"
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
<!-- compile the skeletons -->
<javac srcdir="${build.dir}/work"
1.15 +12 -8 xml-axis/java/test/wsdl/interop3/import3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/import3/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 19 Sep 2002 15:58:02 -0000 1.14
+++ build.xml 14 Oct 2002 21:59:30 -0000 1.15
@@ -51,25 +51,29 @@
</fileset>
</path>
- <taskdef name="wsdl2java"
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask">
- <classpath refid="test-classpath"/>
- </taskdef>
+ <target name="clean">
+ <echo message="Removing ${build.dir}/classes/${componentName} and
${build.dir}/work/${componentName}" />
+ <delete dir="${build.dir}/classes/${componentName}"/>
+ <delete dir="${build.dir}/work/${componentName}"/>
+ </target>
+
<target name="main">
<property name="testname" value="import3"/>
<!-- generate skeletons -->
- <wsdl2java url="http://www.whitemesa.com/r3/${testname}.wsdl";
- output="${root.dir}/build/work" skeletonDeploy="no"
+ <!-- <wsdl2java url="http://www.whitemesa.com/r3/${testname}.wsdl"; -->
+ <wsdl2java url="${axis.home}/test/wsdl/interop3/${testname}/${testname}.wsdl"
+ output="${axis.home}/build/work" skeletonDeploy="no"
serverSide="yes"/>
<mkdir dir="${build.dest}"/>
<copy file="SoapInteropImport3BindingImpl.java" overwrite="true"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
- <copy file="Import3TestCase.java"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ <copy file="Import3TestCase.java" overwrite="true"
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
<!-- compile the skeletons -->
<javac srcdir="${build.dir}/work"
1.16 +12 -8 xml-axis/java/test/wsdl/interop3/rpcEnc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/rpcEnc/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 19 Sep 2002 15:58:02 -0000 1.15
+++ build.xml 14 Oct 2002 21:59:31 -0000 1.16
@@ -51,25 +51,29 @@
</fileset>
</path>
- <taskdef name="wsdl2java"
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask">
- <classpath refid="test-classpath"/>
- </taskdef>
-
+ <target name="clean">
+ <echo message="Removing ${build.dir}/classes/${componentName} and
${build.dir}/work/${componentName}" />
+ <delete dir="${build.dir}/classes/${componentName}"/>
+ <delete dir="${build.dir}/work/${componentName}"/>
+ </target>
+
+
<target name="main">
<property name="testname" value="rpcEnc"/>
<!-- generate skeletons -->
- <wsdl2java url="http://www.whitemesa.com/r3/InteropTestRpcEnc.wsdl";
- output="${root.dir}/build/work" skeletonDeploy="no"
+ <!-- <wsdl2java url="http://www.whitemesa.com/r3/InteropTestRpcEnc.wsdl"; -->
+ <wsdl2java
url="${axis.home}/test/wsdl/interop3/${testname}/InteropTestRpcEnc.wsdl"
+ output="${axis.home}/build/work" skeletonDeploy="no"
serverSide="yes"/>
<mkdir dir="${build.dest}"/>
<copy file="WSDLInteropTestRpcEncPortBindingImpl.java" overwrite="true"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
<copy file="RpcEncTestCase.java" overwrite="true"
- todir="${root.dir}/build/work/test/wsdl/interop3/${testname}"/>
+ todir="${build.dir}/work/test/wsdl/interop3/${testname}"/>
<!-- compile the skeletons -->
<javac srcdir="${build.dir}/work"
1.3 +10 -2 xml-axis/java/test/wsdl/interop4/groupi/client-config.wsdd
Index: client-config.wsdd
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupi/client-config.wsdd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- client-config.wsdd 8 Oct 2002 03:31:35 -0000 1.2
+++ client-config.wsdd 14 Oct 2002 21:59:31 -0000 1.3
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="http://xml.apache.org/axis/wsdd/";
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
+ <handler name="log" type="java:org.apache.axis.handlers.LogHandler"/>
+ <globalConfiguration>
+ <requestFlow>
+ <handler type="log"/>
+ </requestFlow>
+ <responseFlow>
+ <handler type="log"/>
+ </responseFlow>
+ </globalConfiguration>
<transport name="http" pivot="java:org.apache.axis.transport.http.HTTPSender"/>
- <transport name="java" pivot="java:org.apache.axis.transport.java.JavaSender"/>
<transport name="local" pivot="java:org.apache.axis.transport.local.LocalSender"/>
-</deployment>
\ No newline at end of file
+</deployment>
