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 2009/03/31 17:08:12 UTC

svn commit: r760470 - in /gump/metadata: profile/ project/

Author: bodewig
Date: Tue Mar 31 15:07:53 2009
New Revision: 760470

URL: http://svn.apache.org/viewvc?rev=760470&view=rev
Log:
don't try to build a dead codebase any longer

Added:
    gump/metadata/project/packaged-avalon.xml
      - copied, changed from r760461, gump/metadata/project/packaged-logkit.xml
Removed:
    gump/metadata/profile/apache-avalon.xml
    gump/metadata/profile/apache-cocoon.xml
    gump/metadata/project/avalon.xml
    gump/metadata/project/packaged-logkit.xml
Modified:
    gump/metadata/profile/gump.xml
    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/excalibur.xml
    gump/metadata/project/jacorb.xml
    gump/metadata/project/jakarta-jmeter.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/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Tue Mar 31 15:07:53 2009
@@ -32,8 +32,7 @@
 
 <!-- Apache.Avalon (SVN) -->
   <module href="project/avalon-tools.xml"/> <!-- magic bootstrap -->
-  <!--module href="http://svn.apache.org/repos/asf/avalon/trunk/central/system/gump/avalon-trunk.xml"/-->
-  <module href="project/avalon.xml"/>
+  <!--module href="project/avalon.xml"/-->
 
 <!-- Apache.Cocoon -->
 
@@ -66,7 +65,7 @@
 
   <module href="project/excalibur.xml"/>
   <module href="project/excalibur-legacy.xml"/>
-  <module href="project/packaged-logkit.xml"/>
+  <module href="project/packaged-avalon.xml"/>
 
 <!-- Apache Forrest -->
 
@@ -471,8 +470,6 @@
 
   <project name="antlr"            package="antlr-2.7.6"/>
   <project name="aspectj"          package="aspectj-1.2.1rc1"/>
-  <!-- project name="avalon-phoenix-dependencies"
-           package="avalon-phoenix-dependencies"/ -->
   <project name="axion"            package="axion-1.0-M2"/>
   <project name="bcmail"           package="bouncycastle-jdk14"/>
   <project name="bcpg"             package="bouncycastle-jdk14"/>
@@ -589,7 +586,13 @@
   <project name="packaged-jetty-all"   package="jetty-5.0.RC4"/>
   <project name="packaged-jetty-jaas"   package="jetty-5.0.RC4"/>
   <project name="packaged-jmock"   package="jmock"/>
-  <project name="packaged-logkit"    package="avalon-logkit"/>
+  <project name="avalon-framework-api"
+           package="avalon"/>
+  <project name="avalon-framework-impl"
+           package="avalon"/>
+  <project name="avalon-logkit"    package="avalon"/>
+  <project name="avalon-meta-tools"
+           package="avalon"/>
   <project name="packaged-struts12"  package="struts-1.2.9-lib"/>
   <project name="packaged-struts13"  package="struts-1.3.5-lib"/>
   <project name="packaged-struts-el12"  package="struts-el"/>

Modified: gump/metadata/project/anakia.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/anakia.xml?rev=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/anakia.xml (original)
+++ gump/metadata/project/anakia.xml Tue Mar 31 15:07:53 2009
@@ -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="packaged-logkit" runtime="true"/>
+    <depend project="avalon-logkit" 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=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/commons-proper.xml (original)
+++ gump/metadata/project/commons-proper.xml Tue Mar 31 15:07:53 2009
@@ -668,7 +668,7 @@
        <property name="component.version" value="@@DATE@@" />
       <property name="log4j12.jar" project="logging-log4j-12"
         reference="jarpath"/>
-      <property name="logkit.jar" project="packaged-logkit"
+      <property name="logkit.jar" project="avalon-logkit"
         reference="jarpath"/>
       <property name="avalon-framework.jar" project="excalibur-framework-api"
         reference="jarpath"/>
@@ -677,7 +677,7 @@
     <depend project="xml-xerces"/>
     <depend project="xml-apis"/>
     <depend project="logging-log4j-12"/>
-    <depend project="packaged-logkit"/>
+    <depend project="avalon-logkit"/>
     <depend project="excalibur-framework-api"/>
     <depend project="jakarta-servletapi-4"/>
     <work nested="logging/target/classes"/>
@@ -693,7 +693,7 @@
        <property name="component.version" value="@@DATE@@" />
       <property name="log4j13.jar" project="logging-log4j-12"
         reference="jarpath"/>
-      <property name="logkit.jar" project="packaged-logkit"
+      <property name="logkit.jar" project="avalon-logkit"
         reference="jarpath"/>
       <property name="avalon-framework.jar" project="excalibur-framework-api"
         reference="jarpath"/>
@@ -703,7 +703,7 @@
     <depend project="xml-apis"/>
     <depend project="commons-logging-step-1"/>
     <depend project="logging-log4j-12"/>
-    <depend project="packaged-logkit"/>
+    <depend project="avalon-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=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/db-ojb-1-0-release.xml (original)
+++ gump/metadata/project/db-ojb-1-0-release.xml Tue Mar 31 15:07:53 2009
@@ -62,7 +62,7 @@
     <depend project="excalibur-framework-impl"/>
     <depend project="velocity-engine" ids="velocity" />
     <depend project="excalibur-component"/>
