You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by st...@apache.org on 2002/09/04 00:25:23 UTC
cvs commit: xml-axis/java/tools axis-tasks.properties axis-test-tasks.properties build.xml
stevel 2002/09/03 15:25:23
Modified: java/tools build.xml
Added: java/tools axis-tasks.properties axis-test-tasks.properties
Log:
properties files for <taskdef>; one for developers, one for axis use. And a tweaked build.xml to match.
Revision Changes Path
1.5 +45 -28 xml-axis/java/tools/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/tools/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2 Sep 2002 18:20:05 -0000 1.4
+++ build.xml 3 Sep 2002 22:25:22 -0000 1.5
@@ -31,18 +31,27 @@
</description>
==================================================================== -->
-<project default="compile">
+<project name="axis tools" default="compile">
+ <description>
+ Builds the tools jars used with Axis
+ </description>
<property name="axis.home" location=".." />
+<property name="tools.dir" location="${axis.home}/tools" />
+
<property name="componentName" value="org/apache/axis/tools/ant" />
&properties;
&paths;
&taskdefs;
&targets;
+<property name="tools.build.dir" location="${build.dir}/tools" />
+
-<target name="clean">
- <echo message="Removing ${build.dir}/tools/${componentName}" />
- <delete dir="${build.dir}/tools/${componentName}" />
+<target name="clean" description="cleanup">
+ <property name="dir.to.clean"
+ location="${tools.build.dir}/${componentName}" />
+ <echo message="Removing ${dir.to.clean}" />
+ <delete dir="${dir.to.clean}" />
<delete file="${build.lib}/axis-ant.jar"/>
</target>
@@ -50,43 +59,51 @@
<target name="compile" depends="copy" unless="axis-ant.present">
<echo message="Compiling tools.*"/>
- <mkdir dir="${build.dir}/tools"/>
+ <mkdir dir="${tools.build.dir}"/>
<!-- build my ForEach task -->
- <echo message="Building ForEach" />
- <javac srcdir="${axis.home}/tools/${componentName}/foreach" destdir="${build.dir}/tools">
- <classpath refid="classpath"/>
- <include name="*.java" />
- </javac>
+ <echo message="Building ForEach" />
+ <javac srcdir="${tools.dir}/${componentName}/foreach"
+ destdir="${tools.build.dir}">
+ <classpath refid="classpath"/>
+ <include name="*.java" />
+ </javac>
<!-- build the RunAxisFunctionalTest task -->
- <echo message="Building RunAxisFunctionalTest" />
- <javac srcdir="${axis.home}/tools/${componentName}/axis" destdir="${build.dir}/tools">
- <classpath refid="classpath"/>
- <include name="*.java" />
- </javac>
+ <echo message="Building RunAxisFunctionalTest" />
+ <javac srcdir="${tools.dir}/${componentName}/axis"
+ destdir="${tools.build.dir}">
+ <classpath refid="classpath"/>
+ <include name="*.java" />
+ </javac>
<!-- build the wsdl2java and java2wsdl tasks -->
- <echo message="Building WSDL tasks" />
- <javac srcdir="${axis.home}/tools/${componentName}/wsdl" destdir="${build.dir}/tools">
- <classpath>
- <pathelement location="${build.lib}/${name}.jar"/>
- <pathelement location="${build.lib}/${jaxrpc}.jar"/>
- <path refid="classpath"/>
- </classpath>
- <include name="*.java" />
- </javac>
+ <echo message="Building WSDL tasks" />
+ <javac srcdir="${tools.dir}/${componentName}/wsdl"
+ destdir="${tools.build.dir}">
+ <classpath>
+ <pathelement location="${build.lib}/${name}.jar"/>
+ <pathelement location="${build.lib}/${jaxrpc}.jar"/>
+ <path refid="classpath"/>
+ </classpath>
+ <include name="*.java" />
+ </javac>
<copy todir="${build.dir}/${componentName}/foreach" >
- <fileset dir="${axis.home}/tools/${componentName}/foreach" excludes="**/*.java"/>
+ <fileset dir="${tools.dir}/${componentName}/foreach" excludes="**/*.java"/>
</copy>
- <jar jarfile="${build.lib}/axis-ant.jar" basedir="${build.dir}/tools">
- <include name="${componentName}/**"/>
+ <jar jarfile="${build.lib}/axis-ant.jar"
+ basedir="${build.dir}/tools">
+ <fileset dir="${tools.build.dir}">
+ <include name="${componentName}/**"/>
+ </fileset>
+ <fileset dir="${tools.dir}"
+ includes="*-tasks.properties"/>
</jar>
</target>
<target name="test" unless="axis-ant.present">
- <ant antfile="${axis.home}/tools/test.xml" />
+ <ant antfile="${tools.dir}/test.xml" />
</target>
</project>
1.1 xml-axis/java/tools/axis-tasks.properties
Index: axis-tasks.properties
===================================================================
#properties file for taskdefing the public Axis taskdefs
axis-wsdl2java=org.apache.axis.tools.ant.wsdl.Wsdl2JavaAntTask
axis-java2wsdl=org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask
1.1 xml-axis/java/tools/axis-test-tasks.properties
Index: axis-test-tasks.properties
===================================================================
#properties file for taskdefing the internal Axis taskdefs
#these tasks may be renamed as needed; there is no guarantee of continuity
#or stability as they are for axis testing
foreach=org.apache.axis.tools.ant.foreach.ForeachTask.java
runaxisfunctionaltests=org.apache.axis.tools.ant.axis.RunAxisFunctionalTests
Re: cvs commit: xml-axis/java/tools axis-tasks.properties axis-test-tasks.properties build.xml
Posted by Steve Loughran <st...@iseran.com>.
NB, notice that for end users the tasks are
> axis-wsdl2java=org.apache.axis.tools.ant.wsdl.Wsdl2JavaAntTask
> axis-java2wsdl=org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask
That gives us the option to have separate tasks for developers than for the
internal build (you know, the one with all the debug messages and defaults
to not fail if any remote URLs cant be read).
I'd probably rather fix up all our tests so that they dont rely on the
defaults instead.
----- Original Message -----
From: <st...@apache.org>
To: <xm...@apache.org>
Sent: Tuesday, September 03, 2002 3:25 PM
Subject: cvs commit: xml-axis/java/tools axis-tasks.properties
axis-test-tasks.properties build.xml
> stevel 2002/09/03 15:25:23
>
> Modified: java/tools build.xml
> Added: java/tools axis-tasks.properties axis-test-tasks.properties
> Log:
> properties files for <taskdef>; one for developers, one for axis use.
And a tweaked build.xml to match.
>
> Revision Changes Path
> 1.5 +45 -28 xml-axis/java/tools/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/xml-axis/java/tools/build.xml,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- build.xml 2 Sep 2002 18:20:05 -0000 1.4
> +++ build.xml 3 Sep 2002 22:25:22 -0000 1.5
> @@ -31,18 +31,27 @@
> </description>
>
==================================================================== -->
>
> -<project default="compile">
> +<project name="axis tools" default="compile">
> + <description>
> + Builds the tools jars used with Axis
> + </description>
>
> <property name="axis.home" location=".." />
> +<property name="tools.dir" location="${axis.home}/tools" />
> +
> <property name="componentName" value="org/apache/axis/tools/ant" />
> &properties;
> &paths;
> &taskdefs;
> &targets;
> +<property name="tools.build.dir" location="${build.dir}/tools" />
> +
>
> -<target name="clean">
> - <echo message="Removing ${build.dir}/tools/${componentName}" />
> - <delete dir="${build.dir}/tools/${componentName}" />
> +<target name="clean" description="cleanup">
> + <property name="dir.to.clean"
> + location="${tools.build.dir}/${componentName}" />
> + <echo message="Removing ${dir.to.clean}" />
> + <delete dir="${dir.to.clean}" />
> <delete file="${build.lib}/axis-ant.jar"/>
> </target>
>
> @@ -50,43 +59,51 @@
>
> <target name="compile" depends="copy" unless="axis-ant.present">
> <echo message="Compiling tools.*"/>
> - <mkdir dir="${build.dir}/tools"/>
> + <mkdir dir="${tools.build.dir}"/>
> <!-- build my ForEach task -->
> - <echo message="Building ForEach" />
> - <javac srcdir="${axis.home}/tools/${componentName}/foreach"
destdir="${build.dir}/tools">
> - <classpath refid="classpath"/>
> - <include name="*.java" />
> - </javac>
> + <echo message="Building ForEach" />
> + <javac srcdir="${tools.dir}/${componentName}/foreach"
> + destdir="${tools.build.dir}">
> + <classpath refid="classpath"/>
> + <include name="*.java" />
> + </javac>
>
> <!-- build the RunAxisFunctionalTest task -->
> - <echo message="Building RunAxisFunctionalTest" />
> - <javac srcdir="${axis.home}/tools/${componentName}/axis"
destdir="${build.dir}/tools">
> - <classpath refid="classpath"/>
> - <include name="*.java" />
> - </javac>
> + <echo message="Building RunAxisFunctionalTest" />
> + <javac srcdir="${tools.dir}/${componentName}/axis"
> + destdir="${tools.build.dir}">
> + <classpath refid="classpath"/>
> + <include name="*.java" />
> + </javac>
>
> <!-- build the wsdl2java and java2wsdl tasks -->
> - <echo message="Building WSDL tasks" />
> - <javac srcdir="${axis.home}/tools/${componentName}/wsdl"
destdir="${build.dir}/tools">
> - <classpath>
> - <pathelement location="${build.lib}/${name}.jar"/>
> - <pathelement location="${build.lib}/${jaxrpc}.jar"/>
> - <path refid="classpath"/>
> - </classpath>
> - <include name="*.java" />
> - </javac>
> + <echo message="Building WSDL tasks" />
> + <javac srcdir="${tools.dir}/${componentName}/wsdl"
> + destdir="${tools.build.dir}">
> + <classpath>
> + <pathelement location="${build.lib}/${name}.jar"/>
> + <pathelement location="${build.lib}/${jaxrpc}.jar"/>
> + <path refid="classpath"/>
> + </classpath>
> + <include name="*.java" />
> + </javac>
>
> <copy todir="${build.dir}/${componentName}/foreach" >
> - <fileset dir="${axis.home}/tools/${componentName}/foreach"
excludes="**/*.java"/>
> + <fileset dir="${tools.dir}/${componentName}/foreach"
excludes="**/*.java"/>
> </copy>
>
> - <jar jarfile="${build.lib}/axis-ant.jar"
basedir="${build.dir}/tools">
> - <include name="${componentName}/**"/>
> + <jar jarfile="${build.lib}/axis-ant.jar"
> + basedir="${build.dir}/tools">
> + <fileset dir="${tools.build.dir}">
> + <include name="${componentName}/**"/>
> + </fileset>
> + <fileset dir="${tools.dir}"
> + includes="*-tasks.properties"/>
> </jar>
> </target>
>
> <target name="test" unless="axis-ant.present">
> - <ant antfile="${axis.home}/tools/test.xml" />
> + <ant antfile="${tools.dir}/test.xml" />
> </target>
>
> </project>
>
>
>
> 1.1 xml-axis/java/tools/axis-tasks.properties
>
> Index: axis-tasks.properties
> ===================================================================
> #properties file for taskdefing the public Axis taskdefs
>
> axis-wsdl2java=org.apache.axis.tools.ant.wsdl.Wsdl2JavaAntTask
> axis-java2wsdl=org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask
>
>
>
>
>
> 1.1 xml-axis/java/tools/axis-test-tasks.properties
>
> Index: axis-test-tasks.properties
> ===================================================================
> #properties file for taskdefing the internal Axis taskdefs
> #these tasks may be renamed as needed; there is no guarantee of
continuity
> #or stability as they are for axis testing
>
> foreach=org.apache.axis.tools.ant.foreach.ForeachTask.java
>
runaxisfunctionaltests=org.apache.axis.tools.ant.axis.RunAxisFunctionalTests
>
>
>
>
>
>