cziegeler 02/04/22 02:47:10
Modified: . depchecker.xml
all build.xml default.properties
sourceresolve build.xml default.properties
Log:
Correcting dependencies
Revision Changes Path
1.19 +8 -1 jakarta-avalon-excalibur/depchecker.xml
Index: depchecker.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/depchecker.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- depchecker.xml 21 Apr 2002 05:45:43 -0000 1.18
+++ depchecker.xml 22 Apr 2002 09:47:10 -0000 1.19
@@ -3,7 +3,7 @@
<!--
============================================================
Dependency updater
- Version $Revision: 1.18 $
+ Version $Revision: 1.19 $
Jeff Turner <[EMAIL PROTECTED]>
This Ant script provides "functions" to check if
@@ -379,6 +379,13 @@
<property name="name" value="excalibur-instrument-manager.jar"/>
<property name="path"
value="${excalibur-instrument-manager.jar}"/>
<property name="proj.home"
value="${basedir}/../instrument-manager"/>
+ </ant>
+ </target>
+ <target name="checkSourceResolve">
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
+ <property name="name" value="excalibur-source-resolving.jar"/>
+ <property name="path" value="${excalibur-sourceresolve.jar}"/>
+ <property name="proj.home" value="${basedir}/../sourceresolve"/>
</ant>
</target>
<target name="checkTestcase">
1.143 +2 -0 jakarta-avalon-excalibur/all/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/build.xml,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- build.xml 19 Apr 2002 10:57:57 -0000 1.142
+++ build.xml 22 Apr 2002 09:47:10 -0000 1.143
@@ -44,6 +44,7 @@
<pathelement location="${excalibur-event.jar}"/>
<pathelement location="${excalibur-logger.jar}"/>
<pathelement location="${excalibur-datasource.jar}"/>
+ <pathelement location="${excalibur-sourceresolve.jar}"/>
<pathelement location="${j2ee.jar}"/>
<pathelement location="${bsf.jar}"/>
<pathelement location="${xerces.jar}"/>
@@ -152,6 +153,7 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkPool"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkLogger"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkDatasource"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkSourceResolve"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
<property name="name" value="xerces.jar"/>
<property name="path" value="${xerces.jar}"/>
1.7 +5 -0 jakarta-avalon-excalibur/all/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/default.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- default.properties 13 Apr 2002 08:30:05 -0000 1.6
+++ default.properties 22 Apr 2002 09:47:10 -0000 1.7
@@ -67,6 +67,11 @@
excalibur-fortress.lib=${excalibur-fortress.home}
excalibur-fortress.jar=${excalibur-fortress.lib}/excalibur-fortress-1.0.jar
+# ----- Excalibur Collections, version 1.0 or later -----
+excalibur-sourceresolve.home=${basedir}/../sourceresolve/dist
+excalibur-sourceresolve.lib=${excalibur-sourceresolve.home}
+excalibur-sourceresolve.jar=${excalibur-sourceresolve.lib}/excalibur-source-resolving-1.0.jar
+
# ----- Avalon Framework, version 4.1 or later -----
avalon-framework.home=${basedir}/../../jakarta-avalon
avalon-framework.lib=${avalon-framework.home}/build/lib
1.14 +0 -2 jakarta-avalon-excalibur/sourceresolve/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/sourceresolve/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 22 Apr 2002 09:24:45 -0000 1.13
+++ build.xml 22 Apr 2002 09:47:10 -0000 1.14
@@ -15,7 +15,6 @@
<pathelement location="${build.classes}"/>
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
- <pathelement location="${excalibur-core.jar}"/>
<pathelement location="${checkstyle.jar}"/>
</path>
@@ -40,7 +39,6 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkFramework"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkPool"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCore"/>
</target>
<target name="dependencies-test" depends="dist-jar, dependencies"
1.6 +0 -5 jakarta-avalon-excalibur/sourceresolve/default.properties
Index: default.properties
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/sourceresolve/default.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- default.properties 19 Apr 2002 13:15:22 -0000 1.5
+++ default.properties 22 Apr 2002 09:47:10 -0000 1.6
@@ -25,11 +25,6 @@
excalibur-pool.lib=${excalibur-pool.home}
excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.0.jar
-# ----- Excalibur Core -----
-excalibur-core.home=${basedir}/../all
-excalibur-core.lib=${excalibur-core.home}/build/lib
-excalibur-core.jar=${excalibur-core.lib}/excalibur-core.jar
-
# --------------------------------------------------
# Settings used to configure compile environment
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
