gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1054429 - in /gump/metadata: profile/ project/
Date Sun, 02 Jan 2011 16:53:31 GMT
Author: bodewig
Date: Sun Jan  2 16:53:30 2011
New Revision: 1054429

URL: http://svn.apache.org/viewvc?rev=1054429&view=rev
Log:
Excalibur => Attic

Removed:
    gump/metadata/project/avalon-tools.xml
    gump/metadata/project/excalibur-legacy.xml
    gump/metadata/project/excalibur.xml
    gump/metadata/project/packaged-avalon.xml
Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/apache-attic.xml
    gump/metadata/project/cocoon22.xml
    gump/metadata/project/commons-jelly.xml
    gump/metadata/project/commons-proper.xml
    gump/metadata/project/db-torque.xml
    gump/metadata/project/forrest.xml
    gump/metadata/project/jakarta-jmeter.xml
    gump/metadata/project/jakarta-tomcat-40.xml
    gump/metadata/project/james-server.xml
    gump/metadata/project/lenya.xml
    gump/metadata/project/quartz.xml
    gump/metadata/project/turbine-core.xml
    gump/metadata/project/turbine-fulcrum.xml
    gump/metadata/project/xml-fop.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Sun Jan  2 16:53:30 2011
@@ -30,9 +30,6 @@
   <module href="project/ivy.xml"/>  
   <module href="project/ant-embed-proposal.xml"/>
 
-<!-- Apache.Avalon (SVN) -->
-  <module href="project/avalon-tools.xml"/>
-
   <!-- Apache Camel -->
   <module href="project/camel.xml"/>
 
@@ -67,12 +64,6 @@
   <!--module href="project/db-derby.xml"/-->
   <module href="project/db-torque.xml"/>
 
-<!-- Apache.Excalibur -->
-
-  <module href="project/excalibur.xml"/>
-  <module href="project/excalibur-legacy.xml"/>
-  <module href="project/packaged-avalon.xml"/>
-
 <!-- Apache Forrest -->
 
   <module href="project/forrest.xml"/>
@@ -425,8 +416,8 @@
   <project name="forehead"         package="forehead"/>
   <project name="cglib"            package="cglib"/>
   <project name="cglib-nodep"      package="cglib"/>
-  <project name="excalibur-instrument" package="excalibur"/>
-  <project name="excalibur-legacy" package="excalibur"/>
+  <project name="packaged-excalibur" package="apache-attic"/>
+  <project name="excalibur-legacy" package="apache-attic"/>
   <project name="geronimo-spec-jms" package="jms1.0.2"/>
   <project name="geronimo-spec-jta" package="jta-spec1_0_1"/>
   <project name="hessian"          package="caucho-libs"/>
@@ -479,16 +470,9 @@
   <project name="packaged-hsqldb"  package="hsqldb"/>
   <project name="packaged-jaxen"   package="jaxen-1.1-beta-6"/>
   <project name="org.mortbay.jetty"  package="jetty6"/>
-  <project name="avalon-framework-api"
-           package="avalon"/>
-  <project name="avalon-framework-impl"
-           package="avalon"/>
-  <project name="avalon-logkit"    package="avalon"/>
-  <project name="avalon-logkit_avalon-logkit"
-           package="avalon"/>
-  <project name="org.apache.avalon.logkit_avalon-logkit"    package="avalon"/>
-  <project name="avalon-meta-tools"
-           package="avalon"/>
+  <project name="avalon-framework-api" package="apache-attic"/>
+  <project name="avalon-framework-impl" package="apache-attic"/>
+  <project name="avalon-logkit"    package="apache-attic"/>
   <project name="packaged-struts13"  package="struts-1.3.5-lib"/>
   <project name="packaged-xom"     package="xom-1.1"/>
   <project name="picocontainer"    package="picocontainer-1.1"/>

Modified: gump/metadata/project/apache-attic.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/apache-attic.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/apache-attic.xml (original)
+++ gump/metadata/project/apache-attic.xml Sun Jan  2 16:53:30 2011
@@ -38,4 +38,43 @@
     <jar name="oro-2.0.8.jar"/>
     <license name="LICENSE"/>
   </project>
