svn commit: rev 21244 - in avalon/trunk: . central/system runtime/merlin/cli

Author: mcconnell
Date: Mon Jun 14 15:30:07 2004
New Revision: 21244

Modified:
   avalon/trunk/build.xml
   avalon/trunk/central/system/index.xml
   avalon/trunk/runtime/merlin/cli/build.properties
Log:
sync with tools update

Modified: avalon/trunk/build.xml
==============================================================================
--- avalon/trunk/build.xml	(original)
+++ avalon/trunk/build.xml	Mon Jun 14 15:30:07 2004
@@ -5,7 +5,7 @@
   <property file="build.properties"/>
 
   <target name="bootstrap">
-    <ant dir="${basedir}/tools/project"/>
+    <ant dir="${basedir}/tools/project" antfile="bootstrap.xml"/>
   </target>
 
   <target name="integrity-check">

Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml	(original)
+++ avalon/trunk/central/system/index.xml	Mon Jun 14 15:30:07 2004
@@ -84,10 +84,10 @@
     Avalon Tools.
     -->
 
-    <project basedir="../../tools/project">
+    <project basedir="../../tools/magic">
       <info>
         <group>avalon/tools</group>
-        <name>avalon-tools-project</name>
+        <name>avalon-tools-magic</name>
         <version>1.0.0</version>
       </info>
     </project>

Modified: avalon/trunk/runtime/merlin/cli/build.properties
==============================================================================
--- avalon/trunk/runtime/merlin/cli/build.properties	(original)
+++ avalon/trunk/runtime/merlin/cli/build.properties	Mon Jun 14 15:30:07 2004
@@ -2,6 +2,3 @@
 project.name = avalon-merlin-cli
 project.src.main = java
 project.home = ../../../central/system
-
-project.jar.main.class = org.apache.avalon.merlin.cli.Main
-project.jar.classpath = commons-cli/jars/commons-cli-1.0.jar
\ No newline at end of file