You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2002/11/05 23:44:39 UTC
cvs commit: jakarta-avalon-apps/demo newbuild.xml
hammant 2002/11/05 14:44:39
Modified: httpproxy build.xml
sevak build.xml catalina.xml jetty.xml jo.xml
site build.xml
Removed: demo newbuild.xml
Log:
xdoclet eliminated
Revision Changes Path
1.22 +12 -17 jakarta-avalon-apps/httpproxy/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/httpproxy/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 2 Oct 2002 20:07:36 -0000 1.21
+++ build.xml 5 Nov 2002 22:44:38 -0000 1.22
@@ -23,7 +23,7 @@
<!-- Set the properties for intermediate directory -->
<property name="build.dir" value="build"/>
<property name="build.lib" value="${build.dir}/lib"/>
- <property name="build.xdoclet" value="${build.dir}/xdoclet"/>
+ <property name="build.metagenerate" value="${build.dir}/metagenerate"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.javadocs" value="${build.dir}/javadocs"/>
@@ -120,37 +120,32 @@
<!-- Make .xinfo and manifest automatically for blocks -->
- <target name="phoenix-xdoclet" depends="compile">
+ <target name="phoenix-metagenerate" depends="compile">
- <mkdir dir="${build.xdoclet}"/>
+ <mkdir dir="${build.metagenerate}"/>
- <taskdef name="phoenix-blocks"
- classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet"
- classpathref="project.class.path"/>
-
- <phoenix-blocks
- destdir="${build.xdoclet}"
- classpathref="project.class.path">
+ <taskdef name="generatemeta" classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
+ <classpath refid="project.class.path" />
+ </taskdef>
+
+ <generatemeta dest="${build.metagenerate}">
<fileset dir="${java.dir}">
<include name="**/*.java" />
</fileset>
- <blockinfo/>
- <manifest manifestFile="manifest.mf" />
- </phoenix-blocks>
+ </generatemeta>
</target>
<!-- Jars up project -->
- <target name="jars" depends="phoenix-xdoclet">
+ <target name="jars" depends="phoenix-metagenerate">
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/${name}.jar"
- manifest="${build.xdoclet}/manifest.mf">
+ <jar jarfile="${build.lib}/${name}.jar">
<fileset dir="${build.classes}">
<include name="org/apache/avalon/httpproxy/**"/>
</fileset>
- <fileset dir="${build.xdoclet}">
+ <fileset dir="${build.metagenerate}">
<include name="**/*.xinfo"/>
</fileset>
</jar>
1.19 +1 -1 jakarta-avalon-apps/sevak/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 5 Nov 2002 22:12:25 -0000 1.18
+++ build.xml 5 Nov 2002 22:44:38 -0000 1.19
@@ -251,7 +251,7 @@
<target name="compile-demo" depends="compile" description="Compiles the Demo Block">
<delete dir="${build.demoClasses}"/>
- <delete dir="${build.demoXdoclet}"/>
+ <delete dir="${build.demoMetaGenerate}"/>
<mkdir dir="${build.demoClasses}"/>
1.9 +2 -2 jakarta-avalon-apps/sevak/catalina.xml
Index: catalina.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/catalina.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- catalina.xml 20 Oct 2002 22:02:34 -0000 1.8
+++ catalina.xml 5 Nov 2002 22:44:38 -0000 1.9
@@ -23,7 +23,7 @@
<!-- Set the properties for intermediate directory -->
<property name="build.dir" value="build"/>
<property name="build.lib" value="${build.dir}/lib"/>
- <property name="build.xdoclet" value="${build.dir}/xdoclet"/>
+ <property name="build.metagenerate" value="${build.dir}/metagenerate"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.javadocs" value="${build.dir}/javadocs"/>
@@ -34,7 +34,7 @@
<!-- Sevak specific properties for building -->
<property name="build.reports" value="${build.dir}/reports"/>
<property name="build.demoClasses" value="${build.dir}/demoClasses"/>
- <property name="build.demoXdoclet" value="${build.dir}/demoXdoclet"/>
+ <property name="build.demoMetagenerate" value="${build.dir}/demoMetagenerate"/>
<!-- Set the properties for source directories -->
1.4 +2 -2 jakarta-avalon-apps/sevak/jetty.xml
Index: jetty.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/jetty.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jetty.xml 5 Oct 2002 06:57:34 -0000 1.3
+++ jetty.xml 5 Nov 2002 22:44:38 -0000 1.4
@@ -23,7 +23,7 @@
<!-- Set the properties for intermediate directory -->
<property name="build.dir" value="build"/>
<property name="build.lib" value="${build.dir}/lib"/>
- <property name="build.xdoclet" value="${build.dir}/xdoclet"/>
+ <property name="build.metagenerate" value="${build.dir}/metagenerate"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.javadocs" value="${build.dir}/javadocs"/>
@@ -34,7 +34,7 @@
<!-- Sevak specific properties for building -->
<property name="build.reports" value="${build.dir}/reports"/>
<property name="build.demoClasses" value="${build.dir}/demoClasses"/>
- <property name="build.demoXdoclet" value="${build.dir}/demoXdoclet"/>
+ <property name="build.demoMetagenerate" value="${build.dir}/demoMetagenerate"/>
<!-- Set the properties for source directories -->
1.6 +2 -2 jakarta-avalon-apps/sevak/jo.xml
Index: jo.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/sevak/jo.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jo.xml 5 Oct 2002 06:57:34 -0000 1.5
+++ jo.xml 5 Nov 2002 22:44:38 -0000 1.6
@@ -23,7 +23,7 @@
<!-- Set the properties for intermediate directory -->
<property name="build.dir" value="build"/>
<property name="build.lib" value="${build.dir}/lib"/>
- <property name="build.xdoclet" value="${build.dir}/xdoclet"/>
+ <property name="build.metagenerate" value="${build.dir}/metagenerate"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.javadocs" value="${build.dir}/javadocs"/>
@@ -34,7 +34,7 @@
<!-- Sevak specific properties for building -->
<property name="build.reports" value="${build.dir}/reports"/>
<property name="build.demoClasses" value="${build.dir}/demoClasses"/>
- <property name="build.demoXdoclet" value="${build.dir}/demoXdoclet"/>
+ <property name="build.demoMetagenerate" value="${build.dir}/demoMetagenerate"/>
<!-- Set the properties for source directories -->
1.12 +0 -1 jakarta-avalon-apps/site/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/site/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 26 Jul 2002 14:21:58 -0000 1.11
+++ build.xml 5 Nov 2002 22:44:39 -0000 1.12
@@ -17,7 +17,6 @@
<!-- Set the properties for intermediate directory -->
<property name="build.dir" value="build"/>
<property name="build.lib" value="${build.dir}/lib"/>
- <property name="build.xdoclet" value="${build.dir}/xdoclet"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.javadocs" value="${build.dir}/javadocs"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>