+
+  <project name="excalibur-legacy">
+    <jar name="excalibur-compatibility-1.1.jar" id="compatibility"/>
+    <jar name="excalibur-configuration-1.2.jar" id="configuration"/>
+    <jar name="excalibur-i18n-1.1.jar" id="i18n"/>
+    <jar name="excalibur-io-1.1.jar" id="io"/>
+    <jar name="excalibur-naming-1.0.jar" id="naming"/>
+    <jar name="excalibur-instrument-1.0.jar" id="instrument"/>
+    <license name="LICENSE"/>
+  </project>
+
+  <project name="packaged-excalibur">
+    <jar name="excalibur-pool-api-2.2.1.jar" id="pool-api"/>
+    <jar name="excalibur-pool-impl-2.2.1.jar" id="pool-impl"/>
+    <jar name="excalibur-logger-2.2.1.jar" id="logger"/>
+    <jar name="excalibur-datasource-2.2.2.jar" id="datasource"/>
+    <jar name="excalibur-sourceresolve-2.2.3.jar" id="sourceresolve"/>
+    <jar name="excalibur-store-2.2.1.jar" id="store"/>
+    <jar name="excalibur-xmlutil-2.2.1.jar" id="xmlutil"/>
+    <jar name="excalibur-component-2.2.1.jar" id="component"/>
+    <jar name="excalibur-pool-instrumented-2.2.1.jar" id="pool-instrumented"/>
+    <license name="LICENSE"/>
+  </project>
+
+  <project name="avalon-logkit" groupId="logkit">
+    <jar name="avalon-logkit-2.1.jar" id="logkit"/>
+    <license name="LICENSE"/>
+  </project>
+
+  <project name="avalon-framework-impl">
+    <jar name="avalon-framework-impl-4.3.jar"/>
+    <license name="LICENSE"/>
+  </project>
+
+  <project name="avalon-framework-api" groupId="avalon-framework">
+    <jar name="avalon-framework-api-4.3.jar" id="avalon-framework"/>
+    <license name="LICENSE"/>
+  </project>
+
 </module>

Modified: gump/metadata/project/cocoon22.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/cocoon22.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/cocoon22.xml (original)
+++ gump/metadata/project/cocoon22.xml Sun Jan  2 16:53:30 2011
@@ -203,10 +203,6 @@
     <option project="commons-io"/>
     <option project="commons-jexl"/>
     <option project="commons-logging"/>
-    <option project="excalibur-logger"/>
-    <option project="excalibur-pool-api"/>
-    <option project="excalibur-store"/>
-    <option project="excalibur_avalon-framework-impl"/>
     <option project="junit"/>
     <option project="logging-log4j-12"/>
     <option project="xalan"/>
@@ -260,9 +256,6 @@
     <depend project="cocoon22-core-modules"/>
     <mvn basedir="core/cocoon-pipeline/cocoon-pipeline-api" goal="install"/>
     <option project="commons-lang"/>
-    <option project="excalibur-sourceresolve"/>
-    <option project="excalibur-xmlutil"/>
-    <option project="excalibur_avalon-framework-impl"/>
     <option project="junit"/>
     <jar name="core/cocoon-pipeline/cocoon-pipeline-api/target/cocoon-pipeline-api-*[0-9T].jar"
          id="cocoon-pipeline-api"/>
@@ -295,10 +288,6 @@
     <option project="cocoon22-util"/>
     <option project="cocoon22-xml-api"/>
     <option project="commons-collections"/>
-    <option project="excalibur-instrument-api"/>
-    <option project="excalibur-pool-api"/>
-    <option project="excalibur-sourceresolve"/>
-    <option project="excalibur-store"/>
     <option project="jakarta-regexp"/>
     <option project="junit"/>
     <option project="xml-apis"/>
@@ -319,7 +308,6 @@
     <option project="cocoon22-pipeline-api"/>
     <option project="commons-collections"/>
     <option project="commons-logging"/>
