You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/05/27 17:13:20 UTC
cvs commit: avalon-excalibur/datasource build.xml default.properties
bloritsch 2003/05/27 08:13:20
Modified: . depchecker.xml libraries.properties
datasource build.xml default.properties
Log:
add check for FortressTools
Revision Changes Path
1.51 +22 -1 avalon-excalibur/depchecker.xml
Index: depchecker.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/depchecker.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- depchecker.xml 5 Apr 2003 19:39:33 -0000 1.50
+++ depchecker.xml 27 May 2003 15:13:19 -0000 1.51
@@ -265,6 +265,27 @@
</ant>
</target>
+ <!-- Fortress Tools -->
+ <target name="checkFortressTools">
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
+ <property name="proj.jar.name" value="excalibur-fortress-tools-1.0.jar"/>
+ <property name="path" value="${excalibur-fortress-tools.jar}"/>
+ <property name="proj.home" value="${basedir}/../fortress"/>
+ </ant>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
+ <property name="proj.jar.name" value="qdox.jar"/>
+ <property name="class" value="com.thoughtworks.qdox.ant.AbstractQdoxTask"/>
+ <property name="classpath" value="${cp}"/>
+ <property name="remedy" value="1) Download and unpack qdox from ${nl}
+ | http://qdox.codehaus.org/ ${nl}
+ | 2) Copy the project's ant.properties.sample to ant.properties ${nl}
+ | 3) In ant.properties, redefine the qdox.jar property ${nl}
+ | to point to the path of qdox.jar in your ${nl}
+ | downloaded distribution."/>
+ </ant>
+
+ </target>
+
<!-- Altrmi -->
<target name="checkAltrmiCommon">
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
1.5 +1 -0 avalon-excalibur/libraries.properties
Index: libraries.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/libraries.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libraries.properties 20 May 2003 21:06:18 -0000 1.4
+++ libraries.properties 27 May 2003 15:13:19 -0000 1.5
@@ -154,6 +154,7 @@
excalibur-fortress.home=${basedir}/../fortress
excalibur-fortress.lib=${excalibur-fortress.home}/build/lib
excalibur-fortress.jar=${excalibur-fortress.lib}/excalibur-fortress-1.0.jar
+excalibur-fortress-tools.jar=${excalibur-fortress.lib}/excalibur-fortress-tools-1.0.jar
# ----- i18n -----
excalibur-i18n.home=${basedir}/../i18n
1.50 +13 -0 avalon-excalibur/datasource/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/build.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- build.xml 20 May 2003 20:44:43 -0000 1.49
+++ build.xml 27 May 2003 15:13:20 -0000 1.50
@@ -22,6 +22,8 @@
<pathelement location="${logkit.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
+ <pathelement location="${excalibur-fortress-tools.jar}"/>
+ <pathelement location="${qdox.jar}"/>
<pathelement location="${comons-collections.jar}"/>
<pathelement location="${util.concurrent.jar}"/>
<pathelement location="${excalibur-i18n.jar}"/>
@@ -56,6 +58,7 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkI18n"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFortressTools"/>
</target>
<target name="dependencies-test" depends="dist-jar, dependencies"
@@ -120,6 +123,16 @@
<exclude name="org/apache/avalon/excalibur/datasource/J2eeDataSource.java"
unless="j2ee.present"/>
</javac>
+
+ <!-- generate fortress meta descriptors -->
+ <taskdef name="fortress-collect-meta"
+ classname="org.apache.avalon.fortress.tools.ComponentMetaInfoCollector">
+ <classpath refid="project.class.path"/>
+ </taskdef>
+
+ <fortress-collect-meta destdir="${build.classes}">
+ <fileset dir="${java.dir}"/>
+ </fortress-collect-meta>
<!-- copy resources to same location as .class files -->
<copy todir="${build.classes}">
1.30 +7 -0 avalon-excalibur/datasource/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/default.properties,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- default.properties 20 May 2003 20:44:43 -0000 1.29
+++ default.properties 27 May 2003 15:13:20 -0000 1.30
@@ -41,6 +41,13 @@
excalibur-i18n.lib=${excalibur-i18n.home}
excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
+# ----- Avalon Fortress, version 1.0 or later -----
+excalibur-fortress.home=${basedir}/../fortress
+excalibur-fortress.lib=${excalibur-fortress.home}/dist
+excalibur-fortress-tools.jar=${excalibur-fortress.lib}/excalibur-fortress-tools-1.0.jar
+
+# ----- QDox Jar ----
+qdox.jar=${basedir}/../lib/qdox-1.1.jar
# ----- Commons Collections, version 2.1 or later -----
comons-collections.jar=../lib/commons-collections-2.1.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org