dims 2002/11/29 15:32:53
Modified: java/samples/jms build.xml
java/test/httpunit build.xml
java/test/templateTest build.xml
java/test/wsdl/anytype build.xml
java/test/wsdl/extra build.xml
java/test/wsdl/filegen build.xml
java/test/wsdl/interop build.xml
java/test/wsdl/interop4/groupG/dime/doc build.xml
java/test/wsdl/interop4/groupG/dime/rpc build.xml
java/test/wsdl/interop4/groupG/mime/doc build.xml
java/test/wsdl/interop4/groupG/mime/rpc build.xml
java/test/wsdl/interop4/groupH/complexDocLit build.xml
java/test/wsdl/interop4/groupH/complexRPCenc build.xml
java/test/wsdl/interop4/groupH/simpleDocLit build.xml
java/test/wsdl/interop4/groupH/simpleRPCenc build.xml
java/test/wsdl/interop4/groupi build.xml
java/test/wsdl/interop5/basetype build.xml
Log:
Fix for Bug 13103 - jms.present=true not getting propogated to sample
Notes:
Fixed a lot of build.xml's to ensure that "setenv" target is called before "compile"
Revision Changes Path
1.3 +2 -8 xml-axis/java/samples/jms/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/jms/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 28 Sep 2002 22:32:15 -0000 1.2
+++ build.xml 29 Nov 2002 23:32:52 -0000 1.3
@@ -43,15 +43,9 @@
&targets;
<target name="clean"/>
- <target name="copy"/>
- <target name="compile">
- <condition property="jms.present" >
- <available classname="javax.jms.Message" classpathref="classpath" />
- </condition>
+ <target name="copy" depends="setenv"/>
-<!-- ===================================================================
- <echo message="jms.present=${jms.present}" />
-==================================================================== -->
+ <target name="compile" depends="copy">
<javac srcdir="${axis.home}" destdir="${build.dest}" debug="${debug}"
fork="${javac.fork}">
<classpath>
1.11 +2 -1 xml-axis/java/test/httpunit/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/httpunit/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 23 Oct 2002 18:04:30 -0000 1.10
+++ build.xml 29 Nov 2002 23:32:52 -0000 1.11
@@ -55,6 +55,7 @@
&properties;
&paths;
+ &targets;
<!-- &taskdefs; -->
<!-- &taskdefs_post_compile; -->
@@ -100,7 +101,7 @@
description="compile and run the tests"/>
<!-- init configures things -->
- <target name="init" >
+ <target name="init" depends="setenv">
<echo> Axis home=${axis.home}</echo>
<mkdir dir="${test.classes.dir}" />
<mkdir dir="${test.data.dir}" />
1.4 +2 -2 xml-axis/java/test/templateTest/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/templateTest/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 22 Aug 2002 21:33:11 -0000 1.3
+++ build.xml 29 Nov 2002 23:32:52 -0000 1.4
@@ -42,13 +42,13 @@
<!--
===========================================================================================
-->
<!-- This target should copy in anything that this test needs, or copy out to
staging -->
<!--
===========================================================================================
-->
-<target name="copy"/>
+<target name="copy" depends="setenv"/>
<!--
===========================================================================================
-->
<!-- This target actually "makes" things -->
<!--
===========================================================================================
-->
-<target name="compile">
+<target name="compile" depends="copy">
<echo message="Usually, this would build something..." />
</target>
1.2 +1 -1 xml-axis/java/test/wsdl/anytype/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/anytype/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2 Nov 2002 01:32:05 -0000 1.1
+++ build.xml 29 Nov 2002 23:32:52 -0000 1.2
@@ -50,7 +50,7 @@
</target>
<!-- main target, always start from scratch -->
-<target name="compile" depends="clean">
+<target name="compile" depends="setenv, clean">
<echo message="Compiling test.wsdl.anytype"/>
<!-- Compile the test classes for Java2WSDL -->
1.3 +1 -1 xml-axis/java/test/wsdl/extra/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/extra/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 21 Oct 2002 12:18:14 -0000 1.2
+++ build.xml 29 Nov 2002 23:32:52 -0000 1.3
@@ -50,7 +50,7 @@
</target>
<!-- main target, always start from scratch -->
-<target name="compile" depends="clean">
+<target name="compile" depends="setenv, clean">
<echo message="Compiling test.wsdl.extra"/>
<!-- Compile the test classes for Java2WSDL -->
1.9 +1 -1 xml-axis/java/test/wsdl/filegen/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/filegen/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 17 Oct 2002 20:41:10 -0000 1.8
+++ build.xml 29 Nov 2002 23:32:52 -0000 1.9
@@ -42,7 +42,7 @@
&taskdefs_post_compile;
&targets;
-<target name="clean">
+<target name="clean" depends="setenv">
<echo message="Removing ${build.dir}/**/test/wsdl/filegen" />
<echo message="componentName is ${componentName}"/>
<delete dir="${build.dir}/classes/test/wsdl/filegen"/>
1.10 +1 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 19 Sep 2002 15:58:01 -0000 1.9
+++ build.xml 29 Nov 2002 23:32:52 -0000 1.10
@@ -47,7 +47,7 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="copy" depends="printEnv">
+ <target name="copy" depends="setenv">
<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" />
1.2 +1 -1 xml-axis/java/test/wsdl/interop4/groupG/dime/doc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupG/dime/doc/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 1 Nov 2002 21:43:04 -0000 1.1
+++ build.xml 29 Nov 2002 23:32:52 -0000 1.2
@@ -48,7 +48,7 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="compile">
+ <target name="compile" depends="setenv">
<property name="testname" value="basetype"/>
<!-- generate skeletons -->
1.2 +1 -1 xml-axis/java/test/wsdl/interop4/groupG/dime/rpc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupG/dime/rpc/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 1 Nov 2002 21:43:04 -0000 1.1
+++ build.xml 29 Nov 2002 23:32:52 -0000 1.2
@@ -48,7 +48,7 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="compile">
+ <target name="compile" depends="setenv">
<property name="testname" value="basetype"/>
<!-- generate skeletons -->
1.2 +1 -1 xml-axis/java/test/wsdl/interop4/groupG/mime/doc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupG/mime/doc/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 1 Nov 2002 21:43:04 -0000 1.1
+++ build.xml 29 Nov 2002 23:32:53 -0000 1.2
@@ -48,7 +48,7 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="compile">
+ <target name="compile" depends="setenv">
<property name="testname" value="basetype"/>
<!-- generate skeletons -->
1.2 +1 -1 xml-axis/java/test/wsdl/interop4/groupG/mime/rpc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupG/mime/rpc/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 1 Nov 2002 21:43:04 -0000 1.1
+++ build.xml 29 Nov 2002 23:32:53 -0000 1.2
@@ -48,7 +48,7 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="compile">
+ <target name="compile" depends="setenv">
<property name="testname" value="basetype"/>
<!-- generate skeletons -->
1.3 +1 -1 xml-axis/java/test/wsdl/interop4/groupH/complexDocLit/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupH/complexDocLit/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 8 Oct 2002 03:31:34 -0000 1.2
+++ build.xml 29 Nov 2002 23:32:53 -0000 1.3
@@ -48,7 +48,7 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="compile">
+ <target name="compile" depends="setenv">
<property name="testname" value="complexDocLit"/>
<!-- generate skeletons -->
1.3 +1 -1 xml-axis/java/test/wsdl/interop4/groupH/complexRPCenc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupH/complexRPCenc/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 11 Oct 2002 23:24:54 -0000 1.2
+++ build.xml 29 Nov 2002 23:32:53 -0000 1.3
@@ -48,7 +48,7 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="compile">
+ <target name="compile" depends="setenv">
<property name="testname" value="complexRPCenc"/>
<!-- generate skeletons -->
1.3 +1 -1 xml-axis/java/test/wsdl/interop4/groupH/simpleDocLit/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupH/simpleDocLit/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 8 Oct 2002 03:31:35 -0000 1.2
+++ build.xml 29 Nov 2002 23:32:53 -0000 1.3
@@ -48,7 +48,7 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="compile">
+ <target name="compile" depends="setenv">
<property name="testname" value="simpleDocLit"/>
<!-- generate skeletons -->
1.3 +1 -1 xml-axis/java/test/wsdl/interop4/groupH/simpleRPCenc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupH/simpleRPCenc/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 8 Oct 2002 03:31:35 -0000 1.2
+++ build.xml 29 Nov 2002 23:32:53 -0000 1.3
@@ -47,7 +47,7 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="compile">
+ <target name="compile" depends="setenv">
<property name="testname" value="simpleRPCenc"/>
<!-- generate skeletons -->
1.3 +1 -1 xml-axis/java/test/wsdl/interop4/groupi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupi/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 8 Oct 2002 03:31:35 -0000 1.2
+++ build.xml 29 Nov 2002 23:32:53 -0000 1.3
@@ -48,7 +48,7 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="compile">
+ <target name="compile" depends="setenv">
<property name="testname" value="groupi"/>
<!-- generate skeletons -->
1.2 +1 -1 xml-axis/java/test/wsdl/interop5/basetype/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop5/basetype/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 1 Nov 2002 13:49:05 -0000 1.1
+++ build.xml 29 Nov 2002 23:32:53 -0000 1.2
@@ -48,7 +48,7 @@
<delete dir="${build.dir}/work/${componentName}"/>
</target>
- <target name="compile">
+ <target name="compile" depends="setenv">
<property name="testname" value="basetype"/>
<!-- generate skeletons -->