-    <option project="excalibur_avalon-framework-impl"/>
     <jar name="core/cocoon-sitemap/cocoon-sitemap-api/target/cocoon-sitemap-api-*[0-9T].jar"
          id="cocoon-sitemap-api"/>
   </project>
@@ -346,8 +334,6 @@
     <option project="cocoon22-xml-api"/>
     <option project="commons-collections"/>
     <option project="commons-jxpath"/>
-    <option project="excalibur-logger"/>
-    <option project="excalibur_avalon-framework-impl"/>
     <option project="junit"/>
     <option project="xml-apis"/>
     <jar name="core/cocoon-sitemap/cocoon-sitemap-impl/target/cocoon-sitemap-impl-*[0-9T].jar"
@@ -364,8 +350,6 @@
     <option project="cocoon22-thread-api"/>
     <option project="cocoon22-util"/>
     <option project="commons-io"/>
-    <option project="excalibur-instrument-api"/>
-    <option project="excalibur-store"/>
     <jar name="core/cocoon-store/cocoon-store-impl/target/cocoon-store-impl-*[0-9T].jar"
          id="cocoon-store-impl"/>
   </project>
@@ -392,7 +376,6 @@
     <mvn basedir="core/cocoon-util" goal="install"/>
     <option project="commons-lang"/>
     <option project="commons-logging"/>
-    <option project="excalibur_avalon-framework-impl"/>
     <option project="jakarta-regexp"/>
     <option project="junit"/>
     <jar name="core/cocoon-util/target/cocoon-util-*[0-9T].jar"
@@ -509,8 +492,6 @@
     <option project="commons-validator"/>
     <option project="concurrent"/>
     <option project="dom4j"/>
-    <option project="excalibur-datasource"/>
-    <option project="excalibur-pool-instrumented"/>
     <option project="packaged-hsqldb"/>
     <option project="htmlunit"/>
     <option project="jakarta-regexp"/>

Modified: gump/metadata/project/commons-jelly.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-jelly.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/commons-jelly.xml (original)
+++ gump/metadata/project/commons-jelly.xml Sun Jan  2 16:53:30 2011
@@ -242,12 +242,12 @@
     <maven goal="jar" basedir="jelly-tags/avalon">
       <property name="maven.final.name" value="commons-jelly-tags-avalon-@@DATE@@"/>
       
-      <property project="excalibur-framework-api" name="maven.jar.avalon-framework" reference="jarpath"
/>
+      <property project="avalon-framework-api" name="maven.jar.avalon-framework" reference="jarpath"
/>
       <property project="xml-xerces" name="maven.jar.xerces" reference="jarpath" />
       <property project="commons-jexl-1.x" name="maven.jar.commons-jexl" reference="jarpath"
/>
     </maven>
 
-    <depend project="excalibur-framework-api" />
+    <depend project="avalon-framework-api" />
     <depend project="commons-beanutils" />
     <depend project="commons-cli" />
     <depend project="commons-collections" />

Modified: gump/metadata/project/commons-proper.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-proper.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/commons-proper.xml (original)
+++ gump/metadata/project/commons-proper.xml Sun Jan  2 16:53:30 2011
@@ -672,7 +672,7 @@
         reference="jarpath"/>
       <property name="logkit.jar" project="avalon-logkit"
         reference="jarpath"/>
-      <property name="avalon-framework.jar" project="excalibur-framework-api"
+      <property name="avalon-framework.jar" project="avalon-framework-api"
         reference="jarpath"/>
     </ant>
     <depend project="ant" inherit="runtime"/>
@@ -680,7 +680,7 @@
     <depend project="xml-apis"/>
     <depend project="logging-log4j-12"/>
     <depend project="avalon-logkit"/>
-    <depend project="excalibur-framework-api"/>
+    <depend project="avalon-framework-api"/>
     <depend project="jakarta-servletapi-4"/>
     <work nested="logging/target/classes"/>
 
@@ -697,7 +697,7 @@
         reference="jarpath"/>
       <property name="logkit.jar" project="avalon-logkit"
         reference="jarpath"/>
