jefft 02/03/30 00:46:05
Modified: all ant.properties.sample build.xml
all/examples build.xml
cache ant.properties.sample build.xml
instrument-manager ant.properties.sample build.xml
Log:
- Rename 'framework.jar' property to 'avalon-framework.jar' for consistency
- Make all avalon-framework.jar variables point to
${avalon.home}/build/lib/avalon-framework.jar, not ${tools.dir}/lib/..
- Declare the dep on collections in instrument-manager
Revision Changes Path
1.8 +4 -0 jakarta-avalon-excalibur/all/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/ant.properties.sample,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ant.properties.sample 29 Mar 2002 09:41:41 -0000 1.7
+++ ant.properties.sample 30 Mar 2002 08:46:04 -0000 1.8
@@ -42,6 +42,10 @@
# REQUIRED LIBRARIES
# --------------------------------------------------
+# ----- Avalon Framework -----
+avalon-framework.home=${basedir}/../../jakarta-avalon/build/lib
+avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
+
# ----- Excalibur Instrument -----
excalibur-instrument.home=../instrument/build/lib
excalibur-instrument.jar=${excalibur-instrument.home}/excalibur-instrument-0.1.jar
1.121 +5 -4 jakarta-avalon-excalibur/all/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/build.xml,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- build.xml 29 Mar 2002 11:11:03 -0000 1.120
+++ build.xml 30 Mar 2002 08:46:04 -0000 1.121
@@ -79,7 +79,8 @@
<property name="dist.base" value="distributions"/>
<property name="j2ee.jar" value="${cjan.lib}/j2ee.jar"/>
- <property name="framework.jar"
value="${tools.dir}/ext/avalon-framework.jar"/>
+ <property name="avalon-framework.jar"
+
value="${basedir}/../../jakarta-avalon/build/lib/avalon-framework.jar"/>
<property name="excalibur-collections.jar"
value="../collections/build/lib/excalibur-collections-1.0.jar"/>
<property name="excalibur-concurrent.jar"
@@ -102,7 +103,7 @@
<property name="announce2site" value="${tools.dir}/announcement2site.xsl"/>
<path id="project.class.path">
- <pathelement location="${framework.jar}"/>
+ <pathelement location="${avalon-framework.jar}"/>
<pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-concurrent.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
@@ -653,7 +654,7 @@
<copy file="${build.lib}/${scratchpad.name}.jar"
tofile="${dist.dir}/${scratchpad.name}-${version}.jar"/>
<copy file="${logkit.jar}" todir="${dist.dir}"/>
- <copy file="${framework.jar}" todir="${dist.dir}"/>
+ <copy file="${avalon-framework.jar}" todir="${dist.dir}"/>
<mkdir dir="${dist.docs}"/>
<mkdir dir="${dist.javadocs}"/>
@@ -775,7 +776,7 @@
</copy>
<copy file="${logkit.jar}" todir="${src.dist.lib}"/>
- <copy file="${framework.jar}" todir="${src.dist.lib}"/>
+ <copy file="${avalon-framework.jar}" todir="${src.dist.lib}"/>
<copy todir="${src.dist.src}">
<fileset dir="${src.dir}"/>
1.6 +1 -1 jakarta-avalon-excalibur/all/examples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/examples/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 23 Mar 2002 13:04:25 -0000 1.5
+++ build.xml 30 Mar 2002 08:46:04 -0000 1.6
@@ -79,7 +79,7 @@
<!-- ===================================================================
-->
<target name="collect-tools-jars">
<!-- Try getting the jars from the tools/ext directory -->
- <copy file="${avalon.proj}/tools/ext/avalon-framework.jar"
+ <copy file="${avalon.proj}/build/lib/avalon-framework.jar"
todir="${commonlib.dir}" preservelastmodified="yes"/>
<copy file="${avalon.proj}/tools/ext/avalon-excalibur.jar"
todir="${commonlib.dir}" preservelastmodified="yes"/>
1.4 +2 -3 jakarta-avalon-excalibur/cache/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/cache/ant.properties.sample,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ant.properties.sample 24 Mar 2002 00:26:11 -0000 1.3
+++ ant.properties.sample 30 Mar 2002 08:46:04 -0000 1.4
@@ -9,14 +9,14 @@
# The ant.properties values in this directory apply only to this component,
and
# override the defaults in ../ant.properties.
#
-# $Id: ant.properties.sample,v 1.3 2002/03/24 00:26:11 jefft Exp $
+# $Id: ant.properties.sample,v 1.4 2002/03/30 08:46:04 jefft Exp $
#
-----------------------------------------------------------------------------
# --------------------------------------------------
# COMPONENT-SPECIFIC REQUIRED LIBRARIES
# --------------------------------------------------
# Avalon framework jar. Defaulted in build.xml
-framework.jar=${basedir}/../../jakarta-avalon/tools/ext/avalon-framework.jar
+avalon-framework.jar=${basedir}/../../jakarta-avalon/build/lib/avalon-framework.jar
# ----- Compile Control Flags -----
@@ -36,7 +36,6 @@
junit.home=${base.path}/junit3.7
junit.lib=${junit.home}
junit.jar=${junit.lib}/junit.jar
-
# --------------------------------------------------
1.13 +3 -3 jakarta-avalon-excalibur/cache/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/cache/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 30 Mar 2002 02:18:54 -0000 1.12
+++ build.xml 30 Mar 2002 08:46:04 -0000 1.13
@@ -14,8 +14,8 @@
<property file="${user.home}/.ant.properties"/>
<!-- Default property values -->
- <property name="framework.jar"
-
value="${basedir}/../../jakarta-avalon/tools/ext/avalon-framework.jar"/>
+ <property name="avalon-framework.jar"
+
value="${basedir}/../../jakarta-avalon/build/lib/avalon-framework.jar"/>
<!-- Settings used to configure compile environment -->
<property name="build.debug" value="on"/>
@@ -49,7 +49,7 @@
<!-- Classpath for product -->
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
- <pathelement location="${framework.jar}"/>
+ <pathelement location="${avalon-framework.jar}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
1.2 +6 -2
jakarta-avalon-excalibur/instrument-manager/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/instrument-manager/ant.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant.properties.sample 26 Mar 2002 11:56:15 -0000 1.1
+++ ant.properties.sample 30 Mar 2002 08:46:04 -0000 1.2
@@ -1,4 +1,4 @@
-#
-----------------------------------------------------------------------------
+#-----------------------------------------------------------------------------
# Component ant.properties.sample
#
# This is an example "ant.properties" file, used to customize the building of
@@ -9,7 +9,7 @@
# The ant.properties values in this directory apply only to this component,
and
# override the defaults in ../ant.properties.
#
-# $Id: ant.properties.sample,v 1.1 2002/03/26 11:56:15 leif Exp $
+# $Id: ant.properties.sample,v 1.2 2002/03/30 08:46:04 jefft Exp $
#
-----------------------------------------------------------------------------
# --------------------------------------------------
@@ -40,6 +40,10 @@
# ----- Avalon Excalibur -----
avalon-excalibur.home=../all/build/lib
avalon-excalibur.jar=${avalon-excalibur.home}/avalon-excalibur.jar
+
+# ----- Excalibur Collections -----
+excalibur-collections.home=../collections/build/lib
+excalibur-collections.jar=${excalibur-collections.home}/excalibur-collections-1.0.jar
# ----- Excalibur Instrument -----
excalibur-instrument.home=../instrument/build/lib
1.7 +1 -0 jakarta-avalon-excalibur/instrument-manager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 28 Mar 2002 06:08:45 -0000 1.6
+++ build.xml 30 Mar 2002 08:46:04 -0000 1.7
@@ -50,6 +50,7 @@
<pathelement location="${logkit.jar}"/>
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${avalon-excalibur.jar}"/>
+ <pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${commons-altrmi-common.jar}"/>
<pathelement location="${commons-altrmi-server-impl.jar}"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
