bloritsch 2003/03/11 07:15:24
Modified: . depchecker.xml dependencies.txt
fortress default.properties
Log:
update to include lifecycle
Revision Changes Path
1.47 +18 -39 avalon-excalibur/depchecker.xml
Index: depchecker.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/depchecker.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- depchecker.xml 18 Feb 2003 02:51:47 -0000 1.46
+++ depchecker.xml 11 Mar 2003 15:15:22 -0000 1.47
@@ -340,12 +340,15 @@
<property name="proj.home" value="${basedir}/../i18n"/>
</ant>
</target>
- <target name="checkCli">
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
- <property name="proj.jar.name" value="excalibur-cli-1.0.jar"/>
- <property name="path" value="${excalibur-cli.jar}"/>
- <property name="proj.home" value="${basedir}/../cli"/>
- </ant>
+
+ <target name="checkCli" depends="checkCompatibility"/>
+
+ <target name="checkCompatibility">
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
+ <property name="proj.jar.name" value="excalibur-compatibility-1.0.jar"/>
+ <property name="path" value="${excalibur-compatibility.jar}"/>
+ <property name="proj.home" value="${basedir}/../compatibility"/>
+ </ant>
</target>
<target name="checkInstrument">
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
@@ -368,20 +371,7 @@
<property name="proj.home" value="${basedir}/../instrument-manager"/>
</ant>
</target>
- <target name="checkCollections">
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
- <property name="proj.jar.name" value="excalibur-collections.jar"/>
- <property name="path" value="${excalibur-collections.jar}"/>
- <property name="proj.home" value="${basedir}/../collections"/>
- </ant>
- </target>
- <target name="checkUtil">
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
- <property name="proj.jar.name" value="excalibur-util.jar"/>
- <property name="path" value="${excalibur-util.jar}"/>
- <property name="proj.home" value="${basedir}/../util"/>
- </ant>
- </target>
+ <target name="checkCollections" depends="checkCompatibility"/>
<target name="checkCache">
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
<property name="proj.jar.name" value="excalibur-cache.jar"/>
@@ -396,13 +386,7 @@
<property name="proj.home" value="${basedir}/../component"/>
</ant>
</target>
- <target name="checkConcurrent">
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
- <property name="proj.jar.name" value="excalibur-concurrent.jar"/>
- <property name="path" value="${excalibur-concurrent.jar}"/>
- <property name="proj.home" value="${basedir}/../concurrent"/>
- </ant>
- </target>
+ <target name="checkConcurrent" depends="checkCompatibility"/>
<target name="checkConfiguration">
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
<property name="proj.jar.name" value="excalibur-configuration.jar"/>
@@ -410,11 +394,12 @@
<property name="proj.home" value="${basedir}/../configuration"/>
</ant>
</target>
- <target name="checkContainer">
+ <target name="checkContainer" depends="checkLifecycle"/>
+ <target name="checkLifecycle">
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
- <property name="proj.jar.name" value="excalibur-container.jar"/>
- <property name="path" value="${excalibur-container.jar}"/>
- <property name="proj.home" value="${basedir}/../container"/>
+ <property name="proj.jar.name" value="excalibur-lifecycle.jar"/>
+ <property name="path" value="${excalibur-lifecycle.jar}"/>
+ <property name="proj.home" value="${basedir}/../lifecycle"/>
</ant>
</target>
<target name="checkMeta">
@@ -431,13 +416,7 @@
<property name="proj.home" value="${basedir}/../pool"/>
</ant>
</target>
- <target name="checkIO">
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
- <property name="proj.jar.name" value="excalibur-io.jar"/>
- <property name="path" value="${excalibur-io.jar}"/>
- <property name="proj.home" value="${basedir}/../io"/>
- </ant>
- </target>
+ <target name="checkIO" depends="checkCompatibility"/>
<target name="checkStore">
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
<property name="proj.jar.name" value="excalibur-store.jar"/>
1.32 +1 -4 avalon-excalibur/dependencies.txt
Index: dependencies.txt
===================================================================
RCS file: /home/cvs/avalon-excalibur/dependencies.txt,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dependencies.txt 16 Nov 2002 11:56:28 -0000 1.31
+++ dependencies.txt 11 Mar 2003 15:15:23 -0000 1.32
@@ -6,15 +6,12 @@
* bzip2 -> .
* cache -> framework
-* cli -> .
-* collections -> .
-* concurrent -> .
+* compatibility -> .
* configuration -> framework
* context -> framework
* extension -> .
* i18n -> .
* instrument -> framework, altrmi-*
-* io -> .
* threadcontext -> .
* naming -> .
* store -> framework
1.67 +4 -4 avalon-excalibur/fortress/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/default.properties,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- default.properties 7 Mar 2003 17:46:01 -0000 1.66
+++ default.properties 11 Mar 2003 15:15:23 -0000 1.67
@@ -19,10 +19,10 @@
# ----- Doug Lea's Concurrent Utils, version 1.3 or later -----
util.concurrent.jar=${basedir}/../event/lib/util.concurrent-1.3.1.jar
-# ----- Excalibur Container -----
-excalibur-container.home=${basedir}/../container
-excalibur-container.lib=${excalibur-container.home}/build/lib
-excalibur-container.jar=${excalibur-container.lib}/excalibur-container-1.0.jar
+# ----- Excalibur Lifecycle -----
+excalibur-lifecycle.home=${basedir}/../lifecycle
+excalibur-lifecycle.lib=${excalibur-lifecycle.home}/build/lib
+excalibur-lifecycle.jar=${excalibur-lifecycle.lib}/excalibur-lifecycle-1.0.jar
# ----- Excalibur instrument, version 1.0 or later -----
excalibur-instrument.home=${basedir}/../instrument/dist
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