-      <property name="avalon-framework.jar" project="excalibur-framework-api"
+      <property name="avalon-framework.jar" project="avalon-framework-api"
         reference="jarpath"/>
     </ant>
     <depend project="ant" inherit="runtime"/>
@@ -706,7 +706,7 @@
     <depend project="commons-logging-step-1"/>
     <depend project="logging-log4j-12"/>
     <depend project="avalon-logkit"/>
-    <depend project="excalibur-framework-api"/>
+    <depend project="avalon-framework-api"/>
     <depend project="jakarta-servletapi-4"/>
     <work nested="logging/target/classes"/>
     <home nested="logging/target"/>

Modified: gump/metadata/project/db-torque.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/db-torque.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/db-torque.xml (original)
+++ gump/metadata/project/db-torque.xml Sun Jan  2 16:53:30 2011
@@ -38,7 +38,6 @@
     <depend project="db-torque-parent"/>
 
     <option project="ant"/>
-    <option project="avalon-logkit_avalon-logkit"/>
     <option project="commons-beanutils"/>
     <option project="commons-codec"/>
     <option project="commons-collections"/>
@@ -51,8 +50,6 @@
     <option project="commons-logging"/>
     <option project="commons-pool"/>
     <option project="dom4j"/>
-    <option project="avalon-framework_avalon-framework-api"/>
-    <option project="avalon-framework_avalon-framework-impl"/>
     <option project="fulcrum_fulcrum-testcontainer"/>
     <option project="fulcrum_fulcrum-yaafi"/>
     <option project="jakarta-turbine-jcs"/>

Modified: gump/metadata/project/forrest.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/forrest.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/forrest.xml (original)
+++ gump/metadata/project/forrest.xml Sun Jan  2 16:53:30 2011
@@ -41,21 +41,14 @@
     <depend project="avalon-framework-api" runtime="true"/>
     <depend project="avalon-framework-impl" runtime="true"/>
     <depend project="cocoon21" inherit="all" runtime="true"/>
+    <depend project="packaged-excalibur" runtime="true"/>
     <depend project="excalibur-legacy" ids="i18n io naming" runtime="true"/>
     <depend project="nekopull" runtime="true"/>
 <!-- Built stuff: -->
     <depend project="ant" runtime="true"/>
     <depend project="ant-contrib" inherit="runtime" runtime="true"/>
     <depend project="commons-lang" runtime="true"/>
-    <depend project="excalibur-component" runtime="true"/>
-    <depend project="excalibur-instrument-api" runtime="true"/>
-    <depend project="excalibur-logger" runtime="true"/>
-    <depend project="excalibur-pool-api" runtime="true"/>
-    <depend project="excalibur-pool-impl" runtime="true"/>
-    <depend project="excalibur-pool-instrumented" runtime="true"/>
-    <depend project="excalibur-sourceresolve" runtime="true"/>
-    <depend project="excalibur-store" runtime="true"/>
-    <depend project="excalibur-xmlutil" runtime="true"/>
+
     <depend project="xml-apis" runtime="true"/>
     <depend project="xml-xerces" runtime="true"/>
     <depend project="xalan" runtime="true"/>

Modified: gump/metadata/project/jakarta-jmeter.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-jmeter.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/jakarta-jmeter.xml (original)
+++ gump/metadata/project/jakarta-jmeter.xml Sun Jan  2 16:53:30 2011
@@ -99,11 +99,8 @@
     <work nested="build/protocol/http"/>
     <work nested="build/monitor/model"/>
 
-    <depend project="excalibur-pool-api"/>
-    <depend project="excalibur-pool-instrumented"/>
-    <depend project="excalibur-logger"/>
-    <depend project="excalibur-datasource"/>
-    <depend project="excalibur-instrument"/>
+    <depend project="packaged-excalibur"/>
+    <depend project="excalibur-legacy" ids="instrument"/>
     
     <depend project="jcharts"/>
 
@@ -172,11 +169,8 @@
     
     <home nested="." />
   
