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 2008/04/08 14:29:10 UTC
svn commit: r645873 - in /gump/metadata/project: anakia.xml
commons-proper.xml db-ojb-1-0-release.xml db-ojb.xml directory-asn1.xml
excalibur.xml jacorb.xml james-server.xml jfor.xml turbine-core.xml
turbine-fulcrum.xml velocity-engine.xml
Author: bodewig
Date: Tue Apr 8 05:29:03 2008
New Revision: 645873
URL: http://svn.apache.org/viewvc?rev=645873&view=rev
Log:
re-map excalibur-logkit dependencies
Modified:
gump/metadata/project/anakia.xml
gump/metadata/project/commons-proper.xml
gump/metadata/project/db-ojb-1-0-release.xml
gump/metadata/project/db-ojb.xml
gump/metadata/project/directory-asn1.xml
gump/metadata/project/excalibur.xml
gump/metadata/project/jacorb.xml
gump/metadata/project/james-server.xml
gump/metadata/project/jfor.xml
gump/metadata/project/turbine-core.xml
gump/metadata/project/turbine-fulcrum.xml
gump/metadata/project/velocity-engine.xml
Modified: gump/metadata/project/anakia.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/anakia.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/anakia.xml (original)
+++ gump/metadata/project/anakia.xml Tue Apr 8 05:29:03 2008
@@ -37,7 +37,7 @@
<depend project="xml-xerces" runtime="true"/>
<depend project="jdom" runtime="true"/>
<depend project="velocity-engine" ids="velocity" runtime="true"/>
- <depend project="excalibur-logkit" runtime="true"/>
+ <depend project="packaged-logkitn" runtime="true"/>
<depend project="commons-collections" runtime="true"/>
<depend project="commons-lang" runtime="true"/>
</project>
Modified: gump/metadata/project/commons-proper.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-proper.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/commons-proper.xml (original)
+++ gump/metadata/project/commons-proper.xml Tue Apr 8 05:29:03 2008
@@ -615,7 +615,7 @@
<property name="component.version" value="@@DATE@@" />
<property name="log4j12.jar" project="logging-log4j-12"
reference="jarpath"/>
- <property name="logkit.jar" project="excalibur-logkit"
+ <property name="logkit.jar" project="packaged-logkit"
reference="jarpath"/>
<property name="avalon-framework.jar" project="excalibur-framework-api"
reference="jarpath"/>
@@ -624,7 +624,7 @@
<depend project="xml-xerces"/>
<depend project="xml-apis"/>
<depend project="logging-log4j-12"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="excalibur-framework-api"/>
<depend project="jakarta-servletapi-4"/>
<work nested="logging/target/classes"/>
@@ -641,7 +641,7 @@
<property name="component.version" value="@@DATE@@" />
<property name="log4j13.jar" project="logging-log4j-12"
reference="jarpath"/>
- <property name="logkit.jar" project="excalibur-logkit"
+ <property name="logkit.jar" project="packaged-logkit"
reference="jarpath"/>
<property name="avalon-framework.jar" project="excalibur-framework-api"
reference="jarpath"/>
@@ -651,7 +651,7 @@
<depend project="xml-apis"/>
<depend project="commons-logging-step-1"/>
<depend project="logging-log4j-12"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="excalibur-framework-api"/>
<depend project="jakarta-servletapi-4"/>
<work nested="logging/target/classes"/>
Modified: gump/metadata/project/db-ojb-1-0-release.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/db-ojb-1-0-release.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/db-ojb-1-0-release.xml (original)
+++ gump/metadata/project/db-ojb-1-0-release.xml Tue Apr 8 05:29:03 2008
@@ -62,7 +62,7 @@
<depend project="excalibur-framework-impl"/>
<depend project="velocity-engine" ids="velocity" />
<depend project="excalibur-component"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="logging-log4j-12"/>
<depend project="jakarta-regexp"/>
<depend project="jakarta-servletapi"/>
Modified: gump/metadata/project/db-ojb.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/db-ojb.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/db-ojb.xml (original)
+++ gump/metadata/project/db-ojb.xml Tue Apr 8 05:29:03 2008
@@ -63,7 +63,7 @@
<depend project="excalibur-framework-impl"/>
<depend project="velocity-engine" ids="velocity" />
<depend project="excalibur-component"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="logging-log4j-12"/>
<depend project="jakarta-regexp"/>
<depend project="jakarta-servletapi"/>
@@ -129,7 +129,7 @@
<depend project="excalibur-framework-impl"/>
<depend project="velocity-engine" ids="velocity" />
<depend project="excalibur-component"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="logging-log4j-12"/>
<depend project="jakarta-regexp"/>
<depend project="jakarta-servletapi"/>
Modified: gump/metadata/project/directory-asn1.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/directory-asn1.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/directory-asn1.xml (original)
+++ gump/metadata/project/directory-asn1.xml Tue Apr 8 05:29:03 2008
@@ -110,11 +110,11 @@
<property project="velocity-engine" name="maven.jar.velocity-dep" reference="jarpath" id="velocity-dep" />
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<depend project="antlr" />
- <depend project="excalibur-logkit" />
+ <depend project="packaged-logkit" />
<depend project="commons-collections" />
<depend project="commons-lang" />
<depend project="commons-logging" />
Modified: gump/metadata/project/excalibur.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/excalibur.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/excalibur.xml (original)
+++ gump/metadata/project/excalibur.xml Tue Apr 8 05:29:03 2008
@@ -36,7 +36,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<depend project="excalibur-framework-api" runtime="true"/>
@@ -50,7 +50,7 @@
<depend project="excalibur-pool-api" runtime="true"/>
<depend project="excalibur-pool-impl" runtime="true"/>
<depend project="excalibur-pool-instrumented" runtime="true"/>
- <depend project="excalibur-logkit" runtime="true"/>
+ <depend project="packaged-logkit" runtime="true"/>
<depend project="concurrent" runtime="true"/>
<!-- test-time dependencies -->
@@ -399,12 +399,12 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<depend project="excalibur-framework-api" runtime="true"/>
<depend project="excalibur-framework-impl" runtime="true"/>
- <depend project="excalibur-logkit" runtime="true"/>
+ <depend project="packaged-logkit" runtime="true"/>
<depend project="excalibur-component" runtime="true" inherit="runtime"/>
<depend project="junit" runtime="true"/>
@@ -440,13 +440,13 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<depend project="ant" inherit="runtime"/>
<depend project="excalibur-framework-api"/>
<depend project="excalibur-framework-impl"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="commons-collections"/>
<depend project="concurrent"/>
<depend project="excalibur-fortress-meta"/>
@@ -525,7 +525,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.excalibur.event</package>
@@ -543,7 +543,7 @@
<depend project="excalibur-pool-api" runtime="true"/>
<depend project="excalibur-pool-impl" runtime="true"/>
<depend project="excalibur-instrument-api" runtime="true"/>
- <depend project="excalibur-logkit" runtime="true"/>
+ <depend project="packaged-logkit" runtime="true"/>
<!-- build-time dependencies -->
<depend project="ant" inherit="runtime"/>
@@ -570,10 +570,10 @@
<maven basedir="framework/api" goal="jar">
<property name="maven.final.name" value="excalibur-framework-api-@@DATE@@"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.avalon.framework</package>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<home nested="framework/api"/>
<jar name="target/excalibur-framework-api-@@DATE@@.jar"/>
@@ -593,11 +593,11 @@
<property name="maven.jar.log4j" reference="jarpath"
project="logging-log4j-12"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.avalon.framework</package>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="commons-logging"/>
<depend project="excalibur-framework-api"/>
<depend project="packaged-jmock"/>
@@ -663,7 +663,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.avalon.fortress</package>
@@ -676,7 +676,7 @@
<depend project="excalibur-framework-api"/>
<depend project="excalibur-framework-impl"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="bcel"/>
<depend project="commons-collections"/>
<depend project="commons-beanutils"/>
@@ -723,7 +723,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.avalon.fortress</package>
@@ -737,7 +737,7 @@
<depend project="excalibur-framework-api"/>
<depend project="excalibur-framework-impl"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="bcel"/>
<depend project="commons-collections"/>
<depend project="commons-beanutils"/>
@@ -786,7 +786,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.avalon.fortress</package>
@@ -800,7 +800,7 @@
<depend project="excalibur-framework-api"/>
<depend project="excalibur-framework-impl"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="commons-collections"/>
<depend project="commons-logging"/>
<depend project="d-haven-event"/>
@@ -848,7 +848,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
<property name="maven.jar.servletapi" reference="jarpath"
project="jakarta-servletapi-5-servlet"/>
</maven>
@@ -866,7 +866,7 @@
<depend project="excalibur-instrument-api"/>
<depend project="excalibur-lifecycle-api"/>
<depend project="excalibur-lifecycle-impl"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="jakarta-servletapi-5-servlet"/>
<depend project="qdox"/>
@@ -885,7 +885,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.avalon.fortress</package>
@@ -897,7 +897,7 @@
<depend project="excalibur-instrument-api"/>
<depend project="excalibur-lifecycle-api"/>
<depend project="excalibur-lifecycle-impl"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="commons-collections"/>
<depend project="concurrent"/>
@@ -953,7 +953,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.avalon.fortress</package>
@@ -978,7 +978,7 @@
<depend project="excalibur-lifecycle-api"/>
<depend project="excalibur-lifecycle-impl"/>
<depend project="excalibur-logger"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="excalibur-pool-api"/>
<depend project="excalibur-pool-impl"/>
<depend project="excalibur-sourceresolve"/>
@@ -998,7 +998,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.avalon.fortress</package>
@@ -1020,7 +1020,7 @@
<depend project="excalibur-lifecycle-api"/>
<depend project="excalibur-lifecycle-impl"/>
<depend project="excalibur-logger"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="excalibur-pool-api"/>
<depend project="excalibur-pool-impl"/>
<depend project="excalibur-pool-instrumented"/>
@@ -1321,7 +1321,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.avalon.excalibur.logger</package>
@@ -1331,7 +1331,7 @@
<depend project="ant" inherit="runtime"/>
<depend project="excalibur-framework-api" runtime="true"/>
<depend project="excalibur-framework-impl" runtime="true"/>
- <depend project="excalibur-logkit" runtime="true"/>
+ <depend project="packaged-logkit" runtime="true"/>
<depend project="commons-logging" runtime="true"/>
<depend project="jakarta-servletapi-4" runtime="true"/>
<depend project="velocity-engine" ids="velocity" />
@@ -1364,7 +1364,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.excalibur.monitor</package>
@@ -1372,7 +1372,7 @@
<depend project="ant" inherit="runtime"/>
<depend project="excalibur-framework-api" runtime="true"/>
<depend project="excalibur-framework-impl" runtime="true"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="excalibur-pool" inherit="runtime"/>
<depend project="excalibur-sourceresolve" inherit="runtime"/>
<depend project="xml-xerces"/>
@@ -1760,7 +1760,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.avalon.excalibur.xml</package>
@@ -1768,7 +1768,7 @@
<depend project="ant" inherit="runtime"/>
<depend project="excalibur-framework-api"/>
<depend project="excalibur-framework-impl"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="commons-collections"/>
<depend project="excalibur-component"/>
<depend project="excalibur-fortress-container-api"/>
Modified: gump/metadata/project/jacorb.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jacorb.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/jacorb.xml (original)
+++ gump/metadata/project/jacorb.xml Tue Apr 8 05:29:03 2008
@@ -35,7 +35,7 @@
<depend project="antlr"/>
<depend project="excalibur-framework-api"/>
<depend project="concurrent" />
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="java_cup"/>
<jar name="lib/idl.jar"/>
</project>
@@ -47,7 +47,7 @@
<ant target="all"/>
<depend project="JacORB-idllib"/>
<depend project="antlr"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="commons-collections"/>
<depend project="commons-logging"/>
<depend project="concurrent" />
Modified: gump/metadata/project/james-server.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/james-server.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/james-server.xml (original)
+++ gump/metadata/project/james-server.xml Tue Apr 8 05:29:03 2008
@@ -44,7 +44,7 @@
<!-- external references -->
<depend property="gump.resource.avalon-framework-api" project="excalibur-framework-api">
</depend>
- <depend property="gump.resource.avalon-logkit" project="excalibur-logkit">
+ <depend property="gump.resource.avalon-logkit" project="packaged-logkit">
</depend>
<depend property="gump.resource.mailapi" project="javamail" id="javamail">
</depend>
Modified: gump/metadata/project/jfor.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jfor.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/jfor.xml (original)
+++ gump/metadata/project/jfor.xml Tue Apr 8 05:29:03 2008
@@ -31,9 +31,9 @@
<depend project="ant" inherit="runtime"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<home nested="dist"/>
<jar name="lib/jfor-@@DATE@@.jar"/>
</project>
-</module>
\ No newline at end of file
+</module>
Modified: gump/metadata/project/turbine-core.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/turbine-core.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/turbine-core.xml (original)
+++ gump/metadata/project/turbine-core.xml Tue Apr 8 05:29:03 2008
@@ -32,7 +32,7 @@
<maven goal="jar">
<property name="maven.final.name" value="turbine-@@DATE@@"/>
<property name="maven.jar.logkit"
- project="excalibur-logkit" reference="jarpath"/>
+ project="packaged-logkit" reference="jarpath"/>
<property name="maven.jar.excalibur-pool"
project="excalibur-pool-api" reference="jarpath"/>
<property name="maven.jar.excalibur-instrument"
@@ -49,7 +49,7 @@
<!-- All Maven projects need Ant and Xerces to build. -->
<depend project="ant"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="commons-beanutils"/>
<depend project="commons-codec"/>
<depend project="commons-collections"/>
Modified: gump/metadata/project/turbine-fulcrum.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/turbine-fulcrum.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/turbine-fulcrum.xml (original)
+++ gump/metadata/project/turbine-fulcrum.xml Tue Apr 8 05:29:03 2008
@@ -152,7 +152,7 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.fulcrum</package>
@@ -168,7 +168,7 @@
<depend project="jaxen"/>
<depend project="commons-collections"/>
<depend project="logging-log4j-12"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="velocity-engine" ids="velocity" />
<depend project="velocity-dvsl" ids="velocity-dvsl" />
@@ -704,14 +704,14 @@
<property name="maven.jar.avalon-framework-impl" reference="jarpath"
project="excalibur-framework-impl"/>
<property name="maven.jar.avalon-logkit" reference="jarpath"
- project="excalibur-logkit"/>
+ project="packaged-logkit"/>
</maven>
<package>org.apache.fulcrum</package>
<depend project="ant"/>
<depend project="excalibur-framework-api"/>
<depend project="excalibur-framework-impl"/>
- <depend project="excalibur-logkit"/>
+ <depend project="packaged-logkit"/>
<depend project="xml-xerces"/>
Modified: gump/metadata/project/velocity-engine.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/velocity-engine.xml?rev=645873&r1=645872&r2=645873&view=diff
==============================================================================
--- gump/metadata/project/velocity-engine.xml (original)
+++ gump/metadata/project/velocity-engine.xml Tue Apr 8 05:29:03 2008
@@ -57,7 +57,7 @@
<depend project="ant" inherit="runtime"/>
<!-- This is the absolute minimum set of dependencies for building Velocity -->
- <depend project="excalibur-logkit" />
+ <depend project="packaged-logkit" />
<depend project="commons-collections" />
<depend project="commons-lang" />
<depend project="logging-log4j-12" />