hammant 2002/10/02 13:24:02
Modified: infomover build.xml
sevak build.xml
simpleserver build.xml
xcommander build.xml
Log:
upgrade phoenixXdoclet
Revision Changes Path
1.5 +5 -20 jakarta-avalon-apps/infomover/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/infomover/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 30 Sep 2002 15:59:25 -0000 1.4
+++ build.xml 2 Oct 2002 20:24:02 -0000 1.5
@@ -120,12 +120,8 @@
</target>
- <target name="test-xdoclet">
- <available classname="xdoclet.XDocletMain" classpathref="project.class.path"
property="xdoclet.present"/>
- </target>
-
<!-- Make .xinfo and manifest automatically for blocks -->
- <target name="phoenix-xdoclet" depends="compile" if="xdoclet.present">
+ <target name="phoenix-xdoclet" depends="compile">
<mkdir dir="${build.xdoclet}"/>
@@ -146,18 +142,8 @@
</target>
- <!-- Make .xinfo and manifest automatically for blocks -->
- <target name="no-phoenix-xdoclet" depends="compile" unless="xdoclet.present">
-
- <mkdir dir="${build.xdoclet}"/>
-
- <unzip src="${src.dir}/generated-by-xdoclet.zip" dest="${build.xdoclet}" />
-
- </target>
-
-
<!-- Jars up project -->
- <target name="jars" depends="test-xdoclet, phoenix-xdoclet, no-phoenix-xdoclet">
+ <target name="jars" depends="phoenix-xdoclet">
<mkdir dir="${build.lib}"/>
@@ -213,7 +199,7 @@
</target>
<!-- Completely build all dists -->
- <target name="dist" depends="sars" description="Generates the distribution">
+ <target name="dist" description="Generates the distribution">
<property name="dist.name" value="${Name}-${version}"/>
@@ -251,6 +237,7 @@
<include name="common/lib/cornerstone.jar"/>
<include name="common/lib/phoenix-*"/>
<include name="common/lib/excalibur-i18n*"/>
+ <include name="common/lib/qdox-*"/>
</fileset>
</zip>
@@ -267,6 +254,7 @@
<include name="common/lib/cornerstone.jar"/>
<include name="common/lib/phoenix-*"/>
<include name="common/lib/excalibur-i18n*"/>
+ <include name="common/lib/qdox-*"/>
</tarfileset>
</tar>
@@ -310,9 +298,6 @@
<copy todir="${src.dist.src}">
<fileset dir="${src.dir}"/>
</copy>
-
- <zip zipfile="${src.dist.src}/generated-by-xdoclet.zip"
- basedir="${build.xdoclet}"/>
<copy todir="${src.dist.dir}">
<fileset dir=".">
1.16 +5 -27 jakarta-avalon-apps/sevak/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 30 Sep 2002 22:03:11 -0000 1.15
+++ build.xml 2 Oct 2002 20:24:02 -0000 1.16
@@ -67,10 +67,7 @@
<pathelement path="${build.classes}" />
<fileset dir="../common/lib">
<include name="*.jar" />
- </fileset>
- <fileset dir="../common/lib/xdoclet">
- <include name="*.jar" />
- </fileset>
+ </fileset>
<fileset dir="${tomcat.jars.dir}">
<include name="*.jar" />
</fileset>
@@ -144,8 +141,6 @@
<available classpathref="project.class.path"
classname="org.apache.catalina.Engine" property="catalina.present"/>
<available classpathref="project.class.path"
classname="com.tagtraum.jo.JoServletService" property="jo.present"/>
<available classpathref="project.class.path"
classname="org.mortbay.jetty.Server" property="jetty.present"/>
-
- <available classpathref="project.class.path" classname="xdoclet.DocletTask"
property="xdoclet.present"/>
</target>
@@ -174,12 +169,8 @@
</target>
- <target name="test-xdoclet">
- <available classname="xdoclet.XDocletMain" classpathref="project.class.path"
property="xdoclet.present"/>
- </target>
-
<!-- Make .xinfo and manifest automatically for blocks -->
- <target name="phoenix-xdoclet" depends="compile" if="xdoclet.present">
+ <target name="phoenix-xdoclet" depends="compile">
<mkdir dir="${build.xdoclet}/catalina"/>
<mkdir dir="${build.xdoclet}/jo"/>
@@ -222,18 +213,8 @@
</target>
- <!-- Make .xinfo and manifest automatically for blocks -->
- <target name="no-phoenix-xdoclet" depends="compile" unless="xdoclet.present">
-
- <mkdir dir="${build.xdoclet}"/>
-
- <unzip src="${src.dir}/generated-by-xdoclet.zip" dest="${build.xdoclet}" />
-
- </target>
-
-
<!-- Jars up project -->
- <target name="jars" depends="test-xdoclet, phoenix-xdoclet, no-phoenix-xdoclet">
+ <target name="jars" depends="phoenix-xdoclet">
<mkdir dir="${build.lib}"/>
@@ -404,7 +385,7 @@
<!-- Completely build all dists -->
- <target name="dist" depends="jars" description="Generates the distribution">
+ <target name="dist" description="Generates the distribution">
<property name="dist.name" value="${Name}-${version}"/>
@@ -502,10 +483,7 @@
<copy todir="${src.dist.src}">
<fileset dir="${src.dir}"/>
</copy>
-
- <zip zipfile="${src.dist.src}/generated-by-xdoclet.zip"
- basedir="${build.xdoclet}"/>
-
+
<copy todir="${src.dist.dir}">
<fileset dir=".">
<include name="build.xml"/>
1.17 +5 -19 jakarta-avalon-apps/simpleserver/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 6 Sep 2002 09:45:07 -0000 1.16
+++ build.xml 2 Oct 2002 20:24:02 -0000 1.17
@@ -121,12 +121,9 @@
</target>
- <target name="test-xdoclet">
- <available classname="xdoclet.XDocletMain" classpathref="project.class.path"
property="xdoclet.present"/>
- </target>
<!-- Make .xinfo and manifest automatically for blocks -->
- <target name="phoenix-xdoclet" depends="compile" if="xdoclet.present">
+ <target name="phoenix-xdoclet" depends="compile">
<mkdir dir="${build.xdoclet}"/>
@@ -146,18 +143,8 @@
</target>
- <!-- Make .xinfo and manifest automatically for blocks -->
- <target name="no-phoenix-xdoclet" depends="compile" unless="xdoclet.present">
-
- <mkdir dir="${build.xdoclet}"/>
-
- <unzip src="${src.dir}/generated-by-xdoclet.zip" dest="${build.xdoclet}" />
-
- </target>
-
-
<!-- Jars up project -->
- <target name="jars" depends="test-xdoclet, phoenix-xdoclet, no-phoenix-xdoclet">
+ <target name="jars" depends="phoenix-xdoclet">
<mkdir dir="${build.lib}"/>
@@ -232,7 +219,7 @@
</target>
<!-- Completely build all dists -->
- <target name="dist" depends="sars" description="Generates the distribution">
+ <target name="dist" description="Generates the distribution">
<property name="dist.name" value="${Name}-${version}"/>
@@ -269,6 +256,7 @@
<include name="common/lib/avalon-*"/>
<include name="common/lib/cornerstone.jar"/>
<include name="common/lib/phoenix-*"/>
+ <include name="common/lib/qdox-*"/>
</fileset>
</zip>
@@ -284,6 +272,7 @@
<include name="common/lib/avalon-*"/>
<include name="common/lib/cornerstone.jar"/>
<include name="common/lib/phoenix-*"/>
+ <include name="common/lib/qdox-*"/>
</tarfileset>
</tar>
@@ -327,9 +316,6 @@
<copy todir="${src.dist.src}">
<fileset dir="${src.dir}"/>
</copy>
-
- <zip zipfile="${src.dist.src}/generated-by-xdoclet.zip"
- basedir="${build.xdoclet}"/>
<copy todir="${src.dist.dir}">
<fileset dir=".">
1.18 +0 -7 jakarta-avalon-apps/xcommander/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 26 Jul 2002 14:21:58 -0000 1.17
+++ build.xml 2 Oct 2002 20:24:02 -0000 1.18
@@ -44,13 +44,6 @@
<ant antfile="${basedir}/../build.xml"
target="module:phoenix-xdoclet"/>
</target>
- <target name="no-phoenix-xdoclet">
- <echo
message="-------------------------------------------------------------" />
- <echo message="WARNING: Deprecated. You should not call this target
directly" />
- <echo
message="-------------------------------------------------------------" />
- <ant antfile="${basedir}/../build.xml"
target="module:no-phoenix-xdoclet"/>
- </target>
-
<target name="check">
<echo
message="-------------------------------------------------------------" />
<echo message="WARNING: Deprecated. Use the test target instead" />
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