-    <depend project="excalibur-pool-impl"/>
-    <depend project="excalibur-pool-instrumented"/>
-    <depend project="excalibur-logger"/>
-    <depend project="excalibur-datasource"/>
-    <depend project="excalibur-instrument"/>
+    <depend project="packaged-excalibur"/>
+    <depend project="excalibur-legacy" ids="instrument"/>
     
     <depend project="jcharts"/>
 

Modified: gump/metadata/project/jakarta-tomcat-40.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-tomcat-40.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/jakarta-tomcat-40.xml (original)
+++ gump/metadata/project/jakarta-tomcat-40.xml Sun Jan  2 16:53:30 2011
@@ -118,7 +118,7 @@
     <depend project="jmx"/>
     <depend project="jsse" runtime="true"/>
     <depend project="xalan"/>
-    <option project="excalibur-framework-api"/>
+    <option project="avalon-framework-api"/>
     <depend project="jakarta-tomcat-util" runtime="true"/>
     <depend project="jakarta-tomcat-jni" />
     <depend project="jakarta-servletapi-4"/>

Modified: gump/metadata/project/james-server.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/james-server.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/james-server.xml (original)
+++ gump/metadata/project/james-server.xml Sun Jan  2 16:53:30 2011
@@ -36,8 +36,6 @@
     <option project="activemq-pool"/>
     <option project="apache-mailet"/>
     <option project="apache-standard-mailets"/>
-    <option project="avalon-logkit"/>
-    <option project="avalon-meta-tools"/>
     <option project="bcmail"/>
     <option project="bcprov"/>
     <option project="camel-core"/>
@@ -50,21 +48,6 @@
     <option project="commons-pool"/>
     <option project="concurrent"/>
     <option project="dnsjava"/>
-    <option project="excalibur-cornerstone-connection-api"/>
-    <option project="excalibur-cornerstone-connection-impl"/>
-    <option project="excalibur-cornerstone-datasources-api"/>
-    <option project="excalibur-cornerstone-scheduler-api"/>
-    <option project="excalibur-cornerstone-sockets-api"/>
-    <option project="excalibur-cornerstone-store-api"/>
-    <option project="excalibur-cornerstone-threads-api"/>
-    <option project="excalibur-cornerstone-threads-impl"/>
-    <option project="excalibur-datasource"/>
-    <option project="excalibur-framework-api"/>
-    <option project="excalibur-framework-impl"/>
-    <option project="excalibur-pool-api"/>
-    <option project="excalibur-pool-impl"/>
-    <option project="excalibur-thread-api"/>
-    <option project="excalibur-thread-impl"/>
     <option project="jaf"/>
     <option project="jakarta-servletapi-4"/>
     <option project="james-imap"/>

Modified: gump/metadata/project/lenya.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/lenya.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/lenya.xml (original)
+++ gump/metadata/project/lenya.xml Sun Jan  2 16:53:30 2011
@@ -47,7 +47,6 @@
     <option project="cocoon22-sitemap-impl"/>
     <option project="cocoon22-validation-impl"/>
     <option project="commons-validator"/>
-    <option project="excalibur_avalon-framework-api"/>
     <option project="junit"/>
   </project>
 

Modified: gump/metadata/project/quartz.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/quartz.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/quartz.xml (original)
+++ gump/metadata/project/quartz.xml Sun Jan  2 16:53:30 2011
@@ -39,7 +39,6 @@
     <option project="commons-logging"/>
     <option project="commons-modeler"/>
     <option project="commons-pool"/>
-    <option project="excalibur-framework-api"/>
     <option project="javax.jms"/>
     <option project="javax.transaction.jta"/>
     <option project="junit"/>

Modified: gump/metadata/project/turbine-core.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/turbine-core.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/turbine-core.xml (original)
+++ gump/metadata/project/turbine-core.xml Sun Jan  2 16:53:30 2011
@@ -29,7 +29,6 @@
     </mvn>
 
     <option project="ant"/>
-    <option project="avalon-logkit"/>
     <option project="commons-beanutils"/>
     <option project="commons-codec"/>
     <option project="commons-collections"/>
