svn commit: rev 22552 - in avalon/trunk: central/system runtime tools tools/magic/src/main/org/apache/avalon/tools/tasks

Author: mcconnell
Date: Sun Jul  4 02:26:07 2004
New Revision: 22552

Removed:
   avalon/trunk/tools/common.xml
Modified:
   avalon/trunk/central/system/index.xml
   avalon/trunk/runtime/index.xml
   avalon/trunk/tools/index.xml
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java
Log:
Updates dealing with gump references when building magic with magic.

Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml	(original)
+++ avalon/trunk/central/system/index.xml	Sun Jul  4 02:26:07 2004
@@ -2,6 +2,9 @@
 
 <system>
 
+  <import index="../../tools/index.xml"
+     href="http://svn.apache.org/repos/asf/avalon/trunk/tools/index.xml"/>
+
   <import index="../../runtime/index.xml"
      href="http://svn.apache.org/repos/asf/avalon/trunk/runtime/index.xml"/>
 

Modified: avalon/trunk/runtime/index.xml
==============================================================================
--- avalon/trunk/runtime/index.xml	(original)
+++ avalon/trunk/runtime/index.xml	Sun Jul  4 02:26:07 2004
@@ -2,8 +2,8 @@
 
 <index>
 
-  <import index="../tools/common.xml"
-     href="http://svn.apache.org/repos/asf/avalon/trunk/tools/common.xml"/>
+  <import index="../tools/index.xml"
+     href="http://svn.apache.org/repos/asf/avalon/trunk/tools/index.xml"/>
 
   <!--
   Declaration of the binary resources available through

Modified: avalon/trunk/tools/index.xml
==============================================================================
--- avalon/trunk/tools/index.xml	(original)
+++ avalon/trunk/tools/index.xml	Sun Jul  4 02:26:07 2004
@@ -2,9 +2,6 @@
 
 <index>
 
-  <import index="common.xml"
-     href="http://svn.apache.org/repos/asf/avalon/trunk/tools/common.xml"/>
-
   <resource>
     <info>
       <group>ant</group>
@@ -61,6 +58,15 @@
       <include key="ant-nodeps"/>
     </dependencies>
   </project>
+
+  <resource>
+    <info>
+      <group>junit</group>
+      <name>junit</name>
+      <version>3.8.1</version>
+      <type>jar</type>
+    </info>
+  </resource>
 
   <!--
   Avalon eXternal Supplemental.

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/GumpTask.java	Sun Jul  4 02:26:07 2004
@@ -435,7 +435,7 @@
 
         writer.write( "\n    <!-- magic -->" );
         writer.write( 
-          "\n    <depend project=\"avalon-tools-magic\" inherit=\"true\" runtime=\"true\"/>" );
+          "\n    <depend project=\"avalon-tools-magic-bootstrap\" inherit=\"true\" runtime=\"true\"/>" );
 
         //
         // add dependencies for gump to do its sequencing correctly