-    <depend project="packaged-logkit"/>
+    <depend project="avalon-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=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/db-ojb.xml (original)
+++ gump/metadata/project/db-ojb.xml Tue Mar 31 15:07:53 2009
@@ -63,7 +63,7 @@
     <depend project="excalibur-framework-impl"/>
     <depend project="velocity-engine" ids="velocity" />
     <depend project="excalibur-component"/>
-    <depend project="packaged-logkit"/>
+    <depend project="avalon-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="packaged-logkit"/>
+    <depend project="avalon-logkit"/>
     <depend project="logging-log4j-12"/>
     <depend project="jakarta-regexp"/>
     <depend project="jakarta-servletapi"/>

Modified: gump/metadata/project/excalibur.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/excalibur.xml?rev=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/excalibur.xml (original)
+++ gump/metadata/project/excalibur.xml Tue Mar 31 15:07:53 2009
@@ -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="packaged-logkit"/>
+                    project="avalon-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="packaged-logkit" runtime="true"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-logkit"/>
         </maven>
 
         <depend project="excalibur-framework-api" runtime="true"/>
         <depend project="excalibur-framework-impl" runtime="true"/>
-        <depend project="packaged-logkit" runtime="true"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-logkit"/>
         </maven>
         
         <depend project="ant" inherit="runtime"/>
         <depend project="excalibur-framework-api"/>
         <depend project="excalibur-framework-impl"/>
-        <depend project="packaged-logkit"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-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="packaged-logkit"  runtime="true"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-logkit"/>
         </maven>
         <package>org.apache.avalon.framework</package>
-        <depend project="packaged-logkit"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-logkit"/>
         </maven>
         <package>org.apache.avalon.framework</package>
 
-        <depend project="packaged-logkit"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-logkit"/>
         </maven>
         
         <package>org.apache.avalon.fortress</package>
@@ -676,7 +676,7 @@
 
         <depend project="excalibur-framework-api"/>
         <depend project="excalibur-framework-impl"/>
-        <depend project="packaged-logkit"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-logkit"/>
         </maven>
         
         <package>org.apache.avalon.fortress</package>
@@ -737,7 +737,7 @@
 
         <depend project="excalibur-framework-api"/>
         <depend project="excalibur-framework-impl"/>
-        <depend project="packaged-logkit"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-logkit"/>
         </maven>
         
         <package>org.apache.avalon.fortress</package>
@@ -800,7 +800,7 @@
         
         <depend project="excalibur-framework-api"/>
         <depend project="excalibur-framework-impl"/>
-        <depend project="packaged-logkit"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-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="packaged-logkit"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-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="packaged-logkit"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-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="packaged-logkit"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-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="packaged-logkit"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-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="packaged-logkit" runtime="true"/>
+        <depend project="avalon-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="packaged-logkit"/>
+                    project="avalon-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="packaged-logkit"/>
+        <depend project="avalon-logkit"/>
         <depend project="excalibur-pool" inherit="runtime"/>
         <depend project="excalibur-sourceresolve" inherit="runtime"/>
         <depend project="xml-xerces"/>
@@ -1761,7 +1761,7 @@
           <property name="maven.jar.avalon-framework-impl" reference="jarpath"
                     project="excalibur-framework-impl"/>
           <property name="maven.jar.avalon-logkit" reference="jarpath"
-                    project="packaged-logkit"/>
+                    project="avalon-logkit"/>
         </maven>
 
         <package>org.apache.avalon.excalibur.xml</package>
@@ -1769,7 +1769,7 @@
         <depend project="ant" inherit="runtime"/>
         <depend project="excalibur-framework-api"/>
         <depend project="excalibur-framework-impl"/>
-        <depend project="packaged-logkit"/>
+        <depend project="avalon-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=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/jacorb.xml (original)
+++ gump/metadata/project/jacorb.xml Tue Mar 31 15:07:53 2009
@@ -35,7 +35,7 @@
     <depend project="antlr"/>
     <depend project="excalibur-framework-api"/>
     <depend project="concurrent" />
-    <depend project="packaged-logkit"/>
+    <depend project="avalon-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="packaged-logkit"/>
+    <depend project="avalon-logkit"/>
     <depend project="commons-collections"/>
     <depend project="commons-logging"/>
     <depend project="concurrent" />

Modified: gump/metadata/project/jakarta-jmeter.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-jmeter.xml?rev=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/jakarta-jmeter.xml (original)
+++ gump/metadata/project/jakarta-jmeter.xml Tue Mar 31 15:07:53 2009
@@ -69,7 +69,7 @@
     <depend project="jakarta-oro"/>
     <depend project="avalon-framework-impl"/>
     <depend project="avalon-framework-api"/>
-    <depend project="packaged-logkit"/>
+    <depend project="avalon-logkit"/>
     <depend project="velocity-engine"/>
 
     <depend project="xalan"/>
@@ -149,7 +149,7 @@
     <depend project="jakarta-oro"/>
     <depend project="avalon-framework-impl"/>
     <depend project="avalon-framework-api"/>