@@ -46,12 +45,6 @@
     <option project="db-torque-runtime">
     <option project="db-torque-templates">
     <option project="dom4j"/>
-    <option project="excalibur-component"/>
-    <option project="excalibur-framework-api"/>
-    <option project="excalibur-framework-impl"/>
-    <option project="excalibur-instrument-api"/>
-    <option project="excalibur-logger"/>
-    <option project="excalibur-pool-api" />
     <depend project="fulcrum-cache"/>
     <option project="fulcrum-crypto"/>
     <option project="fulcrum-factory"/>

Modified: gump/metadata/project/turbine-fulcrum.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/turbine-fulcrum.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/turbine-fulcrum.xml (original)
+++ gump/metadata/project/turbine-fulcrum.xml Sun Jan  2 16:53:30 2011
@@ -24,17 +24,13 @@
   <project name="fulcrum-bsf">
     <maven basedir="bsf" goal="jar">
       <property name="maven.final.name" value="fulcrum-bsf-@@DATE@@"/>
-      <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>
     
     <package>org.apache.fulcrum</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
+    <depend project="avalon-framework-api"/>
+    <depend project="avalon-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit" />
@@ -57,8 +53,6 @@
     
     <depend project="ant"/>
     <depend project="concurrent" runtime="true" />
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="jakarta-turbine-jcs"/>
@@ -88,8 +82,6 @@
     <package>org.apache.fulcrum.configuration</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit"/>
@@ -116,8 +108,6 @@
     <package>org.apache.fulcrum.crypto</package>
 
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit"/>
@@ -133,10 +123,6 @@
     <maven basedir="dvsl" goal="jar">
         <property name="maven.test.skip" value="true"/>    
       <property name="maven.final.name" value="fulcrum-dvsl-@@DATE@@"/>
-      <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"/>
       <property name="maven.jar.avalon-logkit" reference="jarpath"
         project="avalon-logkit"/>
     </maven>
@@ -144,8 +130,8 @@
     <package>org.apache.fulcrum</package>
 
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
+    <depend project="avalon-framework-api"/>
+    <depend project="avalon-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="xml-xerces"/>
@@ -170,8 +156,6 @@
     <package>org.apache.fulcrum</package>
 
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit"/>
@@ -186,17 +170,13 @@
   <project name="fulcrum-hsqldb">
     <maven basedir="hsqldb" goal="jar">
       <property name="maven.final.name" value="fulcrum-hsqldb-@@DATE@@"/>
-      <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>
 
     <package>org.apache.fulcrum</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
+    <depend project="avalon-framework-api"/>
+    <depend project="avalon-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit" />
@@ -216,8 +196,6 @@
     <package>org.apache.fulcrum</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit"/>
@@ -245,8 +223,6 @@
     <package>org.apache.fulcrum</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit"/>
@@ -267,8 +243,6 @@
     <package>org.apache.fulcrum</package>
 
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit"/>
@@ -283,16 +257,12 @@
   <project name="fulcrum-naming">
     <maven basedir="naming" goal="jar">
       <property name="maven.final.name" value="fulcrum-naming-@@DATE@@"/>
-      <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>
     <package>org.apache.fulcrum</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
+    <depend project="avalon-framework-api"/>
+    <depend project="avalon-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit" />
@@ -312,16 +282,12 @@
   <project name="fulcrum-osworkflow">
     <maven basedir="osworkflow" goal="jar">
       <property name="maven.final.name" value="fulcrum-osworkflow-@@DATE@@"/>
-      <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>    
     <package>org.apache.fulcrum</package>
 
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
+    <depend project="avalon-framework-api"/>
+    <depend project="avalon-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit3" />
@@ -353,8 +319,6 @@
     <package>org.apache.fulcrum</package>
 
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit"/>
@@ -383,8 +347,6 @@
     <package>org.apache.fulcrum</package>
 
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit"/>
@@ -406,8 +368,6 @@
     <package>org.apache.fulcrum</package>
 
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit"/>
@@ -441,7 +401,7 @@
     <package>org.apache.fulcrum.security</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
