dims 2002/09/19 08:58:02
Modified: java build.xml buildSamples.xml buildTest.xml
java/test build_functional_tests.xml
java/test/dynamic build.xml
java/test/encoding build.xml
java/test/functional build.xml
java/test/soap build.xml
java/test/types build.xml
java/test/wsdl Wsdl2javaTestSuite.xml
java/test/wsdl/clash build.xml
java/test/wsdl/interop build.xml
java/test/wsdl/interop3 RPCEncD.xml emptysa.xml import1.xml
java/test/wsdl/interop3/compound1 build.xml
java/test/wsdl/interop3/compound2 build.xml
java/test/wsdl/interop3/docLit build.xml
java/test/wsdl/interop3/docLitParam build.xml
java/test/wsdl/interop3/groupE Interop3GroupE.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/multithread build.xml
java/tools build.xml
java/tools/org/apache/axis/tools/ant/foreach
ForeachTask.java
java/xmls path_refs.xml properties.xml targets.xml
Log:
Fixes to build system:
- adding inheritAll and inheritRefs flag to all "<ant" calls and set them to false
by default.
- flags can be controlled from properties.xml
- sanitized "<ant" calls such that they have a dir attribute and the ant file
attribute has the name of the build file relative to that dir
- cleanup interop a bit
- force a delete of samples/userguide/example6 classes to prevent gump failure.
Revision Changes Path
1.192 +12 -29 xml-axis/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/build.xml,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- build.xml 18 Sep 2002 14:39:07 -0000 1.191
+++ build.xml 19 Sep 2002 15:57:59 -0000 1.192
@@ -151,11 +151,11 @@
<copy file="${log4j-core.jar}" toDir="${build.lib}"/>
<!-- stub in my task generations -->
- <ant antfile="buildPreTestTaskdefs.xml" />
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}" antfile="buildPreTestTaskdefs.xml" />
<!-- Build the new org.apache.axis.tools.ant stuff -->
- <ant antfile="tools/build.xml" />
- <ant antfile="tools/build.xml" target="test"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/tools" antfile="build.xml" />
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/tools" antfile="build.xml" target="test"/>
<antcall target="post-compile"/>
<property name="compile.built" value="yes"/>
@@ -166,7 +166,7 @@
<!-- Custom post-compilation step -->
<!-- =================================================================== -->
<target name="post-compile" if="post-compile.present">
- <ant antfile="post-compile.xml"/>
+ <ant dir="${axis.home}" antfile="post-compile.xml"/>
</target>
<!-- =================================================================== -->
@@ -175,7 +175,7 @@
<target name="samples" depends="compile" unless="samples.built"
description="build the samples">
<!--
- <ant antfile="${axis.home}/buildSamples.xml" target="compile"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}" antfile="buildSamples.xml" target="compile"/>
-->
<antcall target="my-forking-ant">
<param name="dir" value="${axis.home}"/>
@@ -239,7 +239,7 @@
<!-- =================================================================== -->
<target name="junit" depends="buildJunit" if="junit.present" >
<mkdir dir="${test.functional.reportdir}" />
- <ant antfile="${axis.home}/buildTest.xml" target="junit"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}" antfile="buildTest.xml" target="junit"/>
</target>
<!-- =================================================================== -->
@@ -250,7 +250,7 @@
>
<!-- The Axis Ant task must be built (into ANT_HOME/lib)... -->
- <ant antfile="test/build_functional_tests.xml" target="functional-tests-only"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/test" antfile="build_functional_tests.xml"
target="functional-tests-only"/>
<!--
...and then the functional tests can be run. If this step yields a
@@ -263,7 +263,7 @@
<target name="functional-tests-secure-only" depends="printEnv"
description="functional secure tests without a rebuild;"
>
- <ant antfile="test/build_functional_tests.xml"
target="functional-tests-secure-only"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/test" antfile="build_functional_tests.xml"
target="functional-tests-secure-only"/>
</target>
@@ -272,21 +272,21 @@
<!-- =================================================================== -->
<target name="functional-tests-noserver" depends="compile, buildFunctional"
description="functional tests, no server">
- <ant antfile="test/build_functional_tests.xml"
target="junit-functional-noserver">
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/test" antfile="build_functional_tests.xml"
target="junit-functional-noserver">
<property name="test.functional.usefile" value="${test.functional.usefile}"/>
</ant>
</target>
<target name="componentTest" depends="compile, buildTest">
- <ant antfile="${axis.home}/buildTest.xml" target="componentTest"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}" antfile="buildTest.xml" target="componentTest"/>
</target>
<!-- =================================================================== -->
<!-- Functional tests, with server -->
<!-- =================================================================== -->
<target name="functional-tests" depends="buildFunctional" description="functional
tests">
- <ant antfile="${axis.home}/buildTest.xml" target="functional-tests"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}" antfile="buildTest.xml" target="functional-tests"/>
</target>
<!-- Security only tests, with full dependencies -->
@@ -442,21 +442,6 @@
</target>
<!-- =================================================================== -->
- <!-- Interop 3 -->
- <!-- =================================================================== -->
- <target name="interop3" depends="buildTest"
- description="run the round3 interop tests">
- <ant dir="test/wsdl/interop3/import1"/>
- <ant dir="test/wsdl/interop3/import2"/>
- <ant dir="test/wsdl/interop3/import3"/>
- <ant dir="test/wsdl/interop3/compound1"/>
- <ant dir="test/wsdl/interop3/compound2"/>
- <ant dir="test/wsdl/interop3/docLit"/>
- <ant dir="test/wsdl/interop3/docLitParam"/>
- <ant dir="test/wsdl/interop3/rpcEnc"/>
- </target>
-
- <!-- =================================================================== -->
<!-- Cleans everything -->
<!-- =================================================================== -->
<target name="clean"
@@ -479,10 +464,8 @@
<!-- =================================================================== -->
<target name="checkstyle"
description="Check the style of the Axis source" >
- <ant dir="." target="checkstyle"
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}" target="checkstyle"
antfile="xmls/checkstyle.xml"
- inheritall="true"
- inheritrefs="true"
>
<property name="checkstyle.project"
value="axis" />
1.14 +16 -16 xml-axis/java/buildSamples.xml
Index: buildSamples.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/buildSamples.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- buildSamples.xml 17 Sep 2002 16:50:35 -0000 1.13
+++ buildSamples.xml 19 Sep 2002 15:57:59 -0000 1.14
@@ -52,59 +52,59 @@
&targets;
<target name="bidbuy" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/bidbuy/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/bidbuy" antfile="build.xml"/>
</target>
<target name="echo" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/echo/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/echo" antfile="build.xml"/>
</target>
<target name="encoding" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/encoding/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/encoding" antfile="build.xml"/>
</target>
<target name="message" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/message/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/message" antfile="build.xml"/>
</target>
<target name="misc" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/misc/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/misc" antfile="build.xml"/>
</target>
<target name="stock" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/stock/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/stock" antfile="build.xml"/>
</target>
<target name="transport" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/transport/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/transport" antfile="build.xml"/>
</target>
<target name="userguide" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/userguide/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/userguide" antfile="build.xml"/>
</target>
<target name="addr" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/addr/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/addr" antfile="build.xml"/>
</target>
<target name="attachments" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/attachments/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/attachments" antfile="build.xml"/>
</target>
<target name="proxy" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/proxy/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/proxy" antfile="build.xml"/>
</target>
<target name="security" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/security/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/security" antfile="build.xml"/>
</target>
<target name="jaxrpc" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/jaxrpc/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/jaxrpc" antfile="build.xml"/>
</target>
<target name="jms" depends="setenv">
- <ant inheritAll="true" antfile="${axis.home}/samples/jms/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/jms" antfile="build.xml"/>
</target>
<!-- =========================================================================== -->
@@ -114,7 +114,7 @@
<target name="compile" depends="printEnv,copy">
<!-- Compile the sample code -->
- <foreach target="component-compile" fork="${foreach.fork}">
+ <foreach target="component-compile" fork="${foreach.fork}"
inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}">
<param name="file">
<fileset dir="${axis.home}" includes="samples/**/build.xml"/>
</param>
@@ -130,7 +130,7 @@
<!-- This simply echos the component files, for sanity checks -->
<!-- =================================================================== -->
<target name="echoTest" >
- <foreach target="echo-file" fork="${foreach.fork}">
+ <foreach target="echo-file" fork="${foreach.fork}"
inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}">
<param name="file">
<fileset dir="${axis.home}" includes="samples/**/build.xml"/>
</param>
1.40 +7 -21 xml-axis/java/buildTest.xml
Index: buildTest.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/buildTest.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- buildTest.xml 18 Sep 2002 14:39:07 -0000 1.39
+++ buildTest.xml 19 Sep 2002 15:58:00 -0000 1.40
@@ -66,7 +66,7 @@
<target name="compileJunit" depends="printEnv,copy">
<!-- Compile the code -->
- <foreach target="component-compile" fork="${foreach.fork}">
+ <foreach target="component-compile" fork="${foreach.fork}"
inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}">
<param name="file">
<fileset dir="${axis.home}" >
<patternset>
@@ -81,7 +81,7 @@
<target name="compileFunctional" depends="printEnv,copy">
<!-- Compile the code -->
- <foreach target="component-compile" fork="${foreach.fork}">
+ <foreach target="component-compile" fork="${foreach.fork}"
inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}">
<param name="file">
<fileset dir="${axis.home}" >
<patternset>
@@ -121,26 +121,12 @@
<!-- Functional tests, no server (for testing under debugger) -->
<!-- =================================================================== -->
<target name="functional-tests-noserver">
- <ant antfile="test/build_functional_tests.xml"
target="junit-functional-noserver">
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/test" antfile="build_functional_tests.xml"
target="junit-functional-noserver">
<property name="test.functional.usefile" value="${test.functional.usefile}"/>
</ant>
</target>
<!-- =================================================================== -->
- <!-- Interop 3 -->
- <!-- =================================================================== -->
- <target name="interop3" depends="compile">
- <ant dir="test/wsdl/interop3/import1"/>
- <ant dir="test/wsdl/interop3/import2"/>
- <ant dir="test/wsdl/interop3/import3"/>
- <ant dir="test/wsdl/interop3/compound1"/>
- <ant dir="test/wsdl/interop3/compound2"/>
- <ant dir="test/wsdl/interop3/docLit"/>
- <ant dir="test/wsdl/interop3/docLitParam"/>
- <ant dir="test/wsdl/interop3/rpcEnc"/>
- </target>
-
- <!-- =================================================================== -->
<!-- Cleans everything -->
<!-- =================================================================== -->
<target name="clean">
@@ -266,7 +252,7 @@
<!-- This simply echos the component files, for sanity checks -->
<!-- =================================================================== -->
<target name="echoTest" >
- <foreach target="echo-file" fork="${foreach.fork}">
+ <foreach target="echo-file" fork="${foreach.fork}"
inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}">
<param name="file">
<fileset dir="${axis.home}" >
<patternset>
@@ -282,7 +268,7 @@
<!-- This runs each test component, instantiating the server each time -->
<!-- =================================================================== -->
<target name="componentTest" >
- <foreach target="batch-component-run" fork="${foreach.fork}">
+ <foreach target="batch-component-run" fork="${foreach.fork}"
inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}">
<param name="file">
<fileset dir="${axis.home}" >
<patternset>
@@ -305,11 +291,11 @@
testTarget="batch-junit-functional"
stopTarget="stop-functional-test-http-server" />
- <ant antfile="${axis.home}/test/functional/build.xml" target="run"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/test/functional" antfile="build.xml" target="run"/>
</target>
<target name="batch-junit-functional"
depends="start-signature-signing-and-verification">
- <foreach target="batch-component-test" fork="${foreach.fork}">
+ <foreach target="batch-component-test" fork="${foreach.fork}"
inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}">
<param name="file">
<fileset dir="${axis.home}" >
<patternset>
1.57 +1 -1 xml-axis/java/test/build_functional_tests.xml
Index: build_functional_tests.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/build_functional_tests.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- build_functional_tests.xml 28 Aug 2002 19:22:56 -0000 1.56
+++ build_functional_tests.xml 19 Sep 2002 15:58:00 -0000 1.57
@@ -224,7 +224,7 @@
<include name="**/userguide/example6/"/>
</fileset>
</copy>
- <ant antfile="test/wsdl/Wsdl2javaTestSuite.xml">
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/test/wsdl" antfile="Wsdl2javaTestSuite.xml">
</ant>
<copy todir="${build.dir}/work/test" overwrite="yes">
<fileset dir="${test.dir}">
1.7 +1 -1 xml-axis/java/test/dynamic/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/dynamic/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 12 Sep 2002 12:19:06 -0000 1.6
+++ build.xml 19 Sep 2002 15:58:00 -0000 1.7
@@ -52,7 +52,7 @@
<target name="compile" depends="copy">
<echo message="Compiling test.dynamic"/>
- <ant antfile="${axis.home}/samples/addr/build.xml" target="compile"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/addr/" antfile="build.xml" target="compile"/>
<javac srcdir="${axis.home}" destdir="${build.dest}" debug="${debug}"
fork="${javac.fork}">
<classpath>
1.8 +1 -1 xml-axis/java/test/encoding/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 12 Sep 2002 21:07:38 -0000 1.7
+++ build.xml 19 Sep 2002 15:58:00 -0000 1.8
@@ -49,7 +49,7 @@
<target name="copy" depends="setenv">
<echo message="Compiling samples.echo"/>
- <ant antfile="${axis.home}/samples/echo/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/echo" antfile="build.xml"/>
</target>
<target name="compile" depends="copy">
1.13 +1 -1 xml-axis/java/test/functional/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 13 Sep 2002 13:48:05 -0000 1.12
+++ build.xml 19 Sep 2002 15:58:00 -0000 1.13
@@ -45,7 +45,7 @@
<target name="clean"/>
<target name="copy" depends="setenv">
- <ant dir="${axis.home}" antfile="buildSamples.xml" target="compile"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}" antfile="buildSamples.xml" target="compile"/>
</target>
<target name="compile" depends="copy">
1.8 +2 -2 xml-axis/java/test/soap/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/soap/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 12 Sep 2002 21:07:38 -0000 1.7
+++ build.xml 19 Sep 2002 15:58:00 -0000 1.8
@@ -51,9 +51,9 @@
<target name="copy" depends="setenv">
<echo message="Compiling test.utils"/>
- <ant antfile="${axis.home}/test/utils/build.xml" target="compile"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/test/utils" antfile="build.xml" target="compile"/>
<echo message="Compiling test.RPCDispatch"/>
- <ant antfile="${axis.home}/test/RPCDispatch/build.xml" target="compile"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/test/RPCDispatch" antfile="build.xml" target="compile"/>
</target>
<target name="compile" depends="copy">
1.8 +1 -1 xml-axis/java/test/types/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/types/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 12 Sep 2002 21:07:38 -0000 1.7
+++ build.xml 19 Sep 2002 15:58:00 -0000 1.8
@@ -49,7 +49,7 @@
<target name="copy" depends="setenv">
<echo message="Compiling samples.echo"/>
- <ant antfile="${axis.home}/samples/echo/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/echo" antfile="build.xml"/>
</target>
<target name="compile" depends="copy">
1.128 +1 -1 xml-axis/java/test/wsdl/Wsdl2javaTestSuite.xml
Index: Wsdl2javaTestSuite.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/Wsdl2javaTestSuite.xml,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- Wsdl2javaTestSuite.xml 17 Sep 2002 18:19:20 -0000 1.127
+++ Wsdl2javaTestSuite.xml 19 Sep 2002 15:58:00 -0000 1.128
@@ -788,7 +788,7 @@
<!-- Step 7: see test/wsdl/interop3/Import2TestCase.java -->
<!-- Step 8: see test/wsdl/interop3/Import2TestCase.java -->
- <ant antfile="test/wsdl/interop3/groupE/Interop3GroupE.xml"/>
+ <ant dir="${axis.home}/test/wsdl/interop3/groupE" antfile="Interop3GroupE.xml"/>
<!-- Name clash test -->
<wsdl2java url="test/wsdl/clash/clash.wsdl"
1.10 +1 -1 xml-axis/java/test/wsdl/clash/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/clash/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 12 Sep 2002 20:58:44 -0000 1.9
+++ build.xml 19 Sep 2002 15:58:01 -0000 1.10
@@ -49,7 +49,7 @@
</target>
<target name="copy" depends="setenv">
- <ant antfile="${axis.home}/test/wsdl/filegen/build.xml" target="compile"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/test/wsdl/filegen" antfile="build.xml" target="compile"/>
</target>
<target name="compile" depends="copy">
1.9 +7 -4 xml-axis/java/test/wsdl/interop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 12 Sep 2002 21:07:38 -0000 1.8
+++ build.xml 19 Sep 2002 15:58:01 -0000 1.9
@@ -47,9 +47,10 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="copy" depends="setenv">
- <ant antfile="${axis.home}/samples/echo/build.xml" target="compile" />
- <ant antfile="${axis.home}/samples/jaxrpc/build.xml" target="compile" />
+ <target name="copy" depends="printEnv">
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/addr" antfile="build.xml" target="compile" />
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/echo" antfile="build.xml" target="compile" />
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/jaxrpc" antfile="build.xml" target="compile" />
</target>
<target name="compile" depends="copy" >
@@ -418,7 +419,7 @@
</javac>
<!-- Step 7: see test/wsdl/interop3/Import2TestCase.java -->
<!-- Step 8: see test/wsdl/interop3/Import2TestCase.java -->
- <ant dir="${axis.home}"
antfile="${axis.home}/test/wsdl/interop3/groupE/Interop3GroupE.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/test/wsdl/interop3/groupE" antfile="Interop3GroupE.xml"/>
<!-- UDDI 1.0 WSDL's -->
<!-- tomj: turn these off while attribute processing is in flux
<wsdl2java url="http://www.uddi.org/wsdl/inquire_v1.wsdl";
@@ -560,6 +561,8 @@
<include name="**/*TestCase.java"/>
</fileset>
</copy>
+
+ <delete dir="${build.dir}/classes/samples/userguide/example6"/>
<javac srcdir="${build.dir}/work" destdir="${build.dest}" fork="${javac.fork}"
debug="${debug}">
1.4 +40 -1 xml-axis/java/test/wsdl/interop3/RPCEncD.xml
Index: RPCEncD.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/RPCEncD.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RPCEncD.xml 17 Sep 2002 18:19:20 -0000 1.3
+++ RPCEncD.xml 19 Sep 2002 15:58:01 -0000 1.4
@@ -1,6 +1,45 @@
+<?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
-<project name="EmptySATest" default="main" basedir="../../..">
+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="EmptySATest" default="main">
+<property name="axis.home" location="../../.." />
+<property name="componentName" value="test/wsdl/interop3/RPCEncD" />
+ &properties;
+ &paths;
+ &taskdefs;
+ &taskdefs_post_compile;
+ &targets;
<target name="check">
<echo message="${build.dest}"/>
1.5 +42 -1 xml-axis/java/test/wsdl/interop3/emptysa.xml
Index: emptysa.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/emptysa.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emptysa.xml 17 Sep 2002 18:19:20 -0000 1.4
+++ emptysa.xml 19 Sep 2002 15:58:01 -0000 1.5
@@ -1,4 +1,45 @@
-<project name="EmptySATest" default="main" basedir="../../..">
+<?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="EmptySATest" default="main">
+<property name="axis.home" location="../../.." />
+<property name="componentName" value="test/wsdl/interop3/emptysa" />
+ &properties;
+ &paths;
+ &taskdefs;
+ &taskdefs_post_compile;
+ &targets;
<target name="check">
<echo message="${build.dest}"/>
1.4 +42 -1 xml-axis/java/test/wsdl/interop3/import1.xml
Index: import1.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/import1.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import1.xml 17 Sep 2002 18:19:20 -0000 1.3
+++ import1.xml 19 Sep 2002 15:58:01 -0000 1.4
@@ -1,4 +1,45 @@
-<project name="EmptySATest" default="main" basedir="../../..">
+<?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="EmptySATest" default="main">
+<property name="axis.home" location="../../.." />
+<property name="componentName" value="test/wsdl/interop3/import1" />
+ &properties;
+ &paths;
+ &taskdefs;
+ &taskdefs_post_compile;
+ &targets;
<target name="check">
<echo message="${build.dest}"/>
1.13 +41 -0 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 17 Sep 2002 18:19:20 -0000 1.12
+++ build.xml 19 Sep 2002 15:58:01 -0000 1.13
@@ -1,4 +1,45 @@
+<?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/compound1" />
+ &properties;
+ &paths;
+ &taskdefs;
+ &taskdefs_post_compile;
+ &targets;
<property name="root.dir" value="../../../.."/>
<path id="test-classpath">
1.15 +41 -0 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 17 Sep 2002 18:19:20 -0000 1.14
+++ build.xml 19 Sep 2002 15:58:01 -0000 1.15
@@ -1,4 +1,45 @@
+<?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">
1.16 +41 -0 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 17 Sep 2002 18:19:20 -0000 1.15
+++ build.xml 19 Sep 2002 15:58:01 -0000 1.16
@@ -1,4 +1,45 @@
+<?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/docLit" />
+ &properties;
+ &paths;
+ &taskdefs;
+ &taskdefs_post_compile;
+ &targets;
<property name="root.dir" value="../../../.."/>
<path id="test-classpath">
1.16 +41 -0 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 17 Sep 2002 18:19:20 -0000 1.15
+++ build.xml 19 Sep 2002 15:58:01 -0000 1.16
@@ -1,4 +1,45 @@
+<?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/docLitParam" />
+ &properties;
+ &paths;
+ &taskdefs;
+ &taskdefs_post_compile;
+ &targets;
<property name="root.dir" value="../../../.."/>
<path id="test-classpath">
1.9 +40 -0 xml-axis/java/test/wsdl/interop3/groupE/Interop3GroupE.xml
Index: Interop3GroupE.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/groupE/Interop3GroupE.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Interop3GroupE.xml 17 Sep 2002 18:19:20 -0000 1.8
+++ Interop3GroupE.xml 19 Sep 2002 15:58:01 -0000 1.9
@@ -1,4 +1,36 @@
<?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>
+==================================================================== -->
<!--
@@ -19,6 +51,14 @@
-->
<project name="Interop3GroupE" default="Interop3GroupE.main">
+<property name="axis.home" location="../../../.." />
+<property name="componentName" value="test/wsdl/interop3/groupE" />
+ &properties;
+ &paths;
+ &taskdefs;
+ &taskdefs_post_compile;
+ &targets;
+ <property name="root.dir" value="../../../.."/>
<path id="test-classpath">
<pathelement location="${xerces.jar}"/>
1.14 +41 -0 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 17 Sep 2002 18:19:20 -0000 1.13
+++ build.xml 19 Sep 2002 15:58:02 -0000 1.14
@@ -1,4 +1,45 @@
+<?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/import1" />
+ &properties;
+ &paths;
+ &taskdefs;
+ &taskdefs_post_compile;
+ &targets;
<property name="root.dir" value="../../../.."/>
<path id="test-classpath">
1.14 +41 -0 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 17 Sep 2002 18:19:20 -0000 1.13
+++ build.xml 19 Sep 2002 15:58:02 -0000 1.14
@@ -1,4 +1,45 @@
+<?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/import2" />
+ &properties;
+ &paths;
+ &taskdefs;
+ &taskdefs_post_compile;
+ &targets;
<property name="root.dir" value="../../../.."/>
<path id="test-classpath">
1.14 +41 -0 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 17 Sep 2002 18:19:20 -0000 1.13
+++ build.xml 19 Sep 2002 15:58:02 -0000 1.14
@@ -1,4 +1,45 @@
+<?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/import3" />
+ &properties;
+ &paths;
+ &taskdefs;
+ &taskdefs_post_compile;
+ &targets;
<property name="root.dir" value="../../../.."/>
<path id="test-classpath">
1.15 +41 -0 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 17 Sep 2002 18:19:20 -0000 1.14
+++ build.xml 19 Sep 2002 15:58:02 -0000 1.15
@@ -1,4 +1,45 @@
+<?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/rpcEnc" />
+ &properties;
+ &paths;
+ &taskdefs;
+ &taskdefs_post_compile;
+ &targets;
<property name="root.dir" value="../../../.."/>
<path id="test-classpath">
1.9 +1 -1 xml-axis/java/test/wsdl/multithread/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/multithread/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 12 Sep 2002 21:07:38 -0000 1.8
+++ build.xml 19 Sep 2002 15:58:02 -0000 1.9
@@ -51,7 +51,7 @@
</target>
<target name="copy" depends="setenv">
- <ant antfile="${axis.home}/samples/addr/build.xml"/>
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/samples/addr" antfile="build.xml"/>
</target>
<target name="compile" depends="copy">
1.11 +2 -2 xml-axis/java/tools/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/tools/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 11 Sep 2002 23:01:06 -0000 1.10
+++ build.xml 19 Sep 2002 15:58:02 -0000 1.11
@@ -103,7 +103,7 @@
</target>
<target name="test" unless="axis-ant.present" description="tests">
- <ant antfile="${tools.dir}/test.xml" />
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${tools.dir}" antfile="test.xml" />
</target>
<property name="xdocs.dir" location="${env.ANT_HOME}/proposal/xdocs" />
@@ -126,7 +126,7 @@
<echo>
running xdocs with classpath=${xdoclet.extra.classpath.asprop}
</echo>
- <ant dir="${xdocs.dir}">
+ <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${xdocs.dir}">
<property name="src.dir" location="org/apache/axis/tools/ant"/>
<property name="src.root" location="."/>
<property name="xdoclet.extra.classpath"
1.8 +0 -1
xml-axis/java/tools/org/apache/axis/tools/ant/foreach/ForeachTask.java
Index: ForeachTask.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/tools/org/apache/axis/tools/ant/foreach/ForeachTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ForeachTask.java 11 Sep 2002 21:03:37 -0000 1.7
+++ ForeachTask.java 19 Sep 2002 15:58:02 -0000 1.8
@@ -208,7 +208,6 @@
callee = (Ant) getProject().createTask("ant");
callee.setOwningTarget(getOwningTarget());
callee.setTaskName(getTaskName());
- callee.setLocation(getLocation());
callee.init();
}
1.10 +1 -4 xml-axis/java/xmls/path_refs.xml
Index: path_refs.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/xmls/path_refs.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- path_refs.xml 18 Sep 2002 20:37:41 -0000 1.9
+++ path_refs.xml 19 Sep 2002 15:58:02 -0000 1.10
@@ -11,14 +11,11 @@
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${build.dir}/lib">
- <include name="**/*.jar"/>
- </fileset>
<pathelement path="${java.class.path}"/>
<pathelement location="${build.dest}" />
<pathelement location="${build.dir}/tools" />
-<!--
<pathelement location="${build.lib}/axis-ant.jar" />
+<!--
<pathelement location="${build.dir}/work" />
-->
</path>
1.29 +2 -0 xml-axis/java/xmls/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/xmls/properties.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- properties.xml 18 Sep 2002 20:37:41 -0000 1.28
+++ properties.xml 19 Sep 2002 15:58:02 -0000 1.29
@@ -99,3 +99,5 @@
<property name="javac.fork" value="no"/>
<property name="foreach.fork" value="no"/>
+<property name="ant.inheritAll" value="false"/>
+<property name="ant.inheritRefs" value="false"/>
\ No newline at end of file
1.35 +2 -0 xml-axis/java/xmls/targets.xml
Index: targets.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/xmls/targets.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- targets.xml 18 Sep 2002 21:57:42 -0000 1.34
+++ targets.xml 19 Sep 2002 15:58:02 -0000 1.35
@@ -187,6 +187,8 @@
<echo message=" then the component is not present)" />
<echo message=""/>
+ <echo message="basedir = ${basedir}"/>
+ <echo message="axis.home = ${axis.home}"/>
<echo message="build.dir = ${build.dir}"/>
<echo message="build.dest = ${build.dest}"/>
<echo message=""/>
