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/10/24 06:12:10 UTC
svn commit: r327951 - in /gump/metadata/project: barcode4j.xml db-ojb.xml
db-torque.xml jacorb.xml jakarta-commons-jelly.xml jakarta-commons.xml
jakarta-tomcat-40.xml jakarta-turbine-2.xml jakarta-turbine-3.xml
james-server.xml xml-fop.xml
Author: bodewig
Date: Sun Oct 23 21:11:59 2005
New Revision: 327951
URL: http://svn.apache.org/viewcvs?rev=327951&view=rev
Log:
switch to excalibur's version of framework
Modified:
gump/metadata/project/barcode4j.xml
gump/metadata/project/db-ojb.xml
gump/metadata/project/db-torque.xml
gump/metadata/project/jacorb.xml
gump/metadata/project/jakarta-commons-jelly.xml
gump/metadata/project/jakarta-commons.xml
gump/metadata/project/jakarta-tomcat-40.xml
gump/metadata/project/jakarta-turbine-2.xml
gump/metadata/project/jakarta-turbine-3.xml
gump/metadata/project/james-server.xml
gump/metadata/project/xml-fop.xml
Modified: gump/metadata/project/barcode4j.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/barcode4j.xml?rev=327951&r1=327950&r2=327951&view=diff
==============================================================================
--- gump/metadata/project/barcode4j.xml (original)
+++ gump/metadata/project/barcode4j.xml Sun Oct 23 21:11:59 2005
@@ -40,9 +40,8 @@
<javadoc nested="build/javadocs"/>
<depend project="ant" inherit="runtime"/>
- <depend project="avalon-framework-api"/>
- <depend project="avalon-framework-legacy"/>
- <depend project="avalon-framework-impl"/>
+ <depend project="excalibur-framework-api"/>
+ <depend project="excalibur-framework-impl"/>
<depend project="jakarta-servletapi-4" />
<depend project="jdom"/>
<depend project="commons-cli"/>
Modified: gump/metadata/project/db-ojb.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/db-ojb.xml?rev=327951&r1=327950&r2=327951&view=diff
==============================================================================
--- gump/metadata/project/db-ojb.xml (original)
+++ gump/metadata/project/db-ojb.xml Sun Oct 23 21:11:59 2005
@@ -57,8 +57,8 @@
<depend project="hsqldb"/>
<depend project="j2ee-connector" />
<depend project="jaas" />
- <depend project="avalon-framework-api"/>
- <depend project="avalon-framework-impl"/>
+ <depend project="excalibur-framework-api"/>
+ <depend project="excalibur-framework-impl"/>
<depend project="jakarta-velocity"/>
<depend project="excalibur-component"/>
<depend project="avalon-logkit"/>
Modified: gump/metadata/project/db-torque.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/db-torque.xml?rev=327951&r1=327950&r2=327951&view=diff
==============================================================================
--- gump/metadata/project/db-torque.xml (original)
+++ gump/metadata/project/db-torque.xml Sun Oct 23 21:11:59 2005
@@ -32,9 +32,8 @@
<property name="maven.final.name" value="torque-@@DATE@@"/>
</ant>
- <depend project="avalon-framework-api"/>
- <depend project="avalon-framework-legacy"/>
- <depend project="avalon-framework-impl"/>
+ <depend project="excalibur-framework-api"/>
+ <depend project="excalibur-framework-impl"/>
<depend project="commons-beanutils"/>
<depend project="commons-collections"/>
<depend project="commons-configuration"/>
Modified: gump/metadata/project/jacorb.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/jacorb.xml?rev=327951&r1=327950&r2=327951&view=diff
==============================================================================
--- gump/metadata/project/jacorb.xml (original)
+++ gump/metadata/project/jacorb.xml Sun Oct 23 21:11:59 2005
@@ -32,7 +32,7 @@
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
<depend project="antlr"/>
- <depend project="avalon-framework-api"/>
+ <depend project="excalibur-framework-api"/>
<depend project="concurrent" />
<depend project="avalon-logkit"/>
<jar name="lib/idl.jar"/>
Modified: gump/metadata/project/jakarta-commons-jelly.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/jakarta-commons-jelly.xml?rev=327951&r1=327950&r2=327951&view=diff
==============================================================================
--- gump/metadata/project/jakarta-commons-jelly.xml (original)
+++ gump/metadata/project/jakarta-commons-jelly.xml Sun Oct 23 21:11:59 2005
@@ -235,11 +235,11 @@
<maven goal="jar" basedir="jelly-tags/avalon">
<property name="maven.final.name" value="commons-jelly-tags-avalon-@@DATE@@"/>
- <property project="avalon-framework-api" name="maven.jar.avalon-framework" reference="jarpath" />
+ <property project="excalibur-framework-api" name="maven.jar.avalon-framework" reference="jarpath" />
<property project="xml-xerces" name="maven.jar.xerces" reference="jarpath" />
</maven>
- <depend project="avalon-framework-api" />
+ <depend project="excalibur-framework-api" />
<depend project="commons-beanutils" />
<depend project="commons-cli" />
<depend project="commons-collections" />
Modified: gump/metadata/project/jakarta-commons.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/jakarta-commons.xml?rev=327951&r1=327950&r2=327951&view=diff
==============================================================================
--- gump/metadata/project/jakarta-commons.xml (original)
+++ gump/metadata/project/jakarta-commons.xml Sun Oct 23 21:11:59 2005
@@ -666,7 +666,7 @@
reference="jarpath"/>
<property name="logkit.jar" project="avalon-logkit"
reference="jarpath"/>
- <property name="avalon-framework.jar" project="avalon-framework-api"
+ <property name="avalon-framework.jar" project="excalibur-framework-api"
reference="jarpath"/>
</ant>
<depend project="ant" inherit="runtime"/>
@@ -674,7 +674,7 @@
<depend project="xml-apis"/>
<depend project="logging-log4j-12"/>
<depend project="avalon-logkit"/>
- <depend project="avalon-framework-api"/>
+ <depend project="excalibur-framework-api"/>
<depend project="jakarta-servletapi-4"/>
<work nested="logging/target/classes"/>
@@ -692,7 +692,7 @@
reference="jarpath"/>
<property name="logkit.jar" project="avalon-logkit"
reference="jarpath"/>
- <property name="avalon-framework.jar" project="avalon-framework-api"
+ <property name="avalon-framework.jar" project="excalibur-framework-api"
reference="jarpath"/>
</ant>
<depend project="ant" inherit="runtime"/>
@@ -701,7 +701,7 @@
<depend project="commons-logging-step-1"/>
<depend project="logging-log4j"/>
<depend project="avalon-logkit"/>
- <depend project="avalon-framework-api"/>
+ <depend project="excalibur-framework-api"/>
<depend project="jakarta-servletapi-4"/>
<work nested="logging/target/classes"/>
<home nested="logging/dist"/>
Modified: gump/metadata/project/jakarta-tomcat-40.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/jakarta-tomcat-40.xml?rev=327951&r1=327950&r2=327951&view=diff
==============================================================================
--- gump/metadata/project/jakarta-tomcat-40.xml (original)
+++ gump/metadata/project/jakarta-tomcat-40.xml Sun Oct 23 21:11:59 2005
@@ -116,7 +116,7 @@
<depend project="jmx"/>
<depend project="jsse" runtime="true"/>
<depend project="xalan"/>
- <option project="avalon-framework-api"/>
+ <option project="excalibur-framework-api"/>
<depend project="jakarta-tomcat-util" runtime="true"/>
<depend project="jakarta-tomcat-jni" />
<depend project="jakarta-servletapi-4"/>
Modified: gump/metadata/project/jakarta-turbine-2.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/jakarta-turbine-2.xml?rev=327951&r1=327950&r2=327951&view=diff
==============================================================================
--- gump/metadata/project/jakarta-turbine-2.xml (original)
+++ gump/metadata/project/jakarta-turbine-2.xml Sun Oct 23 21:11:59 2005
@@ -40,13 +40,14 @@
project="db-torque" reference="jarpath"/>
<property name="maven.jar.excalibur-instrument"
project="excalibur-instrument-api" reference="jarpath"/>
+ <property name="maven.jar.avalon-framework-api" reference="jarpath"
+ project="excalibur-framework-api"/>
+ <property name="maven.jar.avalon-framework-impl" reference="jarpath"
+ project="excalibur-framework-impl"/>
</maven>
<!-- All Maven projects need Ant and Xerces to build. -->
<depend project="ant"/>
- <depend project="avalon-framework-api"/>
- <depend project="avalon-framework-impl"/>
- <depend project="avalon-framework-legacy"/>
<depend project="avalon-logkit"/>
<depend project="commons-beanutils"/>
<depend project="commons-codec"/>
@@ -65,6 +66,8 @@
<depend project="excalibur-component"/>
<!-- not exist anymore depend project="excalibur-configuration"/-->
<depend project="excalibur-event-api"/>
+ <depend project="excalibur-framework-api"/>
+ <depend project="excalibur-framework-impl"/>
<!-- not exist anymore depend project="excalibur-i18n"/-->
<depend project="excalibur-instrument-api"/>
<depend project="excalibur-lifecycle-api"/>
Modified: gump/metadata/project/jakarta-turbine-3.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/jakarta-turbine-3.xml?rev=327951&r1=327950&r2=327951&view=diff
==============================================================================
--- gump/metadata/project/jakarta-turbine-3.xml (original)
+++ gump/metadata/project/jakarta-turbine-3.xml Sun Oct 23 21:11:59 2005
@@ -38,11 +38,13 @@
project="db-torque-gen"/>
<project name="maven.jar.xmlParserAPIs" reference="jarpath"
project="xml-apis"/>
+ <property name="maven.jar.avalon-framework-api" reference="jarpath"
+ project="excalibur-framework-api"/>
+ <property name="maven.jar.avalon-framework-impl" reference="jarpath"
+ project="excalibur-framework-impl"/>
</maven>
<depend project="ant"/>
- <depend project="avalon-framework-api"/>
- <depend project="avalon-framework-impl"/>
<depend project="commons-beanutils"/>
<depend project="commons-codec"/>
<depend project="commons-collections"/>
@@ -59,6 +61,8 @@
<depend project="db-torque"/>
<depend project="db-torque-gen"/>
<depend project="dom4j"/>
+ <depend project="excalibur-framework-api"/>
+ <depend project="excalibur-framework-impl"/>
<depend project="fulcrum-factory"/>
<depend project="fulcrum-localization"/>
<depend project="fulcrum-mimetype"/>
Modified: gump/metadata/project/james-server.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/james-server.xml?rev=327951&r1=327950&r2=327951&view=diff
==============================================================================
--- gump/metadata/project/james-server.xml (original)
+++ gump/metadata/project/james-server.xml Sun Oct 23 21:11:59 2005
@@ -47,7 +47,7 @@
<property name="gump.signature" value="@@DATE@@"/>
<property name="version" value="@@DATE@@"/>
<!-- external references -->
- <depend property="gump.resource.avalon-framework-api" project="avalon-framework-api">
+ <depend property="gump.resource.avalon-framework-api" project="excalibur-framework-api">
</depend>
<depend property="gump.resource.avalon-logkit" project="avalon-logkit">
</depend>
@@ -59,7 +59,7 @@
</depend>
<depend property="gump.resource.geronimo-spec-jms" project="jms">
</depend>
- <depend property="gump.resource.avalon-framework-impl" project="avalon-framework-impl">
+ <depend property="gump.resource.avalon-framework-impl" project="excalibur-framework-impl">
</depend>
<depend property="gump.resource.excalibur-datasource" project="excalibur-datasource">
</depend>
Modified: gump/metadata/project/xml-fop.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/xml-fop.xml?rev=327951&r1=327950&r2=327951&view=diff
==============================================================================
--- gump/metadata/project/xml-fop.xml (original)
+++ gump/metadata/project/xml-fop.xml Sun Oct 23 21:11:59 2005
@@ -35,9 +35,8 @@
<depend project="xalan"/>
<depend project="ant" inherit="runtime"/>
<depend project="xml-batik"/>
- <depend project="avalon-framework-api"/>
- <depend project="avalon-framework-legacy"/>
- <depend project="avalon-framework-impl"/>
+ <depend project="excalibur-framework-api"/>
+ <depend project="excalibur-framework-impl"/>
<depend project="commons-logging" ids="commons-logging"/>
<depend project="commons-io"/>
<!--depend project="jfor"/-->