You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by bl...@apache.org on 2003/03/11 22:42:49 UTC
cvs commit: jakarta-gump/project avalon-cornerstone.xml avalon-excalibur.xml avalon-phoenix.xml avalon-sandbox.xml incubator-altrmi.xml jakarta-james.xml jakarta-jmeter.xml jakarta-turbine-fulcrum.xml
bloritsch 2003/03/11 13:42:49
Modified: project avalon-cornerstone.xml avalon-excalibur.xml
avalon-phoenix.xml avalon-sandbox.xml
incubator-altrmi.xml jakarta-james.xml
jakarta-jmeter.xml jakarta-turbine-fulcrum.xml
Log:
upgrade the gump descriptors to reflect changes in Excalibur
Revision Changes Path
1.5 +2 -2 jakarta-gump/project/avalon-cornerstone.xml
Index: avalon-cornerstone.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon-cornerstone.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- avalon-cornerstone.xml 21 Feb 2003 20:09:06 -0000 1.4
+++ avalon-cornerstone.xml 11 Mar 2003 21:42:48 -0000 1.5
@@ -27,7 +27,7 @@
<depend project="avalon" runtime="true"/>
<depend project="avalon-logkit" runtime="true"/>
<depend project="xml-xerces" id="parser" runtime="true"/>
- <depend project="excalibur-io" runtime="true"/>
+ <depend project="excalibur-compatibility" runtime="true"/>
<depend project="excalibur-datasource" runtime="true"/>
<depend project="excalibur-i18n" runtime="true"/>
<depend project="excalibur-thread" runtime="true"/>
@@ -37,7 +37,7 @@
<!-- buildtime dependencies -->
<depend project="junit"/>
- <depend project="excalibur-io"/>
+ <depend project="excalibur-compatibility"/>
<depend project="excalibur-datasource"/>
<depend project="excalibur-i18n"/>
<depend project="excalibur-thread"/>
1.11 +26 -28 jakarta-gump/project/avalon-excalibur.xml
Index: avalon-excalibur.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon-excalibur.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- avalon-excalibur.xml 8 Mar 2003 10:59:11 -0000 1.10
+++ avalon-excalibur.xml 11 Mar 2003 21:42:48 -0000 1.11
@@ -34,11 +34,10 @@
</ant>
<!-- 'internal deps'. Should be full list of all excalibur-* projects -->
- <depend project="excalibur-cli" runtime="true" inherit="jars"/>
<depend project="excalibur-component" runtime="true" inherit="jars"/>
- <depend project="excalibur-collections" runtime="true" inherit="jars"/>
<depend project="excalibur-configuration" runtime="true" inherit="jars"/>
- <depend project="excalibur-container" runtime="true" inherit="jars"/>
+ <depend project="excalibur-lifecycle" runtime="true" inherit="jars"/>
+ <depend project="excalibur-compatibility" runtime="true" inherit="jars"/>
<depend project="excalibur-datasource" runtime="true" inherit="jars"/>
<depend project="excalibur-event" runtime="true" inherit="jars"/>
<depend project="excalibur-extension" runtime="true" inherit="jars"/>
@@ -47,7 +46,6 @@
<depend project="excalibur-instrument" runtime="true" inherit="jars"/>
<depend project="excalibur-instrument-client" runtime="true" inherit="jars"/>
<depend project="excalibur-instrument-manager" runtime="true" inherit="jars"/>
- <depend project="excalibur-io" runtime="true" inherit="jars"/>
<depend project="excalibur-loader" runtime="true" inherit="jars"/>
<depend project="excalibur-logger" runtime="true" inherit="jars"/>
<depend project="excalibur-monitor" runtime="true" inherit="jars"/>
@@ -76,7 +74,7 @@
<!-- runtime dependencies -->
<depend project="avalon" runtime="true"/>
- <depend project="excalibur-concurrent" runtime="true"/>
+ <depend project="excalibur-compatibility" runtime="true"/>
<!-- this should go -->
<depend project="excalibur-altrmi-0.9.2" inherit="runtime" runtime="true"/>
@@ -127,7 +125,7 @@
<nag from="Gump Integration Build <dev@avalon.apache.org>"
to="dev@avalon.apache.org"/>
</project>
-
+ <!--
<project name="excalibur-cli">
<package>org.apache.avalon.excalibur.cli</package>
@@ -150,8 +148,9 @@
<nag from="Gump Integration Build <dev@avalon.apache.org>"
to="dev@avalon.apache.org"/>
- </project>
-
+</project>
+-->
+ <!--
<project name="excalibur-collections">
<package>org.apache.avalon.excalibur.collections</package>
@@ -175,15 +174,15 @@
<nag from="Gump Integration Build <dev@avalon.apache.org>"
to="dev@avalon.apache.org"/>
</project>
-
+ -->
<project name="excalibur-component">
<package>org.apache.avalon.excalibur.component</package>
<ant basedir="component">
<depend property="excalibur-pool.jar" project="excalibur-pool"/>
<depend property="excalibur-logger.jar" project="excalibur-logger"/>
- <depend property="excalibur-event.jar" project="excalibur-event"/>
- <depend property="excalibur-collections.jar" project="excalibur-collections"/>
+ <depend property="excalibur-event.jar" project="excalibur-event"/>
+ <depend property="commons-collections" project=""/>
<depend property="excalibur-instrument.jar" project="excalibur-instrument"/>
<depend property="excalibur-instrument-manager.jar" project="excalibur-instrument-manager"/>
<depend property="excalibur-instrument-manager-interfaces.jar" project="excalibur-instrument-manager"/>
@@ -198,7 +197,6 @@
<option project="checkstyle" inherit="runtime"/>
<depend project="junit"/>
<depend project="avalon" runtime="true"/>
- <depend project="excalibur-container" runtime="true"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<work nested="component/build/classes"/>
@@ -209,7 +207,7 @@
<nag from="Gump Integration Build <dev@avalon.apache.org>"
to="dev@avalon.apache.org"/>
</project>
-
+ <!--
<project name="excalibur-concurrent">
<package>org.apache.avalon.excalibur.concurrent</package>
@@ -233,7 +231,7 @@
<nag from="Gump Integration Build <dev@avalon.apache.org>"
to="dev@avalon.apache.org"/>
</project>
-
+ -->
<project name="excalibur-configuration">
<package>org.apache.excalibur.configuration</package>
@@ -261,10 +259,10 @@
to="dev@avalon.apache.org"/>
</project>
- <project name="excalibur-container">
- <package>org.apache.excalibur.container</package>
+ <project name="excalibur-lifecycle">
+ <package>org.apache.avalon.lifecycle</package>
- <ant basedir="container">
+ <ant basedir="lifecycle">
<property name="version" value="@@DATE@@"/>
<property name="junit.failonerror" value="true"/>
<property name="do.checkstyle" value="false"/>
@@ -278,7 +276,7 @@
<work nested="container/build/classes"/>
<home nested="container"/>
- <jar name="build/lib/excalibur-container-@@DATE@@.jar"/>
+ <jar name="build/lib/excalibur-lifecycle-@@DATE@@.jar"/>
<nag from="Stephen McConnell <mcconnell@apache.org>"
to="dev@avalon.apache.org"/>
@@ -388,7 +386,7 @@
<depend project="excalibur-instrument-manager"/>
<depend project="commons-collections" runtime="true"/>
<depend project="concurrent" runtime="true"/>
- <depend project="excalibur-container" runtime="true"/>
+ <depend project="excalibur-lifecycle" runtime="true"/>
<depend project="excalibur-event" runtime="true"/>
<depend project="excalibur-logger" runtime="true"/>
<depend project="excalibur-sourceresolve" runtime="true"/>
@@ -412,11 +410,11 @@
<ant basedir="fortress/examples" target="jar">
<property name="version" value="@@DATE@@"/>
<property name="excalibur-fortress.jar" project="excalibur-fortress" reference="jarpath"/>
- <property name="excalibur-container.jar" project="excalibur-container" reference="jarpath"/>
+ <property name="excalibur-lifecycle.jar" project="excalibur-lifecycle" reference="jarpath"/>
</ant>
<depend project="excalibur-fortress" inherit="all" runtime="true"/>
- <depend project="excalibur-container" runtime="true"/>
+ <depend project="excalibur-lifecycle" runtime="true"/>
<!-- for the servlet examples -->
<depend project="jakarta-servletapi"/>
@@ -563,10 +561,10 @@
to="dev@avalon.apache.org"/>
</project>
- <project name="excalibur-io">
- <package>org.apache.avalon.excalibur.io</package>
+ <project name="excalibur-compatibility">
+ <package>org.apache.avalon.excalibur</package>
- <ant basedir="io">
+ <ant basedir="compatibility">
<property name="package-version" value="@@DATE@@"/>
<property name="junit.failonerror" value="true"/>
<property name="do.checkstyle" value="true"/>
@@ -578,10 +576,10 @@
<depend project="junit"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
- <work nested="io/build/classes"/>
+ <work nested="compatibility/build/classes"/>
- <home nested="io"/>
- <jar name="build/lib/excalibur-io-@@DATE@@.jar"/>
+ <home nested="compatibility"/>
+ <jar name="build/lib/excalibur-compatibility-@@DATE@@.jar"/>
<nag from="Gump Integration Build <dev@avalon.apache.org>"
to="dev@avalon.apache.org"/>
@@ -818,7 +816,7 @@
<package>org.apache.avalon.excalibur.thread</package>
<ant basedir="thread">
- <depend property="commons-collections.jar" project="commons-collections" runtime="true"/>
+ <depend project="commons-collections" runtime="true"/>
<depend property="excalibur-pool.jar" project="excalibur-pool" runtime="true"/>
<depend property="excalibur-threadcontext.jar" project="excalibur-threadcontext" runtime="true"/>
<depend property="excalibur-instrument.jar" project="excalibur-instrument" runtime="true"/>
1.13 +2 -2 jakarta-gump/project/avalon-phoenix.xml
Index: avalon-phoenix.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon-phoenix.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- avalon-phoenix.xml 2 Mar 2003 14:49:52 -0000 1.12
+++ avalon-phoenix.xml 11 Mar 2003 21:42:48 -0000 1.13
@@ -28,8 +28,8 @@
<depend property="framework.jar" project="avalon" runtime="true"/>
<depend project="bsf" runtime="true"/>
<depend project="excalibur-configuration" runtime="true"/>
- <depend project="excalibur-io" runtime="true"/>
- <depend project="excalibur-cli" runtime="true"/>
+ <depend project="excalibur-compatibility" runtime="true"/>
+ <!-- <depend project="excalibur-cli" runtime="true"/> -->
<depend project="excalibur-extension" runtime="true"/>
<depend project="excalibur-threadcontext" runtime="true"/>
<depend project="excalibur-loader" runtime="true"/>
1.21 +2 -2 jakarta-gump/project/avalon-sandbox.xml
Index: avalon-sandbox.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon-sandbox.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- avalon-sandbox.xml 1 Mar 2003 10:45:26 -0000 1.20
+++ avalon-sandbox.xml 11 Mar 2003 21:42:48 -0000 1.21
@@ -27,7 +27,7 @@
<depend project="excalibur-logger" runtime="true"/>
<depend project="excalibur-extension" runtime="true"/>
<depend project="excalibur-event" runtime="true"/>
- <depend project="excalibur-collections" runtime="true"/>
+ <depend project="excalibur-compatibility" runtime="true"/>
<depend project="excalibur-thread" runtime="true"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
@@ -87,7 +87,7 @@
<depend project="excalibur-logger" runtime="true"/>
<depend project="excalibur-extension" runtime="true"/>
<depend project="excalibur-event" runtime="true"/>
- <depend project="excalibur-collections" runtime="true"/>
+ <depend project="excalibur-compatibility" runtime="true"/>
<depend project="excalibur-thread" runtime="true"/>
<depend project="excalibur-threadcontext" runtime="true"/>
<depend project="excalibur-pool" runtime="true"/>
1.10 +1 -1 jakarta-gump/project/incubator-altrmi.xml
Index: incubator-altrmi.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/incubator-altrmi.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- incubator-altrmi.xml 1 Mar 2003 10:46:58 -0000 1.9
+++ incubator-altrmi.xml 11 Mar 2003 21:42:48 -0000 1.10
@@ -26,7 +26,7 @@
<depend project="xml-xalan2"/>
<depend project="jakarta-bcel"/>
<depend project="commons-attributes" inherit="runtime"/>
- <depend project="excalibur-container"/>
+ <depend project="excalibur-lifecycle"/>
<depend project="avalon-cornerstone"/>
<depend project="avalon-phoenix"/>
<!-- inserting the dependencies of phoenix-metagenerate.jar by hand here
1.27 +4 -4 jakarta-gump/project/jakarta-james.xml
Index: jakarta-james.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jakarta-james.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jakarta-james.xml 4 Mar 2003 13:13:35 -0000 1.26
+++ jakarta-james.xml 11 Mar 2003 21:42:48 -0000 1.27
@@ -17,10 +17,10 @@
<depend project="javamail" />
<depend project="avalon" />
<depend project="avalon-cornerstone" />
- <depend project="excalibur-io"/>
- <depend project="excalibur-cli"/>
- <depend project="excalibur-concurrent"/>
- <depend project="excalibur-collections"/>
+ <depend project="excalibur-compatibility"/>
+ <!-- <depend project="excalibur-cli"/> -->
+ <!-- <depend project="excalibur-concurrent"/> -->
+ <!-- <depend project="excalibur-collections"/> -->
<depend project="excalibur-datasource"/>
<depend project="excalibur-extension"/>
<depend project="excalibur-pool"/>
1.25 +1 -1 jakarta-gump/project/jakarta-jmeter.xml
Index: jakarta-jmeter.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jakarta-jmeter.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jakarta-jmeter.xml 25 Feb 2003 01:20:34 -0000 1.24
+++ jakarta-jmeter.xml 11 Mar 2003 21:42:48 -0000 1.25
@@ -29,7 +29,7 @@
<depend project="javamail" />
<depend project="jsse" />
<depend project="jtidy" />
- <depend project="excalibur-cli" />
+ <depend project="excalibur-compatibility" />
<depend project="rhino" />
<work nested="build/core"/>
1.37 +1 -1 jakarta-gump/project/jakarta-turbine-fulcrum.xml
Index: jakarta-turbine-fulcrum.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jakarta-turbine-fulcrum.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jakarta-turbine-fulcrum.xml 19 Feb 2003 13:05:57 -0000 1.36
+++ jakarta-turbine-fulcrum.xml 11 Mar 2003 21:42:48 -0000 1.37
@@ -38,7 +38,7 @@
</depend>
<depend project="dom4j">
</depend>
- <depend project="excalibur-collections">
+ <depend project="excalibur-compatibility">
</depend>
<depend project="excalibur-component">
</depend>