bloritsch 2003/05/30 13:26:54
Modified: fortress/examples ant.properties build.xml
Log:
Update the ant file to use the meta info
Revision Changes Path
1.13 +2 -0 avalon-excalibur/fortress/examples/ant.properties
Index: ant.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/examples/ant.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ant.properties 29 Mar 2003 10:37:35 -0000 1.12
+++ ant.properties 30 May 2003 20:26:54 -0000 1.13
@@ -17,6 +17,7 @@
excalibur-fortress.home=${basepath}/build/lib
excalibur-fortress.lib=${excalibur-fortress.home}
excalibur-fortress.jar=${excalibur-fortress.lib}/excalibur-fortress-complete-1.0.jar
+excalibur-fortress-tools.jar=${excalibur-fortress.lib}/excalibur-fortress-tools-1.0.jar
# ----- External JARS, version 1.0 or later -----
excalibur-event.home=${basepath}/../event
@@ -34,5 +35,6 @@
xml-apis.jar=${tools.dir}/lib/xml-apis.jar
xalan.jar=${tools.dir}/lib/xalan-2.3.1.jar
xerces.jar=${tools.dir}/lib/xerces-2.0.1.jar
+qdox.jar=../../lib/qdox-1.1.jar
# --------------------------------------------------
1.17 +25 -19 avalon-excalibur/fortress/examples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/examples/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 14 May 2003 15:54:44 -0000 1.16
+++ build.xml 30 May 2003 20:26:54 -0000 1.17
@@ -4,7 +4,7 @@
<!-- Container Example build file! -->
<!-- ======================================================================= -->
-<project name="container" default="main" basedir=".">
+<project name="Excalibur Fortress Examples" default="main" basedir=".">
<property file="ant.properties"/>
<property file="../ant.properties"/>
@@ -18,6 +18,7 @@
<property name="build.classes.dir" value="${build.dir}/classes"/>
<property name="build.javadocs.dir" value="${build.dir}/javadocs"/>
<property name="lib.dir" value="${basedir}/lib"/>
+ <property name="fortresstools.dir" value="${basedir}/tools"/>
<!-- Existing directories -->
<property name="src.dir" value="${basedir}/src"/>
@@ -27,7 +28,7 @@
<!-- Define paths used by this project -->
<path id="project.class.path">
<fileset dir="${commonlib.dir}">
- <include name="**/*.jar"/>
+ <include name="*.jar"/>
</fileset>
<pathelement path="${build.classes.dir}" />
</path>
@@ -44,6 +45,8 @@
<!-- Help on usage -->
<!-- =================================================================== -->
<target name="collect-jars">
+ <mkdir dir="${fortresstools.dir}"/>
+ <mkdir dir="${commonlib.dir}"/>
<!-- Avalon framework jar -->
<copy file="${avalon-framework.jar}"
@@ -57,13 +60,11 @@
<copy file="${excalibur-fortress.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
- <!-- Container jar -->
-<!-- <copy file="${excalibur-container.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/>
--->
- <!-- xml-apis -->
- <!-- <copy file="${xml-apis.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/> -->
+ <copy file="${excalibur-fortress-tools.jar}"
+ todir="${fortresstools.dir}" preservelastmodified="yes"/>
+
+ <copy file="${qdox.jar}"
+ todir="${fortresstools.dir}" preservelastmodified="yes"/>
<copy file="${commons-collections.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
@@ -71,13 +72,6 @@
<copy file="${util.concurrent.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
- <!-- Xerces jar -->
- <!-- <copy file="${xerces.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/> -->
-
- <!-- Xalan jar -->
- <!-- <copy file="${xalan.jar}"
- todir="${lib.dir}" preservelastmodified="yes"/> -->
</target>
@@ -152,6 +146,19 @@
<exclude name="**/servlet/*.java" unless="servlet.present"/>
</javac>
+ <taskdef name="collect-meta"
+ classname="org.apache.avalon.fortress.tools.ComponentMetaInfoCollector">
+ <classpath>
+ <fileset dir="${fortresstools.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement path="${build.classes.dir}"/>
+ </classpath>
+ </taskdef>
+
+ <collect-meta destdir="${build.classes.dir}">
+ <fileset dir="${src.java.dir}"/>
+ </collect-meta>
<!-- copy resources to same location as .class files -->
<copy todir="${build.classes.dir}">
<fileset dir="${src.java.dir}">
@@ -192,7 +199,6 @@
<!-- Creates the jar archive -->
<!-- =================================================================== -->
<target name="jar" depends="compile" description="Builds the jar archive.">
- <mkdir dir="${lib.dir}"/>
<jar jarfile="${lib.dir}/${name}.jar"
basedir="${build.classes.dir}"
@@ -229,8 +235,7 @@
<!-- =================================================================== -->
<!-- Main target -->
<!-- =================================================================== -->
- <target name="main" depends="jar" description="build the runnable application">
- </target>
+ <target name="main" depends="jar" description="build the runnable application"/>
<!-- =================================================================== -->
<!-- Creates the javadocs archive. -->
@@ -264,6 +269,7 @@
<target name="clean" description="cleans up the directory">
<delete dir="${build.dir}"/>
<delete dir="${lib.dir}"/>
+ <delete dir="${fortresstools.dir}"/>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
