leosimons 2003/06/14 09:19:47
Modified: project avalon-excalibur.xml jakarta-jmeter.xml
incubator-altrmi.xml avalon-sandbox.xml
jelly-tags.xml avalon-cornerstone.xml db-ojb.xml
jakarta-turbine-2.xml xml-fop-maintenance.xml
avalon-logkit.xml avalon.xml
jakarta-turbine-fulcrum.xml avalon-phoenix.xml
xml-fop.xml jakarta-james.xml
profile gump.xml
Log:
avalon is experimenting with a maven-based build
system. This system includes autogeneration of
gump descriptors from maven project.xml files.
Along with this move also come various cvs
restructurings.
It's not quite possible to cleanly update all
gump descriptors for me, since we go from one
avalon-framework jar to multiple. In
particular, Cocoon needs to update its
references.
'ant gen' now works for me, and there's a
reasonable chance the build will go through
properly, but I'm not sure...... 8-)
Revision Changes Path
1.62 +27 -132 jakarta-gump/project/avalon-excalibur.xml
Index: avalon-excalibur.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon-excalibur.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- avalon-excalibur.xml 13 Jun 2003 12:45:37 -0000 1.61
+++ avalon-excalibur.xml 14 Jun 2003 16:19:45 -0000 1.62
@@ -51,7 +51,6 @@
<package>org.apache.excalibur</package>
<package>org.apache.avalon.excalibur</package>
- <package>org.apache.avalon.fortress</package>
<ant target="dist">
<depend property="logkit.jar" project="avalon-logkit" runtime="true"/>
@@ -70,7 +69,6 @@
<depend project="excalibur-datasource" runtime="true" inherit="jars"/>
<depend project="excalibur-event" runtime="true" inherit="jars"/>
<depend project="excalibur-extension" runtime="true" inherit="jars"/>
- <depend project="excalibur-fortress" runtime="true" inherit="jars"/>
<depend project="excalibur-i18n" runtime="true" inherit="jars"/>
<depend project="excalibur-instrument" runtime="true" inherit="jars"/>
<depend project="excalibur-instrument-client" runtime="true"
inherit="jars"/>
@@ -98,7 +96,7 @@
<depend project="xml-xalan2"/>
<!-- runtime dependencies -->
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="excalibur-compatibility" runtime="true"/>
@@ -188,13 +186,13 @@
<ant basedir="component">
<!-- runtime dependencies -->
- <depend property="avalon-framework.jar" project="avalon"
runtime="true"/>
+ <depend property="avalon-framework.jar" project="avalon-framework"
runtime="true" id="combined"/>
<depend property="commons-collections.jar"
project="commons-collections" runtime="true"/>
<depend property="excalibur-instrument.jar"
project="excalibur-instrument" runtime="true"/>
<depend property="excalibur-instrument-manager.jar"
- project="excalibur-instrument-manager"
+ project="excalibur-instrument-manager"
runtime="true" id="main"/>
- <depend property="excalibur-instrument-manager-interfaces.jar"
+ <depend property="excalibur-instrument-manager-interfaces.jar"
project="excalibur-instrument-manager"
runtime="true"
id="interfaces"/>
@@ -241,7 +239,7 @@
<ant basedir="configuration">
<!-- runtime dependencies -->
- <depend property="avalon-framework.jar" project="avalon"
runtime="true"/>
+ <depend property="avalon-framework.jar" project="avalon-framework"
runtime="true" id="combined"/>
<depend property="isorelax.jar" project="iso-relax" runtime="true"/>
<depend property="jing.jar" project="jing" runtime="true"/>
@@ -285,7 +283,7 @@
<depend property="excalibur-logger.jar" project="excalibur-logger"/>
<depend property="excalibur-component.jar"
project="excalibur-component" id="component"/>
<depend property="excalibur-testcase.jar" project="excalibur-component"
id="testcase"/>
- <depend property="excalibur-fortress-tools.jar"
project="excalibur-fortress" id="fortress-tools"/>
+ <depend property="excalibur-fortress-tools.jar"
project="avalon-fortress-tools"/>
<depend property="logkit.jar" project="avalon-logkit"/>
<property name="version" value="@@DATE@@"/>
<property name="junit.failonerror" value="true"/>
@@ -297,7 +295,7 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<work nested="datasource/build/classes"/>
@@ -314,7 +312,7 @@
<ant basedir="event">
<!-- runtime dependencies -->
- <depend property="avalon-framework.jar" project="avalon"
runtime="true"/>
+ <depend property="avalon-framework.jar" project="avalon-framework"
runtime="true" id="combined"/>
<depend property="commons-collections.jar"
project="commons-collections" runtime="true"/>
<depend property="util.concurrent.jar" project="concurrent"
runtime="true"/>
@@ -387,109 +385,6 @@
to="[EMAIL PROTECTED]"/>
</project>
- <project name="excalibur-fortress">
- <package>org.apache.avalon.fortress</package>
-
- <mkdir dir="fortress/build/classes"/>
-
- <ant basedir="fortress">
- <!-- runtime dependencies -->
- <depend property="avalon-framework.jar" project="avalon"
runtime="true"/>
- <depend property="logkit.jar" project="avalon-logkit" runtime="true"/>
- <depend property="commons-collections.jar"
project="commons-collections" runtime="true"/>
- <depend property="excalibur-event.jar" project="excalibur-event"
runtime="true"/>
- <depend property="excalibur-instrument.jar"
project="excalibur-instrument" runtime="true"/>
- <depend property="excalibur-i18n.jar" project="excalibur-i18n"
runtime="true"/>
- <depend property="excalibur-instrument-manager.jar"
- project="excalibur-instrument-manager"
- runtime="true" id="main"/>
- <depend property="excalibur-instrument-manager-interfaces.jar"
- project="excalibur-instrument-manager"
- runtime="true" id="interfaces"/>
- <depend property="excalibur-lifecycle.jar"
project="excalibur-lifecycle" runtime="true"/>
- <depend property="excalibur-logger.jar" project="excalibur-logger"
runtime="true"/>
- <depend property="excalibur-sourceresolve.jar"
project="excalibur-sourceresolve" runtime="true"/>
- <depend property="logkit.jar" project="avalon-logkit" runtime="true"/>
- <depend property="util.concurrent.jar" project="concurrent"
runtime="true"/>
-
- <!-- tool dependencies -->
- <depend property="qdox.jar" project="phoenix-qdox"/>
-
- <!-- test-time dependencies -->
- <depend property="junit.jar" project="junit"/>
-<!-- <depend property="altrmi-common.jar" project="incubator-altrmi"
id="common"/>
- <depend property="altrmi-client-interfaces.jar"
project="incubator-altrmi" id="client-api"/>
- <depend property="altrmi-client-impl.jar" project="incubator-altrmi"
id="client-impl"/>
- <depend property="altrmi-server-interfaces.jar"
project="incubator-altrmi" id="server-api"/>
- <depend property="altrmi-server-impl.jar" project="incubator-altrmi"
id="server-impl"/>-->
- <depend property="altrmi-common.jar" project="excalibur-altrmi-0.9.2"
id="common"/>
- <depend property="altrmi-client-interfaces.jar"
project="excalibur-altrmi-0.9.2" id="client-api"/>
- <depend property="altrmi-client-impl.jar"
project="excalibur-altrmi-0.9.2" id="client-impl"/>
- <depend property="altrmi-server-interfaces.jar"
project="excalibur-altrmi-0.9.2" id="server-api"/>
- <depend property="altrmi-server-impl.jar"
project="excalibur-altrmi-0.9.2" id="server-impl"/>
- <depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
-
- <!-- optional dependencies -->
- <property name="bcel.jar" project="jakarta-bcel" reference="jarpath"/>
- <property name="checkstyle.jar" project="checkstyle"
reference="jarpath"/>
-
- <property name="version" value="@@DATE@@"/>
- <property name="junit.failonerror" value="true"/>
- <property name="do.checkstyle" value="true"/>
- <property name="skip.dependencies" value="true"/>
- </ant>
-
- <!-- build-time dependencies -->
- <depend project="ant" inherit="runtime"/>
- <depend project="xml-xerces"/>
-
- <!-- optional dependencies -->
- <option project="checkstyle" inherit="runtime"/>
- <option project="jakarta-bcel" inherit="runtime" runtime="true"/>
-
- <work nested="fortress/build/classes"/>
- <work nested="fortress/build/testclasses"/>
- <work nested="fortress/build/tools"/>
-
- <home nested="fortress"/>
- <jar name="build/lib/excalibur-fortress-complete-@@DATE@@.jar"
id="fortress"/>
- <jar name="build/lib/excalibur-fortress-tools-@@DATE@@.jar"
id="fortress-tools"/>
-
- <nag from="Gump Integration Build <[EMAIL PROTECTED]>"
- to="[EMAIL PROTECTED]"/>
- </project>
-
- <project name="excalibur-fortress-examples">
- <package>org.apache.excalibur.fortress.examples</package>
-
- <ant basedir="fortress/examples">
- <!-- runtime dependencies -->
- <property name="excalibur-fortress.jar" project="excalibur-fortress"
reference="jarpath" id="fortress"/>
- <property name="excalibur-fortress-tools.jar"
project="excalibur-fortress" reference="jarpath" id="fortress-tools"/>
- <depend property="commons-collections.jar"
project="commons-collections" runtime="true"/>
- <depend property="excalibur-lifecycle.jar"
project="excalibur-lifecycle" runtime="true"/>
- <depend property="util.concurrent.jar" project="concurrent"
runtime="true"/>
-
- <property name="version" value="@@DATE@@"/>
- </ant>
-
- <!-- runtime dependencies -->
- <depend project="excalibur-fortress" inherit="all" runtime="true"/>
- <!-- for the servlet examples -->
- <depend project="jakarta-servletapi"/>
-
- <!-- build-time dependencies -->
- <depend project="ant" inherit="runtime"/>
-
- <work nested="fortress/examples/build/classes"/>
-
- <home nested="fortress/examples"/>
- <jar name="build/lib/excalibur-fortress-examples-@@DATE@@.jar"/>
-
- <nag from="Gump Integration Build <[EMAIL PROTECTED]>"
- to="[EMAIL PROTECTED]"/>
- </project>
-
<project name="excalibur-i18n">
<package>org.apache.avalon.excalibur.i18n</package>
@@ -529,7 +424,7 @@
<ant basedir="instrument">
<!-- optional dependencies -->
- <property name="avalon-framework.jar" project="avalon"
reference="jarpath"/>
+ <property name="avalon-framework.jar" project="avalon-framework"
reference="jarpath" id="combined"/>
<property name="checkstyle.jar" project="checkstyle"
reference="jarpath"/>
<!-- test-time dependencies -->
@@ -547,7 +442,7 @@
<depend project="xml-xalan2"/>
<!-- optional dependencies -->
- <option project="avalon" runtime="true"/>
+ <option project="avalon-framework" runtime="true" id="combined"/>
<option project="checkstyle" inherit="runtime"/>
<work nested="instrument/build/classes"/>
@@ -569,7 +464,7 @@
<ant basedir="instrument-manager">
<!-- runtime dependencies -->
- <depend property="avalon-framework.jar" project="avalon"
runtime="true"/>
+ <depend property="avalon-framework.jar" project="avalon-framework"
runtime="true" id="combined"/>
<depend property="excalibur-instrument.jar"
project="excalibur-instrument" runtime="true"/>
<!-- optional dependencies -->
@@ -661,8 +556,8 @@
<depend property="altrmi-client-impl.jar"
project="excalibur-altrmi-0.9.2" id="client-impl"/>
<depend property="altrmi-server-interfaces.jar"
project="excalibur-altrmi-0.9.2" id="server-api"/>
<depend property="altrmi-server-impl.jar"
project="excalibur-altrmi-0.9.2" id="server-impl"/>
- <depend property="avalon-framework.jar" project="avalon"
runtime="true"/>
- <depend property="excalibur-instrument-manager.jar"
+ <depend property="avalon-framework.jar" project="avalon-framework"
runtime="true" id="combined"/>
+ <depend property="excalibur-instrument-manager.jar"
project="excalibur-instrument-manager"
runtime="true" id="main"/>
@@ -681,7 +576,7 @@
<depend project="xml-xalan2"/>
<!-- optional dependencies -->
- <option project="avalon" runtime="true"/>
+ <option project="avalon-framework" runtime="true" id="combined"/>
<option project="checkstyle" inherit="runtime"/>
<work nested="instrument-client/build/classes"/>
@@ -698,7 +593,7 @@
<ant basedir="lifecycle">
<!-- runtime dependencies -->
- <depend property="avalon-framework.jar" project="avalon"
runtime="true"/>
+ <depend property="avalon-framework.jar" project="avalon-framework"
runtime="true" id="combined"/>
<!-- test-time dependencies -->
<depend property="junit.jar" project="junit"/>
@@ -745,7 +640,7 @@
<depend project="excalibur-i18n" inherit="runtime" runtime="true"/>
<option project="checkstyle" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="jakarta-log4j" runtime="true"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
@@ -786,7 +681,7 @@
<property name="junit.failonerror" value="true"/>
<property name="do.checkstyle" value="false"/>
<property name="skip.dependencies" value="true"/>
- <depend property="excalibur-fortress-tools.jar"
project="excalibur-fortress" id="fortress-tools"/>
+ <depend property="excalibur-fortress-tools.jar"
project="avalon-fortress-tools"/>
<depend property="qdox.jar" project="phoenix-qdox"/>
</ant>
@@ -800,7 +695,7 @@
to="[EMAIL PROTECTED]"/>
<depend project="ant" inherit="runtime"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="excalibur-pool" inherit="runtime"/>
<depend project="excalibur-meta-sourceresolve" inherit="runtime"/>
<depend project="xml-xerces"/>
@@ -833,7 +728,7 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
<depend project="concurrent"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
@@ -872,7 +767,7 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<depend project="jakarta-regexp"/>
@@ -891,7 +786,7 @@
<package>org.apache.excalibur.source</package>
<ant basedir="sourceresolve">
- <depend property="excalibur-fortress-tools.jar"
project="excalibur-fortress" id="fortress-tools"/>
+ <depend property="excalibur-fortress-tools.jar"
project="avalon-fortress-tools"/>
<depend property="qdox.jar" project="phoenix-qdox"/>
<depend property="excalibur-pool.jar" project="excalibur-pool"
runtime="true"/>
<property name="package-version" value="@@DATE@@"/>
@@ -903,7 +798,7 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
@@ -921,7 +816,7 @@
<package>org.apache.excalibur.store</package>
<ant basedir="store">
- <depend property="excalibur-fortress-tools.jar"
project="excalibur-fortress" id="fortress-tools"/>
+ <depend property="excalibur-fortress-tools.jar"
project="avalon-fortress-tools"/>
<depend property="qdox.jar" project="phoenix-qdox"/>
<property name="version" value="@@DATE@@"/>
<property name="junit.failonerror" value="true"/>
@@ -932,7 +827,7 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<depend project="jisp"/>
@@ -964,7 +859,7 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
@@ -1004,7 +899,7 @@
<depend property="saxpath.jar" project="saxpath"/>
<depend property="jtidy.jar" project="jtidy"/>
<depend property="resolver.jar" project="xml-commons-resolver"/>
- <depend property="excalibur-fortress-tools.jar"
project="excalibur-fortress" id="fortress-tools"/>
+ <depend property="excalibur-fortress-tools.jar"
project="avalon-fortress-tools"/>
<depend property="qdox.jar" project="phoenix-qdox"/>
@@ -1018,7 +913,7 @@
<option project="checkstyle" inherit="runtime"/>
<option project="jaxen" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<work nested="xmlutil/build/classes"/>
1.32 +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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jakarta-jmeter.xml 11 Jun 2003 10:04:44 -0000 1.31
+++ jakarta-jmeter.xml 14 Jun 2003 16:19:46 -0000 1.32
@@ -13,7 +13,7 @@
<ant target="dist">
<property name="version" value="@@DATE@@"/>
- <depend property="avalon-framework.jar" project="avalon"/>
+ <depend property="avalon-framework.jar" project="avalon-framework"
id="combined"/>
<depend property="jakarta-oro.jar" project="jakarta-oro"/>
<depend property="junit.jar" project="junit"/>
<depend property="logkit.jar" project="avalon-logkit"/>
1.18 +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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- incubator-altrmi.xml 15 May 2003 13:54:41 -0000 1.17
+++ incubator-altrmi.xml 14 Jun 2003 16:19:46 -0000 1.18
@@ -21,7 +21,7 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<depend project="jakarta-bcel"/>
1.26 +1 -1 jakarta-gump/project/avalon-sandbox.xml
Index: avalon-sandbox.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon-sandbox.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- avalon-sandbox.xml 14 Apr 2003 10:59:01 -0000 1.25
+++ avalon-sandbox.xml 14 Jun 2003 16:19:46 -0000 1.26
@@ -20,7 +20,7 @@
<depend project="ant" inherit="runtime"/>
<option project="checkstyle" inherit="runtime"/>
<depend project="junit"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<work nested="cache/build/classes"/>
1.51 +1 -1 jakarta-gump/project/jelly-tags.xml
Index: jelly-tags.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jelly-tags.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- jelly-tags.xml 19 Feb 2003 13:05:57 -0000 1.50
+++ jelly-tags.xml 14 Jun 2003 16:19:46 -0000 1.51
@@ -61,7 +61,7 @@
<depend project="commons-jelly" inherit="all"/>
<depend project="commons-cli"/>
- <depend project="avalon"/>
+ <depend project="avalon-framework" id="combined"/>
<work nested="avalon/target/classes"/>
<work nested="avalon/target/test-classes"/>
1.10 +1 -1 jakarta-gump/project/avalon-cornerstone.xml
Index: avalon-cornerstone.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon-cornerstone.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- avalon-cornerstone.xml 18 Apr 2003 11:48:10 -0000 1.9
+++ avalon-cornerstone.xml 14 Jun 2003 16:19:46 -0000 1.10
@@ -19,7 +19,7 @@
<ant />
<!-- runtime dependencies -->
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="avalon-logkit" runtime="true"/>
<depend project="xml-xerces" id="parser" runtime="true"/>
<depend project="excalibur-compatibility" runtime="true"/>
1.10 +2 -2 jakarta-gump/project/db-ojb.xml
Index: db-ojb.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/db-ojb.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- db-ojb.xml 17 Mar 2003 01:54:11 -0000 1.9
+++ db-ojb.xml 14 Jun 2003 16:19:46 -0000 1.10
@@ -25,7 +25,7 @@
<depend project="hsqldb"/>
<depend project="j2ee-connector" />
<depend project="jaas" />
- <depend project="avalon"/>
+ <depend project="avalon-framework" id="combined"/>
<depend project="jakarta-velocity"/>
<depend project="excalibur-component"/>
<depend project="avalon-logkit"/>
@@ -78,7 +78,7 @@
<depend project="hsqldb"/>
<depend project="j2ee-connector" />
<depend project="jaas" />
- <depend project="avalon"/>
+ <depend project="avalon-framework" id="combined"/>
<depend project="jakarta-velocity"/>
<depend project="excalibur-component"/>
<depend project="avalon-logkit"/>
1.28 +7 -7 jakarta-gump/project/jakarta-turbine-2.xml
Index: jakarta-turbine-2.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jakarta-turbine-2.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jakarta-turbine-2.xml 12 Mar 2003 14:03:00 -0000 1.27
+++ jakarta-turbine-2.xml 14 Jun 2003 16:19:46 -0000 1.28
@@ -3,30 +3,30 @@
<description>A servlet based framework.</description>
<url href="http://jakarta.apache.org/turbine/turbine-2/"/>
-
+
<cvs repository="jakarta"/>
-
+
<!-- This is really the cvs module. We need to change this but -->
<!-- I will leave this for now until everything works. -->
-
+
<project name="jakarta-turbine-2">
-
+
<mkdir dir="target"/>
<!-- Standard Maven target to produce Javadocs, source -->
<!-- and binary distributions. -->
-
+
<ant buildfile="build-gump.xml" target="jar">
<property name="maven.build.dest" value="build"/>
<property name="maven.build.dir" value="target"/>
<property name="maven.final.name" value="turbine-@@DATE@@"/>
</ant>
-
+
<!-- All Maven projects need Ant and Xerces to build. -->
<depend project="ant"/>
<depend project="xml-xerces"/>
- <depend project="avalon"/>
+ <depend project="avalon-framework" id="combined"/>
<depend project="cryptix"/>
<depend project="commons-codec"/>
<depend project="commons-collections"/>
1.4 +1 -1 jakarta-gump/project/xml-fop-maintenance.xml
Index: xml-fop-maintenance.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/xml-fop-maintenance.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xml-fop-maintenance.xml 4 May 2003 04:40:30 -0000 1.3
+++ xml-fop-maintenance.xml 14 Jun 2003 16:19:46 -0000 1.4
@@ -18,7 +18,7 @@
<depend project="xml-xalan2"/>
<depend project="ant" inherit="runtime"/>
<depend project="xml-batik"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<!-- for SerializeHyphPattern task -->
<work nested="build/classes"/>
1.10 +1 -1 jakarta-gump/project/avalon-logkit.xml
Index: avalon-logkit.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon-logkit.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- avalon-logkit.xml 20 May 2003 16:49:41 -0000 1.9
+++ avalon-logkit.xml 14 Jun 2003 16:19:46 -0000 1.10
@@ -41,7 +41,7 @@
reference="srcdir" />
</ant>
<depend project="avalon-logkit" inherit="all"/>
- <depend project="avalon"/>
+ <depend project="avalon-framework" id="combined"/>
<home nested="build/lib"/>
<jar name="logkit.jar"/>
1.8 +42 -8 jakarta-gump/project/avalon.xml
Index: avalon.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- avalon.xml 20 May 2003 16:49:41 -0000 1.7
+++ avalon.xml 14 Jun 2003 16:19:46 -0000 1.8
@@ -2,12 +2,46 @@
<url href="http://avalon.apache.org/"/>
<description>
- Avalon framework
+ This is a deprecated descriptor! Avalon is moving towards
+ auto-generation of descriptors based on maven project.xml
+ files.
</description>
<cvs repository="avalon"/>
<project name="avalon">
+ <!-- deprecated! -->
+
+ <!-- can't just reference the new avalon-framework project here
+ because we go from 1 to multiple jars. This is a copied
+ descriptor. -->
+
+ <package>org.apache.avalon</package>
+ <ant target="dist" basedir="framework">
+ <property name="project.version" value="@@DATE@@"></property>
+ </ant>
+
+ <depend inherit="runtime" project="ant"></depend>
+ <depend project="xml-xalan2"></depend>
+ <depend project="xml-xerces"></depend>
+
+ <depend runtime="true" project="junit"></depend>
+ <depend runtime="true" project="jakarta-log4j"></depend>
+ <depend runtime="true" project="avalon-logkit"></depend>
+
+ <work nested="framework/target/classes"></work>
+ <work nested="framework/target/api-classes"></work>
+ <work nested="framework/target/impl-classes"></work>
+ <work nested="framework/target/test-classes"></work>
+
+ <home nested="framework"></home>
+ <jar name="target/avalon-framework-@@DATE@@.jar" id="combined"></jar>
+ <javadoc nested="framework/target/docs/apidocs"></javadoc>
+
+ <nag to="[EMAIL PROTECTED]" from="Gump Integration Build <[EMAIL
PROTECTED]>"></nag>
+ </project>
+
+ <!--<project name="avalon">
<package>org.apache.avalon.framework</package>
<ant>
@@ -15,7 +49,7 @@
<depend property="junit.jar" project="junit"/>
</ant>
<depend project="ant" inherit="runtime"/>
- <!-- not for jar generation <depend project="xml-xalan2"/>-->
+ not for jar generation <depend project="xml-xalan2"/>
<option project="jakarta-log4j"/>
<option project="avalon-logkit"/>
<option project="commons-logging"/>
@@ -36,7 +70,7 @@
<depend property="junit.jar" project="junit"/>
</ant>
- <depend project="avalon" inherit="all"/>
+ <depend project="avalon-framework" inherit="all"/>
<work nested="target/classes"/>
@@ -55,19 +89,19 @@
path="build/dist/shbat/"/>
</ant>
<depend project="ant" inherit="runtime"/>
- <!--uses forrest now <depend project="xml-cocoon2"/>-->
+ uses forrest now <depend project="xml-cocoon2"/>
<depend project="xml-forrest" inherit="runtime"/>
- <depend project="avalon"/>
+ <depend project="avalon-framework"/>
<depend project="dist-avalon-logkit"/>
<depend project="xml-xalan2"/>
- <!-- not anymore <depend project="xml-batik"/>
+ not anymore <depend project="xml-batik"/>
<depend project="xml-fop"/>
<depend project="bsf"/>
<depend project="rhino"/>
<depend project="avalon-excalibur"/>
<depend project="avalon-site"/>
- <depend project="resolver"/>-->
+ <depend project="resolver"/>
<license name="LICENSE.txt"/>
- </project>
+ </project>-->
</module>
1.38 +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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jakarta-turbine-fulcrum.xml 11 Mar 2003 21:42:48 -0000 1.37
+++ jakarta-turbine-fulcrum.xml 14 Jun 2003 16:19:46 -0000 1.38
@@ -12,7 +12,7 @@
</property>
</ant>
<package>org.apache.fulcrum</package>
- <depend project="avalon">
+ <depend project="avalon-framework" id="combined">
</depend>
<depend project="bsf">
</depend>
1.48 +4 -4 jakarta-gump/project/avalon-phoenix.xml
Index: avalon-phoenix.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/avalon-phoenix.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- avalon-phoenix.xml 2 Jun 2003 09:46:43 -0000 1.47
+++ avalon-phoenix.xml 14 Jun 2003 16:19:46 -0000 1.48
@@ -18,7 +18,7 @@
<depend property="xerces.jar" project="xml-xerces" id="parser"
runtime="true"/>
<depend project="dist-avalon-logkit" runtime="true"/>
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="excalibur-compatibility" runtime="true"/>
<depend project="spice-configkit" runtime="true" inherit="runtime"/>
<depend project="spice-classman" runtime="true" inherit="runtime"/>
@@ -79,7 +79,7 @@
<depend project="xml-xerces" id="parser" runtime="true"/>
<depend project="xml-xalan2" id="transformer" runtime="true"/>
<option project="checkstyle" inherit="runtime"/>
- <depend project="avalon"/>
+ <depend project="avalon-framework" id="combined"/>
<depend project="avalon-phoenix" inherit="all"/>
<depend project="avalon-cornerstone"/>
@@ -104,7 +104,7 @@
<depend project="junit"/>
<depend project="ant"/>
<depend project="xml-xerces"/>
- <depend project="avalon"/>
+ <depend project="avalon-framework" id="combined"/>
<depend project="avalon-phoenix" inherit="all"/>
<option project="checkstyle" inherit="runtime"/>
@@ -131,7 +131,7 @@
<depend project="junit"/>
<depend project="ant"/>
<depend project="xml-xerces"/>
- <depend project="avalon"/>
+ <depend project="avalon-framework" id="combined"/>
<depend project="avalon-phoenix" inherit="all"/>
<depend project="avalon-cornerstone"/>
<depend project="excalibur-thread"/>
1.26 +1 -1 jakarta-gump/project/xml-fop.xml
Index: xml-fop.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/xml-fop.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xml-fop.xml 4 May 2003 04:40:30 -0000 1.25
+++ xml-fop.xml 14 Jun 2003 16:19:46 -0000 1.26
@@ -19,7 +19,7 @@
<depend project="ant" inherit="runtime"/>
<depend project="xml-batik"/>
<!--depend project="avalon-logkit" runtime="true"/-->
- <depend project="avalon" runtime="true"/>
+ <depend project="avalon-framework" runtime="true" id="combined"/>
<depend project="commons-io"/>
<depend project="jfor"/>
<depend project="jakarta-servletapi"/>
1.28 +1 -1 jakarta-gump/project/jakarta-james.xml
Index: jakarta-james.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jakarta-james.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jakarta-james.xml 11 Mar 2003 21:42:48 -0000 1.27
+++ jakarta-james.xml 14 Jun 2003 16:19:46 -0000 1.28
@@ -15,7 +15,7 @@
<depend project="jakarta-site2" />
<depend project="xml-xerces" />
<depend project="javamail" />
- <depend project="avalon" />
+ <depend project="avalon-framework" id="combined"/>
<depend project="avalon-cornerstone" />
<depend project="excalibur-compatibility"/>
<!-- <depend project="excalibur-cli"/> -->
1.227 +4 -4 jakarta-gump/profile/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/profile/gump.xml,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- gump.xml 12 Jun 2003 14:13:49 -0000 1.226
+++ gump.xml 14 Jun 2003 16:19:47 -0000 1.227
@@ -7,7 +7,7 @@
<!--<module
href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-ant-myrmidon/gump.xml"/>-->
<!-- Apache.Avalon -->
-
+ <module
href="http://cvs.apache.org/viewcvs.cgi/*checkout*/avalon/buildsystem/gump-integration/project/avalon.xml"/>
<module href="project/avalon-sandbox.xml"/>
<module href="project/avalon.xml"/>
<module href="project/avalon-cornerstone.xml"/>
@@ -165,7 +165,7 @@
<module
href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/krysalis/krysalis-antlibs/forrest/gump.xml"/>
<module
href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/krysalis/krysalis-antlibs/junit/gump.xml"/>
<module
href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/krysalis/krysalis-antlibs/java/gump.xml"/>
-
+
<!--<module
href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/krysalis/krysalis-cents/antidote/gump.xml"/>-->
<!--<module
href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/krysalis/krysalis-cents/jtidy/gump.xml"/>-->
<!--module
href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/krysalis/krysalis-cents/antxdoclet/gump.xml"/-->
@@ -291,7 +291,7 @@
<project name="nsuml" package="nsuml"/>
<!-- CVS Repository definitions -->
-
+
<repository href="repository/ant.xml"/>
<repository href="repository/avalon.xml"/>
<repository href="repository/cocoon.xml"/>
@@ -313,7 +313,7 @@
<repository href="repository/xml.xml"/>
<!-- server definitions -->
-
+
<server href="server/daedalus.apache.org.xml"/>
<server href="server/icarus.apache.org.xml"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