+    <depend project="avalon-framework-api"/>
     <depend project="avalon-logkit"/>
     <depend project="commons-lang"/>
     <depend project="commons-io"/>
@@ -449,10 +409,7 @@
     <depend project="commons-collections"/>
     <depend project="logging-log4j-12"/>
     <depend project="commons-configuration"/>
-    <depend project="excalibur-component"/>
-    <depend project="excalibur-instrument-api"/>
-    <depend project="excalibur-logger"/>
-    <depend project="excalibur-pool"/>
+    <depend project="packaged-excalibur"/>
     <depend project="commons-jelly"/>
     <depend project="velocity-engine" ids="velocity" />
     <depend project="xml-xerces"/>
@@ -477,7 +434,6 @@
     <package>org.apache.fulcrum.security</package>
     
     <option project="commons-lang"/>
-    <option project="excalibur-framework-api"/>
     <option project="fulcrum-crypto"/>
     <option project="fulcrum-testcontainer"/>
     <option project="fulcrum-yaafi"/>
@@ -491,7 +447,6 @@
     <mvn2 basedir="security/memory"/>
     <package>org.apache.fulcrum.security</package>
     
-    <option project="excalibur-framework-api"/>
     <option project="fulcrum-security-api"/>
     <option project="fulcrum-crypto"/>
     <option project="fulcrum-testcontainer"/>
@@ -505,16 +460,12 @@
   <project name="fulcrum-security-nt">
     <maven basedir="security/nt" goal="jar">
       <property name="maven.final.name" value="fulcrum-security-nt-@@DATE@@"/>
-      <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>    
     <package>org.apache.fulcrum.security</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
+    <depend project="avalon-framework-api"/>
+    <depend project="avalon-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="xml-xerces"/>
@@ -559,18 +510,12 @@
     <package>org.apache.fulcrum</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="avalon-logkit"/>
 
     <depend project="xml-xerces"/>
     
     <!-- ECM Dependencies are Required -->
     <depend project="logging-log4j-12"/>
-    <depend project="excalibur-component"/>
-    <depend project="excalibur-instrument-api"/>
-    <depend project="excalibur-logger"/>
-    <depend project="excalibur-pool-api"/>
 
     <depend project="commons-lang"/>
     <depend project="commons-io"/>
@@ -598,8 +543,6 @@
     <package>org.apache.fulcrum</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="xml-xerces"/>
@@ -626,8 +569,6 @@
     <package>org.apache.fulcrum</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit"/>
@@ -654,8 +595,6 @@
     <package>org.apache.fulcrum</package>
     
     <depend project="ant"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
     <depend project="fulcrum-yaafi"/>
     <depend project="fulcrum-testcontainer"/>
     <depend project="junit"/>
@@ -676,8 +615,6 @@
     <package>org.apache.fulcrum</package>
     
     <depend project="ant"/>
-    <depend project="excalibur_avalon-framework-api"/>
-    <depend project="excalibur_avalon-framework-impl"/>
     <depend project="fulcrum-yaafi-crypto"/>
     <depend project="xml-xerces"/>
     

Modified: gump/metadata/project/xml-fop.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/xml-fop.xml?rev=1054429&r1=1054428&r2=1054429&view=diff
==============================================================================
--- gump/metadata/project/xml-fop.xml (original)
+++ gump/metadata/project/xml-fop.xml Sun Jan  2 16:53:30 2011
@@ -38,8 +38,8 @@
     <depend project="ant" inherit="runtime"/>
     <depend project="xmlgraphics-commons"/>
     <depend project="xml-batik"/>
-    <depend project="excalibur-framework-api"/>
-    <depend project="excalibur-framework-impl"/>
+    <depend project="avalon-framework-api"/>
+    <depend project="avalon-framework-impl"/>
     <depend project="commons-logging" ids="commons-logging"/>
     <depend project="commons-io"/>
     <depend project="jakarta-servletapi"/>



Mime
View raw message