svn commit: rev 46217 - in avalon/trunk: central/site/src/xdocs/central/tools/magic/spells central/system/gump runtime/composition/api/src/java/org/apache/avalon/composition/model

Author: niclas
Date: Thu Sep 16 16:02:20 2004
New Revision: 46217

Modified:
   avalon/trunk/central/site/src/xdocs/central/tools/magic/spells/index-creation.xml
   avalon/trunk/central/system/gump/avalon-trunk.xml
   avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/CyclicDependencyException.java
Log:


Modified: avalon/trunk/central/site/src/xdocs/central/tools/magic/spells/index-creation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/magic/spells/index-creation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/magic/spells/index-creation.xml	Thu Sep 16 16:02:20 2004
@@ -64,7 +64,9 @@
 <project name="gizmo" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <x:home index=".."/>
+  <!-- Search for an index.xml file from current directory and upwards
+       in the directory structures.  -->
+  <x:home />
   <import file="${magic.templates}/standard.xml"/>
 
 </project>]]></source>
@@ -86,8 +88,10 @@
           The default target "install" is a target declared in the 
           imported buildfile <code>${magic.templates}/standard.xml</code>.</li>
         <li>
-          The <code><![CDATA[<x:home index=".."/>]]></code> triggers
-          the loading of the index file located in the parent directory
+          The <code><![CDATA[<x:home />]]></code> triggers
+          the loading of the index file located in the current directory OR
+          in any ascendent parent directory, i.e. the file system will be scanned
+          upwards in the directory structure,
           and from this the construction of the project model that contains
           version information, dependencies, etc.</li>
         <li>

Modified: avalon/trunk/central/system/gump/avalon-trunk.xml
==============================================================================
--- avalon/trunk/central/system/gump/avalon-trunk.xml	(original)
+++ avalon/trunk/central/system/gump/avalon-trunk.xml	Thu Sep 16 16:02:20 2004
@@ -3821,6 +3821,30 @@
        from="Magic Integration &lt;[email protected]&gt;"/>
   </project>
 
+  <project name="magic-installer">
+    <license name="central/system/license/LICENSE.TXT"/>
+    <ant basedir="tools/magic-installer">
+      <!-- for magic -->
+      <property name="build.sysclasspath" value="last"/> 
+      <property name="magic.home" reference="home" project="magic"/>
+      <property name="gump.signature" value="@@DATE@@"/>
+      <!-- external references -->
+      <depend property="gump.resource.ant" project="ant" id="ant"/>
+      <depend property="gump.resource.junit" project="junit"/>
+      <depend property="gump.resource.ant-junit" project="ant" id="junit"/>
+      <depend property="gump.resource.ant-nodeps" project="ant" id="nodeps"/>
+      <!-- end for -->
+    </ant>
+    <depend project="magic" runtime="true" inherit="runtime"/> 
+    <!-- for gump -->
+    <depend project="avalon-tools-magic"><noclasspath/></depend>
+    <!-- end for -->
+    <home nested="tools/magic-installer/target/deliverables"/>
+    <jar name="jars/magic-installer-@@DATE@@.jar"/>
+    <nag to="[email protected]"
+       from="Magic Integration &lt;[email protected]&gt;"/>
+  </project>
+
   <project name="avalon-jmx-api">
     <license name="central/system/license/LICENSE.TXT"/>
     <ant basedir="planet/facilities/jmx/api">

Modified: avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/CyclicDependencyException.java
==============================================================================
--- avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/CyclicDependencyException.java	(original)
+++ avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/CyclicDependencyException.java	Thu Sep 16 16:02:20 2004
@@ -17,7 +17,7 @@
 package org.apache.avalon.composition.model;
 
 /**
- * indicates a cyclic dependency problem in e.g. the assembly of models.
+ * Indicates a cyclic dependency problem in the assembly of models.
  */
 public class CyclicDependencyException extends RuntimeException
 {