You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2005/11/11 06:22:09 UTC
svn commit: r332456 - /gump/metadata/project/avalon.xml
Author: bodewig
Date: Thu Nov 10 21:22:03 2005
New Revision: 332456
URL: http://svn.apache.org/viewcvs?rev=332456&view=rev
Log:
you can't override framework or logkit paths in magic, at least not without modifying the project 'descriptors'
Modified:
gump/metadata/project/avalon.xml
Modified: gump/metadata/project/avalon.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/avalon.xml?rev=332456&r1=332455&r2=332456&view=diff
==============================================================================
--- gump/metadata/project/avalon.xml (original)
+++ gump/metadata/project/avalon.xml Thu Nov 10 21:22:03 2005
@@ -26,9 +26,9 @@
<description>Avalon SVN</description>
<svn repository="avalon-svn" dir="trunk/"/>
- <project name="avalon-meta-api">
+ <project name="avalon-logkit">
<license name="central/system/license/LICENSE.TXT"/>
- <ant basedir="runtime/meta/api">
+ <ant basedir="runtime/logkit">
<!-- for magic -->
<property name="build.sysclasspath" value="last"/>
<property name="magic.home" reference="home" project="magic"/>
@@ -46,28 +46,47 @@
<depend property="gump.resource.geronimo-spec-jms" project="jms">
<noclasspath/>
</depend>
- <depend property="gump.resource.avalon-framework-api"
- project="excalibur-framework-api">
+ <!-- end for -->
+ </ant>
+ <depend project="magic" runtime="true" inherit="runtime"/>
+ <home nested="runtime/logkit/target/deliverables"/>
+ <jar name="jars/avalon-logkit-@@DATE@@.jar"/>
+ </project>
+
+ <project name="avalon-framework-impl">
+ <license name="central/system/license/LICENSE.TXT"/>
+ <ant basedir="runtime/framework/impl">
+ <!-- for magic -->
+ <property name="build.sysclasspath" value="last"/>
+ <property name="magic.home" reference="home" project="magic"/>
+ <property name="gump.signature" value="@@DATE@@"/>
+ <!-- external references -->
+ <depend property="gump.resource.mailapi" project="javamail" id="javamail">
<noclasspath/>
</depend>
- <depend property="gump.resource.avalon-framework-impl"
- project="excalibur-framework-impl">
+ <depend property="gump.resource.log4j" project="logging-log4j-12">
<noclasspath/>
</depend>
- <depend property="gump.resource.avalon-logkit"
- project="excalibur-logkit">
+ <depend property="gump.resource.servletapi" project="jakarta-servletapi-4">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.geronimo-spec-jms" project="jms">
<noclasspath/>
</depend>
<!-- end for -->
</ant>
<depend project="magic" runtime="true" inherit="runtime"/>
- <home nested="runtime/meta/api/target/deliverables"/>
- <jar name="jars/avalon-meta-api-@@DATE@@.jar"/>
+ <!-- for gump -->
+ <depend project="avalon-framework-api"><noclasspath/></depend>
+ <depend project="avalon-logkit"><noclasspath/></depend>
+ <!-- end for -->
+ <home nested="runtime/framework/impl/target/deliverables"/>
+ <jar name="jars/avalon-framework-impl-@@DATE@@.jar"/>
</project>
- <project name="avalon-meta-impl">
+ <project name="avalon-framework-api">
<license name="central/system/license/LICENSE.TXT"/>
- <ant basedir="runtime/meta/impl">
+ <ant basedir="runtime/framework/api">
<!-- for magic -->
<property name="build.sysclasspath" value="last"/>
<property name="magic.home" reference="home" project="magic"/>
@@ -85,22 +104,73 @@
<depend property="gump.resource.geronimo-spec-jms" project="jms">
<noclasspath/>
</depend>
- <depend property="gump.resource.avalon-framework-api"
- project="excalibur-framework-api">
+ <!-- end for -->
+ </ant>
+ <depend project="magic" runtime="true" inherit="runtime"/>
+ <!-- for gump -->
+ <depend project="avalon-logkit"><noclasspath/></depend>
+ <!-- end for -->
+ <home nested="runtime/framework/api/target/deliverables"/>
+ <jar name="jars/avalon-framework-api-@@DATE@@.jar"/>
+ </project>
+
+ <project name="avalon-meta-api">
+ <license name="central/system/license/LICENSE.TXT"/>
+ <ant basedir="runtime/meta/api">
+ <!-- for magic -->
+ <property name="build.sysclasspath" value="last"/>
+ <property name="magic.home" reference="home" project="magic"/>
+ <property name="gump.signature" value="@@DATE@@"/>
+ <!-- external references -->
+ <depend property="gump.resource.mailapi" project="javamail" id="javamail">
<noclasspath/>
</depend>
- <depend property="gump.resource.avalon-framework-impl"
- project="excalibur-framework-impl">
+ <depend property="gump.resource.log4j" project="logging-log4j-12">
<noclasspath/>
</depend>
- <depend property="gump.resource.avalon-logkit"
- project="excalibur-logkit">
+ <depend property="gump.resource.servletapi" project="jakarta-servletapi-4">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.geronimo-spec-jms" project="jms">
+ <noclasspath/>
+ </depend>
+ <!-- end for -->
+ </ant>
+ <depend project="avalon-logkit"><noclasspath/></depend>
+ <depend project="avalon-framework-api"><noclasspath/></depend>
+ <depend project="avalon-framework-impl"><noclasspath/></depend>
+ <depend project="magic" runtime="true" inherit="runtime"/>
+ <home nested="runtime/meta/api/target/deliverables"/>
+ <jar name="jars/avalon-meta-api-@@DATE@@.jar"/>
+ </project>
+
+ <project name="avalon-meta-impl">
+ <license name="central/system/license/LICENSE.TXT"/>
+ <ant basedir="runtime/meta/impl">
+ <!-- for magic -->
+ <property name="build.sysclasspath" value="last"/>
+ <property name="magic.home" reference="home" project="magic"/>
+ <property name="gump.signature" value="@@DATE@@"/>
+ <!-- external references -->
+ <depend property="gump.resource.mailapi" project="javamail" id="javamail">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.log4j" project="logging-log4j-12">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.servletapi" project="jakarta-servletapi-4">
+ <noclasspath/>
+ </depend>
+ <depend property="gump.resource.geronimo-spec-jms" project="jms">
<noclasspath/>
</depend>
<!-- end for -->
</ant>
<depend project="magic" runtime="true" inherit="runtime"/>
<!-- for gump -->
+ <depend project="avalon-framework-api"><noclasspath/></depend>
+ <depend project="avalon-framework-impl"><noclasspath/></depend>
+ <depend project="avalon-logkit"><noclasspath/></depend>
<depend project="avalon-meta-spi"><noclasspath/></depend>
<depend project="avalon-meta-api"><noclasspath/></depend>
<depend project="avalon-util-i18n"><noclasspath/></depend>
@@ -133,22 +203,13 @@
<depend property="gump.resource.qdox" project="qdox">
<noclasspath/>
</depend>
- <depend property="gump.resource.avalon-framework-api"
- project="excalibur-framework-api">
- <noclasspath/>
- </depend>
- <depend property="gump.resource.avalon-framework-impl"
- project="excalibur-framework-impl">
- <noclasspath/>
- </depend>
- <depend property="gump.resource.avalon-logkit"
- project="excalibur-logkit">
- <noclasspath/>
- </depend>
<!-- end for -->
</ant>
<depend project="magic" runtime="true" inherit="runtime"/>
<!-- for gump -->
+ <depend project="avalon-framework-api"><noclasspath/></depend>
+ <depend project="avalon-framework-impl"><noclasspath/></depend>
+ <depend project="avalon-logkit"><noclasspath/></depend>
<depend project="avalon-meta-impl"><noclasspath/></depend>
<depend project="avalon-meta-spi"><noclasspath/></depend>
<depend project="avalon-meta-api"><noclasspath/></depend>
@@ -179,22 +240,13 @@
<depend property="gump.resource.geronimo-spec-jms" project="jms">
<noclasspath/>
</depend>
- <depend property="gump.resource.avalon-framework-api"
- project="excalibur-framework-api">
- <noclasspath/>
- </depend>
- <depend property="gump.resource.avalon-framework-impl"
- project="excalibur-framework-impl">
- <noclasspath/>
- </depend>
- <depend property="gump.resource.avalon-logkit"
- project="excalibur-logkit">
- <noclasspath/>
- </depend>
<!-- end for -->
</ant>
<depend project="magic" runtime="true" inherit="runtime"/>
<!-- for gump -->
+ <depend project="avalon-framework-api"><noclasspath/></depend>
+ <depend project="avalon-framework-impl"><noclasspath/></depend>
+ <depend project="avalon-logkit"><noclasspath/></depend>
<depend project="avalon-meta-api"><noclasspath/></depend>
<!-- end for -->
<home nested="runtime/meta/spi/target/deliverables"/>
@@ -235,21 +287,12 @@
<depend property="gump.resource.geronimo-spec-jms" project="jms">
<noclasspath/>
</depend>
- <depend property="gump.resource.avalon-framework-api"
- project="excalibur-framework-api">
- <noclasspath/>
- </depend>
- <depend property="gump.resource.avalon-framework-impl"
- project="excalibur-framework-impl">
- <noclasspath/>
- </depend>
- <depend property="gump.resource.avalon-logkit"
- project="excalibur-logkit">
- <noclasspath/>
- </depend>
<!-- end for -->
</ant>
<depend project="magic" runtime="true" inherit="runtime"/>
+ <depend project="avalon-framework-api"><noclasspath/></depend>
+ <depend project="avalon-framework-impl"><noclasspath/></depend>
+ <depend project="avalon-logkit"><noclasspath/></depend>
<home nested="runtime/util/configuration/target/deliverables"/>
<jar name="jars/avalon-util-configuration-@@DATE@@.jar"/>
</project>