-    <depend project="packaged-logkit"/>
+    <depend project="avalon-logkit"/>
     <depend project="velocity-engine"/>
 
     <depend project="xalan"/>

Modified: gump/metadata/project/james-server.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/james-server.xml?rev=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/james-server.xml (original)
+++ gump/metadata/project/james-server.xml Tue Mar 31 15:07:53 2009
@@ -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="packaged-logkit">
+      <depend property="gump.resource.avalon-logkit" project="avalon-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=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/jfor.xml (original)
+++ gump/metadata/project/jfor.xml Tue Mar 31 15:07:53 2009
@@ -31,7 +31,7 @@
     <depend project="ant" inherit="runtime"/>
     <depend project="xml-apis"/>
     <depend project="xml-xerces"/>
-    <depend project="packaged-logkit"/>
+    <depend project="avalon-logkit"/>
     <home nested="dist"/>
     <jar name="lib/jfor-@@DATE@@.jar"/>
   </project>

Copied: gump/metadata/project/packaged-avalon.xml (from r760461, gump/metadata/project/packaged-logkit.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/packaged-avalon.xml?p2=gump/metadata/project/packaged-avalon.xml&p1=gump/metadata/project/packaged-logkit.xml&r1=760461&r2=760470&rev=760470&view=diff
==============================================================================
--- gump/metadata/project/packaged-logkit.xml (original)
+++ gump/metadata/project/packaged-avalon.xml Tue Mar 31 15:07:53 2009
@@ -15,12 +15,24 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module name="packaged-logkit">
+<module name="packaged-avalon">
 
     <url href="http://excalibur.apache.org/"/>
 
-    <project name="packaged-logkit" groupId="logkit">
+    <project name="avalon-logkit" groupId="logkit">
       <jar name="avalon-logkit-2.1.jar" id="logkit"/>
     </project>
+
+    <project name="avalon-framework-impl">
+      <jar name="avalon-framework-impl-4.3.jar"/>
+    </project>
+
+    <project name="avalon-framework-api" groupId="avalon-framework">
+      <jar name="avalon-framework-api-4.3.jar" id="avalon-framework"/>
+    </project>
+
+  <project name="avalon-meta-tools">
+    <jar name="avalon-meta-tools-1.4.0.jar"/>
+  </project>
 </module>
     

Modified: gump/metadata/project/turbine-core.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/turbine-core.xml?rev=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/turbine-core.xml (original)
+++ gump/metadata/project/turbine-core.xml Tue Mar 31 15:07:53 2009
@@ -44,12 +44,12 @@
       <property name="maven.jar.commons-beanutils-core" reference="jarpath"
         project="commons-beanutils"/>
       <property name="maven.jar.avalon-logkit" reference="jarpath"
-                project="packaged-logkit"/>
+                project="avalon-logkit"/>
     </maven>
 
     <!-- All Maven projects need Ant and Xerces to build. -->
     <depend project="ant"/>
-    <depend project="packaged-logkit"/>
+    <depend project="avalon-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=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/turbine-fulcrum.xml (original)
+++ gump/metadata/project/turbine-fulcrum.xml Tue Mar 31 15:07:53 2009
@@ -153,7 +153,7 @@
       <property name="maven.jar.avalon-framework-impl" reference="jarpath"
         project="excalibur-framework-impl"/>
       <property name="maven.jar.avalon-logkit" reference="jarpath"
-        project="packaged-logkit"/>
+        project="avalon-logkit"/>
     </maven>
     
     <package>org.apache.fulcrum</package>
@@ -169,7 +169,7 @@
     <depend project="jaxen"/>
     <depend project="commons-collections"/>
     <depend project="logging-log4j-12"/>
-    <depend project="packaged-logkit"/>	
+    <depend project="avalon-logkit"/>	
     <depend project="velocity-engine" ids="velocity" />
     <depend project="velocity-dvsl" ids="velocity-dvsl" />
     
@@ -706,14 +706,14 @@
       <property name="maven.jar.avalon-framework-impl" reference="jarpath"
         project="excalibur-framework-impl"/>
       <property name="maven.jar.avalon-logkit" reference="jarpath"
-        project="packaged-logkit"/>
+        project="avalon-logkit"/>
     </maven>    
     <package>org.apache.fulcrum</package>
     
     <depend project="ant"/>
     <depend project="excalibur-framework-api"/>
     <depend project="excalibur-framework-impl"/>
-    <depend project="packaged-logkit"/>
+    <depend project="avalon-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=760470&r1=760469&r2=760470&view=diff
==============================================================================
--- gump/metadata/project/velocity-engine.xml (original)
+++ gump/metadata/project/velocity-engine.xml Tue Mar 31 15:07:53 2009
@@ -57,7 +57,7 @@
     <depend project="ant" inherit="runtime"/>
 
     <!-- This is the absolute minimum set of dependencies for building Velocity -->
-    <depend project="packaged-logkit" />
+    <depend project="avalon-logkit" />
     <depend project="commons-collections" />
     <depend project="commons-lang" />
     <depend project="logging-log4j-12" />