You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/07/02 13:18:35 UTC

svn commit: rev 22471 - in avalon/trunk: . central/system/build planet/facilities planet/tutorials/dependencies planet/tutorials/dependencies/auto planet/tutorials/dependencies/manual planet/tutorials/lifecycle runtime runtime/activation runtime/activation/api runtime/activation/impl runtime/composition runtime/composition/api runtime/composition/impl runtime/composition/spi runtime/framework runtime/framework/api runtime/framework/impl runtime/framework/legacy runtime/logging runtime/logging/api runtime/logging/impl runtime/logging/log4j runtime/logging/logkit/api runtime/logging/logkit/impl runtime/logging/logkit/plugins/datagram runtime/logging/logkit/plugins/socket runtime/logging/logkit/plugins/syslog runtime/logging/spi runtime/logging/test runtime/logkit runtime/main runtime/merlin runtime/merlin/api runtime/merlin/cli runtime/merlin/impl runtime/merlin/unit runtime/meta/api runtime/meta/impl runtime/meta/spi runtime/meta/tools runtime/repository runtime/repository/api runtime/repository/cli runtime/repository/impl runtime/repository/main runtime/repository/site/etc runtime/repository/spi runtime/repository/test runtime/repository/util runtime/test runtime/test/components runtime/test/dynamics runtime/test/includes runtime/test/playground runtime/test/testa runtime/test/testb runtime/test/testc runtime/test/testd runtime/test/teste runtime/util runtime/util/configuration runtime/util/criteria runtime/util/defaults runtime/util/env runtime/util/exception runtime/util/extension runtime/util/extension/api runtime/util/extension/impl runtime/util/i18n runtime/util/lifecycle runtime/versioning tools/magic/src/main/org/apache/avalon/tools/tasks

Author: mcconnell
Date: Fri Jul  2 04:18:34 2004
New Revision: 22471

Added:
   avalon/trunk/planet/tutorials/dependencies/auto/build.xml
   avalon/trunk/planet/tutorials/dependencies/build.xml
   avalon/trunk/planet/tutorials/dependencies/manual/build.xml
   avalon/trunk/planet/tutorials/lifecycle/build.xml
Removed:
   avalon/trunk/runtime/repository/site/etc/
   avalon/trunk/runtime/versioning/
Modified:
   avalon/trunk/build.xml
   avalon/trunk/central/system/build/reactor.xml
   avalon/trunk/planet/facilities/build.properties
   avalon/trunk/planet/facilities/build.xml
   avalon/trunk/runtime/activation/api/build.properties
   avalon/trunk/runtime/activation/api/build.xml
   avalon/trunk/runtime/activation/build.properties
   avalon/trunk/runtime/activation/build.xml
   avalon/trunk/runtime/activation/impl/build.properties
   avalon/trunk/runtime/activation/impl/build.xml
   avalon/trunk/runtime/build.properties
   avalon/trunk/runtime/build.xml
   avalon/trunk/runtime/composition/api/build.properties
   avalon/trunk/runtime/composition/api/build.xml
   avalon/trunk/runtime/composition/build.properties
   avalon/trunk/runtime/composition/build.xml
   avalon/trunk/runtime/composition/impl/build.properties
   avalon/trunk/runtime/composition/impl/build.xml
   avalon/trunk/runtime/composition/spi/build.properties
   avalon/trunk/runtime/composition/spi/build.xml
   avalon/trunk/runtime/framework/api/build.properties
   avalon/trunk/runtime/framework/api/build.xml
   avalon/trunk/runtime/framework/build.properties
   avalon/trunk/runtime/framework/build.xml
   avalon/trunk/runtime/framework/impl/build.properties
   avalon/trunk/runtime/framework/impl/build.xml
   avalon/trunk/runtime/framework/legacy/build.properties
   avalon/trunk/runtime/framework/legacy/build.xml
   avalon/trunk/runtime/logging/api/build.properties
   avalon/trunk/runtime/logging/api/build.xml
   avalon/trunk/runtime/logging/build.properties
   avalon/trunk/runtime/logging/build.xml
   avalon/trunk/runtime/logging/impl/build.properties
   avalon/trunk/runtime/logging/impl/build.xml
   avalon/trunk/runtime/logging/log4j/build.properties
   avalon/trunk/runtime/logging/log4j/build.xml
   avalon/trunk/runtime/logging/logkit/api/build.properties
   avalon/trunk/runtime/logging/logkit/api/build.xml
   avalon/trunk/runtime/logging/logkit/impl/build.properties
   avalon/trunk/runtime/logging/logkit/impl/build.xml
   avalon/trunk/runtime/logging/logkit/plugins/datagram/build.properties
   avalon/trunk/runtime/logging/logkit/plugins/datagram/build.xml
   avalon/trunk/runtime/logging/logkit/plugins/socket/build.properties
   avalon/trunk/runtime/logging/logkit/plugins/socket/build.xml
   avalon/trunk/runtime/logging/logkit/plugins/syslog/build.properties
   avalon/trunk/runtime/logging/logkit/plugins/syslog/build.xml
   avalon/trunk/runtime/logging/spi/build.properties
   avalon/trunk/runtime/logging/spi/build.xml
   avalon/trunk/runtime/logging/test/build.properties
   avalon/trunk/runtime/logging/test/build.xml
   avalon/trunk/runtime/logkit/build.properties
   avalon/trunk/runtime/logkit/build.xml
   avalon/trunk/runtime/main/build.properties
   avalon/trunk/runtime/main/build.xml
   avalon/trunk/runtime/merlin/api/build.properties
   avalon/trunk/runtime/merlin/api/build.xml
   avalon/trunk/runtime/merlin/build.properties
   avalon/trunk/runtime/merlin/build.xml
   avalon/trunk/runtime/merlin/cli/build.properties
   avalon/trunk/runtime/merlin/cli/build.xml
   avalon/trunk/runtime/merlin/impl/build.properties
   avalon/trunk/runtime/merlin/impl/build.xml
   avalon/trunk/runtime/merlin/unit/build.properties
   avalon/trunk/runtime/meta/api/build.properties
   avalon/trunk/runtime/meta/api/build.xml
   avalon/trunk/runtime/meta/impl/build.properties
   avalon/trunk/runtime/meta/impl/build.xml
   avalon/trunk/runtime/meta/spi/build.properties
   avalon/trunk/runtime/meta/spi/build.xml
   avalon/trunk/runtime/meta/tools/build.properties
   avalon/trunk/runtime/meta/tools/build.xml
   avalon/trunk/runtime/repository/api/build.properties
   avalon/trunk/runtime/repository/api/build.xml
   avalon/trunk/runtime/repository/build.properties
   avalon/trunk/runtime/repository/build.xml
   avalon/trunk/runtime/repository/cli/build.properties
   avalon/trunk/runtime/repository/cli/build.xml
   avalon/trunk/runtime/repository/impl/build.properties
   avalon/trunk/runtime/repository/impl/build.xml
   avalon/trunk/runtime/repository/main/build.properties
   avalon/trunk/runtime/repository/main/build.xml
   avalon/trunk/runtime/repository/spi/build.properties
   avalon/trunk/runtime/repository/spi/build.xml
   avalon/trunk/runtime/repository/test/build.properties
   avalon/trunk/runtime/repository/test/build.xml
   avalon/trunk/runtime/repository/util/build.properties
   avalon/trunk/runtime/repository/util/build.xml
   avalon/trunk/runtime/test/build.properties
   avalon/trunk/runtime/test/build.xml
   avalon/trunk/runtime/test/components/build.properties
   avalon/trunk/runtime/test/components/build.xml
   avalon/trunk/runtime/test/dynamics/build.properties
   avalon/trunk/runtime/test/dynamics/build.xml
   avalon/trunk/runtime/test/includes/build.properties
   avalon/trunk/runtime/test/includes/build.xml
   avalon/trunk/runtime/test/playground/build.properties
   avalon/trunk/runtime/test/playground/build.xml
   avalon/trunk/runtime/test/testa/build.properties
   avalon/trunk/runtime/test/testa/build.xml
   avalon/trunk/runtime/test/testb/build.properties
   avalon/trunk/runtime/test/testb/build.xml
   avalon/trunk/runtime/test/testc/build.properties
   avalon/trunk/runtime/test/testc/build.xml
   avalon/trunk/runtime/test/testd/build.properties
   avalon/trunk/runtime/test/testd/build.xml
   avalon/trunk/runtime/test/teste/build.properties
   avalon/trunk/runtime/test/teste/build.xml
   avalon/trunk/runtime/util/build.properties
   avalon/trunk/runtime/util/build.xml
   avalon/trunk/runtime/util/configuration/build.properties
   avalon/trunk/runtime/util/configuration/build.xml
   avalon/trunk/runtime/util/criteria/build.properties
   avalon/trunk/runtime/util/criteria/build.xml
   avalon/trunk/runtime/util/defaults/build.properties
   avalon/trunk/runtime/util/defaults/build.xml
   avalon/trunk/runtime/util/env/build.properties
   avalon/trunk/runtime/util/env/build.xml
   avalon/trunk/runtime/util/exception/build.properties
   avalon/trunk/runtime/util/exception/build.xml
   avalon/trunk/runtime/util/extension/api/build.properties
   avalon/trunk/runtime/util/extension/api/build.xml
   avalon/trunk/runtime/util/extension/build.properties
   avalon/trunk/runtime/util/extension/build.xml
   avalon/trunk/runtime/util/extension/impl/build.properties
   avalon/trunk/runtime/util/extension/impl/build.xml
   avalon/trunk/runtime/util/i18n/build.properties
   avalon/trunk/runtime/util/i18n/build.xml
   avalon/trunk/runtime/util/lifecycle/build.properties
   avalon/trunk/runtime/util/lifecycle/build.xml
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PrepareTask.java
Log:
According to me this is everything in place for a clean top-to-bottom build of 113 sub-project.

Modified: avalon/trunk/build.xml
==============================================================================
--- avalon/trunk/build.xml	(original)
+++ avalon/trunk/build.xml	Fri Jul  2 04:18:34 2004
@@ -20,8 +20,8 @@
     <ant dir="." antfile="${reactor.xml}" target="clean"/>
   </target>
 
-  <target name="init" depends="verify">
-    <ant dir="." antfile="${reactor.xml}" target="init"/>
+  <target name="info" depends="verify">
+    <ant dir="." antfile="${reactor.xml}" target="info"/>
   </target>
 
   <target name="install" depends="default"/>

Modified: avalon/trunk/central/system/build/reactor.xml
==============================================================================
--- avalon/trunk/central/system/build/reactor.xml	(original)
+++ avalon/trunk/central/system/build/reactor.xml	Fri Jul  2 04:18:34 2004
@@ -3,6 +3,10 @@
 
   <x:home/>
 
+  <target name="info">
+    <x:reactor target="info"/>
+  </target>
+
   <target name="init">
     <x:reactor target="init"/>
   </target>

Modified: avalon/trunk/planet/facilities/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/build.properties	(original)
+++ avalon/trunk/planet/facilities/build.properties	Fri Jul  2 04:18:34 2004
@@ -1 +1,2 @@
-project.home = ../../central/system
+project.system = ../../central/system
+project.home = .

Modified: avalon/trunk/planet/facilities/build.xml
==============================================================================
--- avalon/trunk/planet/facilities/build.xml	(original)
+++ avalon/trunk/planet/facilities/build.xml	Fri Jul  2 04:18:34 2004
@@ -3,6 +3,6 @@
 <project name="facilities" default="default" basedir=".">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/reactor.xml"/>
+  <import file="${project.system}/build/reactor.xml"/>
 
 </project>

Added: avalon/trunk/planet/tutorials/dependencies/auto/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/dependencies/auto/build.xml	Fri Jul  2 04:18:34 2004
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-tutorial-dependency-auto" default="install" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
+
+  <target name="build" depends="standard.build">
+    <x:block name="tutorial" embed="MAIN">
+      <x:component name="hello" class="tutorial.HelloComponent"/>
+    </x:block>
+  </target>
+
+</project>
+

Added: avalon/trunk/planet/tutorials/dependencies/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/dependencies/build.xml	Fri Jul  2 04:18:34 2004
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dependencies-tutorial" default="default" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property name="project.home" value=".."/>
+  <import file="${project.home}/reactor.xml"/>
+
+</project>

Added: avalon/trunk/planet/tutorials/dependencies/manual/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/dependencies/manual/build.xml	Fri Jul  2 04:18:34 2004
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-tutorial-dependency-manual" default="install" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
+
+  <target name="build" depends="standard.build">
+    <x:block name="tutorial" embed="MAIN">
+      <x:component name="hello" class="tutorial.HelloComponent">
+        <x:dependency key="primary" source="gloria"/>
+        <x:dependency key="secondary" source="nancy"/>
+      </x:component>
+    </x:block>
+  </target>
+
+</project>
+

Added: avalon/trunk/planet/tutorials/lifecycle/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/lifecycle/build.xml	Fri Jul  2 04:18:34 2004
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="lifecycle-tutorial" default="default" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property name="project.home" value=".."/>
+  <import file="${project.home}/reactor.xml"/>
+
+</project>

Modified: avalon/trunk/runtime/activation/api/build.properties
==============================================================================
--- avalon/trunk/runtime/activation/api/build.properties	(original)
+++ avalon/trunk/runtime/activation/api/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-activation-api
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/activation/api/build.xml
==============================================================================
--- avalon/trunk/runtime/activation/api/build.xml	(original)
+++ avalon/trunk/runtime/activation/api/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-activation-api" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/activation/build.properties
==============================================================================
--- avalon/trunk/runtime/activation/build.properties	(original)
+++ avalon/trunk/runtime/activation/build.properties	Fri Jul  2 04:18:34 2004
@@ -1 +1,2 @@
-project.home = ../../central/system
+project.home = ..
+project.system = ../../central/system

Modified: avalon/trunk/runtime/activation/build.xml
==============================================================================
--- avalon/trunk/runtime/activation/build.xml	(original)
+++ avalon/trunk/runtime/activation/build.xml	Fri Jul  2 04:18:34 2004
@@ -3,6 +3,6 @@
 <project name="activation" default="install" basedir=".">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/reactor.xml"/>
+  <import file="${project.system}/build/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/activation/impl/build.properties
==============================================================================
--- avalon/trunk/runtime/activation/impl/build.properties	(original)
+++ avalon/trunk/runtime/activation/impl/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,6 +1,7 @@
 
 project.name = avalon-activation-impl
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system
 
 avalon.artifact.factory = org.apache.avalon.activation.impl.DefaultRuntime

Modified: avalon/trunk/runtime/activation/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/activation/impl/build.xml	(original)
+++ avalon/trunk/runtime/activation/impl/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
   <target name="init" depends="standard.init">
     <x:filter key="avalon-logging-logkit-impl" feature="uri" 

Modified: avalon/trunk/runtime/build.properties
==============================================================================
--- avalon/trunk/runtime/build.properties	(original)
+++ avalon/trunk/runtime/build.properties	Fri Jul  2 04:18:34 2004
@@ -1 +1,2 @@
-project.home = ../central/system
+project.system = ../central/system
+project.home = .
\ No newline at end of file

Modified: avalon/trunk/runtime/build.xml
==============================================================================
--- avalon/trunk/runtime/build.xml	(original)
+++ avalon/trunk/runtime/build.xml	Fri Jul  2 04:18:34 2004
@@ -3,6 +3,6 @@
 <project name="runtime" default="default" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/reactor.xml"/>
+  <import file="${project.system}/build/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/composition/api/build.properties
==============================================================================
--- avalon/trunk/runtime/composition/api/build.properties	(original)
+++ avalon/trunk/runtime/composition/api/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-composition-api
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/composition/api/build.xml
==============================================================================
--- avalon/trunk/runtime/composition/api/build.xml	(original)
+++ avalon/trunk/runtime/composition/api/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-composition-api" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/composition/build.properties
==============================================================================
--- avalon/trunk/runtime/composition/build.properties	(original)
+++ avalon/trunk/runtime/composition/build.properties	Fri Jul  2 04:18:34 2004
@@ -1 +1,2 @@
-project.home = ../../central/system
+project.system = ../../central/system
+project.home = ..

Modified: avalon/trunk/runtime/composition/build.xml
==============================================================================
--- avalon/trunk/runtime/composition/build.xml	(original)
+++ avalon/trunk/runtime/composition/build.xml	Fri Jul  2 04:18:34 2004
@@ -3,6 +3,6 @@
 <project name="composition" default="install" basedir=".">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/reactor.xml"/>
+  <import file="${project.system}/build/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/composition/impl/build.properties
==============================================================================
--- avalon/trunk/runtime/composition/impl/build.properties	(original)
+++ avalon/trunk/runtime/composition/impl/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-composition-impl
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/composition/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/composition/impl/build.xml	(original)
+++ avalon/trunk/runtime/composition/impl/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
   <target name="init" depends="standard.init">
     <x:filter key="avalon-logging-logkit-impl" feature="uri" 

Modified: avalon/trunk/runtime/composition/spi/build.properties
==============================================================================
--- avalon/trunk/runtime/composition/spi/build.properties	(original)
+++ avalon/trunk/runtime/composition/spi/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-composition-spi
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/composition/spi/build.xml
==============================================================================
--- avalon/trunk/runtime/composition/spi/build.xml	(original)
+++ avalon/trunk/runtime/composition/spi/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-composition-spi" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/framework/api/build.properties
==============================================================================
--- avalon/trunk/runtime/framework/api/build.properties	(original)
+++ avalon/trunk/runtime/framework/api/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-framework-api
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/framework/api/build.xml
==============================================================================
--- avalon/trunk/runtime/framework/api/build.xml	(original)
+++ avalon/trunk/runtime/framework/api/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-framework-api" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/framework/build.properties
==============================================================================
--- avalon/trunk/runtime/framework/build.properties	(original)
+++ avalon/trunk/runtime/framework/build.properties	Fri Jul  2 04:18:34 2004
@@ -1 +1,2 @@
-project.home = ../../central/system
+project.home = ..
+project.system = ../../central/system

Modified: avalon/trunk/runtime/framework/build.xml
==============================================================================
--- avalon/trunk/runtime/framework/build.xml	(original)
+++ avalon/trunk/runtime/framework/build.xml	Fri Jul  2 04:18:34 2004
@@ -3,6 +3,6 @@
 <project name="test" default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/reactor.xml"/>
+  <import file="${project.system}/build/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/framework/impl/build.properties
==============================================================================
--- avalon/trunk/runtime/framework/impl/build.properties	(original)
+++ avalon/trunk/runtime/framework/impl/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-framework-impl
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system
 project.src.main = java

Modified: avalon/trunk/runtime/framework/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/framework/impl/build.xml	(original)
+++ avalon/trunk/runtime/framework/impl/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-framework-impl" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/framework/legacy/build.properties
==============================================================================
--- avalon/trunk/runtime/framework/legacy/build.properties	(original)
+++ avalon/trunk/runtime/framework/legacy/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
 project.name = avalon-framework-legacy
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/framework/legacy/build.xml
==============================================================================
--- avalon/trunk/runtime/framework/legacy/build.xml	(original)
+++ avalon/trunk/runtime/framework/legacy/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-framework-api" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/logging/api/build.properties
==============================================================================
--- avalon/trunk/runtime/logging/api/build.properties	(original)
+++ avalon/trunk/runtime/logging/api/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-logging-api
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/logging/api/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/api/build.xml	(original)
+++ avalon/trunk/runtime/logging/api/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-logging-api" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/logging/build.properties
==============================================================================
--- avalon/trunk/runtime/logging/build.properties	(original)
+++ avalon/trunk/runtime/logging/build.properties	Fri Jul  2 04:18:34 2004
@@ -1 +1,2 @@
-project.home = ../../central/system
+project.system = ../../central/system
+project.home = ..

Modified: avalon/trunk/runtime/logging/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/build.xml	(original)
+++ avalon/trunk/runtime/logging/build.xml	Fri Jul  2 04:18:34 2004
@@ -3,6 +3,6 @@
 <project name="avalon-logging" default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/reactor.xml"/>
+  <import file="${project.system}/build/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/logging/impl/build.properties
==============================================================================
--- avalon/trunk/runtime/logging/impl/build.properties	(original)
+++ avalon/trunk/runtime/logging/impl/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-logging-impl
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/logging/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/impl/build.xml	(original)
+++ avalon/trunk/runtime/logging/impl/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-logging-impl" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/logging/log4j/build.properties
==============================================================================
--- avalon/trunk/runtime/logging/log4j/build.properties	(original)
+++ avalon/trunk/runtime/logging/log4j/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,7 +1,8 @@
 
 project.name = avalon-logging-log4j
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system
 
 avalon.artifact.factory = org.apache.avalon.logging.log4j.Log4JLoggingFactory
 avalon.artifact.export = org.apache.avalon.logging.provider.LoggingManager

Modified: avalon/trunk/runtime/logging/log4j/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/log4j/build.xml	(original)
+++ avalon/trunk/runtime/logging/log4j/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
   <target name="package" depends="standard.package">
     <x:artifact/>

Modified: avalon/trunk/runtime/logging/logkit/api/build.properties
==============================================================================
--- avalon/trunk/runtime/logging/logkit/api/build.properties	(original)
+++ avalon/trunk/runtime/logging/logkit/api/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,5 +1,6 @@
 
 project.name = avalon-logging-logkit-api
 project.src.main = java
-project.home = ../../../../central/system
 
+project.home = ../../..
+project.system = ../../../../central/system

Modified: avalon/trunk/runtime/logging/logkit/api/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/logkit/api/build.xml	(original)
+++ avalon/trunk/runtime/logging/logkit/api/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
 </project>
 

Modified: avalon/trunk/runtime/logging/logkit/impl/build.properties
==============================================================================
--- avalon/trunk/runtime/logging/logkit/impl/build.properties	(original)
+++ avalon/trunk/runtime/logging/logkit/impl/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,7 +1,8 @@
 
 project.name = avalon-logging-logkit-impl
 project.src.main = java
-project.home = ../../../../central/system
+project.home = ../../..
+project.system = ../../../../central/system
 
 avalon.artifact.factory = org.apache.avalon.logging.logkit.DefaultLoggingFactory
 avalon.artifact.export = org.apache.avalon.logging.provider.LoggingManager

Modified: avalon/trunk/runtime/logging/logkit/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/logkit/impl/build.xml	(original)
+++ avalon/trunk/runtime/logging/logkit/impl/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
   <target name="package" depends="standard.package">
     <x:artifact/>
   </target>

Modified: avalon/trunk/runtime/logging/logkit/plugins/datagram/build.properties
==============================================================================
--- avalon/trunk/runtime/logging/logkit/plugins/datagram/build.properties	(original)
+++ avalon/trunk/runtime/logging/logkit/plugins/datagram/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,6 +1,7 @@
 
 project.name = avalon-logging-logkit-datagram
 project.src.main = java
-project.home = ../../../../../central/system
+project.home = ../../../..
+project.system = ../../../../../central/system
 
 avalon.artifact.factory = org.apache.avalon.logging.logkit.factory.datagram.DatagramTargetFactory

Modified: avalon/trunk/runtime/logging/logkit/plugins/datagram/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/logkit/plugins/datagram/build.xml	(original)
+++ avalon/trunk/runtime/logging/logkit/plugins/datagram/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
   <target name="package" depends="standard.package">
     <x:artifact/>
   </target>

Modified: avalon/trunk/runtime/logging/logkit/plugins/socket/build.properties
==============================================================================
--- avalon/trunk/runtime/logging/logkit/plugins/socket/build.properties	(original)
+++ avalon/trunk/runtime/logging/logkit/plugins/socket/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,6 +1,7 @@
 
 project.name = avalon-logging-logkit-socket
 project.src.main = java
-project.home = ../../../../../central/system
+project.home = ../../../..
+project.system = ../../../../../central/system
 
 avalon.artifact.factory = org.apache.avalon.logging.logkit.factory.socket.SocketTargetFactory

Modified: avalon/trunk/runtime/logging/logkit/plugins/socket/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/logkit/plugins/socket/build.xml	(original)
+++ avalon/trunk/runtime/logging/logkit/plugins/socket/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
   <target name="package" depends="standard.package">
     <x:artifact/>
   </target>

Modified: avalon/trunk/runtime/logging/logkit/plugins/syslog/build.properties
==============================================================================
--- avalon/trunk/runtime/logging/logkit/plugins/syslog/build.properties	(original)
+++ avalon/trunk/runtime/logging/logkit/plugins/syslog/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,6 +1,7 @@
 
 project.name = avalon-logging-logkit-syslog
 project.src.main = java
-project.home = ../../../../../central/system
+project.home = ../../../..
+project.system = ../../../../../central/system
 
 avalon.artifact.factory = org.apache.avalon.logging.logkit.factory.syslog.SyslogTargetFactory

Modified: avalon/trunk/runtime/logging/logkit/plugins/syslog/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/logkit/plugins/syslog/build.xml	(original)
+++ avalon/trunk/runtime/logging/logkit/plugins/syslog/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
   <target name="package" depends="standard.package">
     <x:artifact/>
   </target>

Modified: avalon/trunk/runtime/logging/spi/build.properties
==============================================================================
--- avalon/trunk/runtime/logging/spi/build.properties	(original)
+++ avalon/trunk/runtime/logging/spi/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-logging-spi
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/logging/spi/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/spi/build.xml	(original)
+++ avalon/trunk/runtime/logging/spi/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-logging-spi" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/logging/test/build.properties
==============================================================================
--- avalon/trunk/runtime/logging/test/build.properties	(original)
+++ avalon/trunk/runtime/logging/test/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,5 +1,6 @@
 project.name = avalon-logging-test
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system
 
 project.test.compile.fork = true

Modified: avalon/trunk/runtime/logging/test/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/test/build.xml	(original)
+++ avalon/trunk/runtime/logging/test/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
   
   <target name="init" depends="standard.init">
     <x:filter key="avalon-logging-logkit-impl" feature="uri" 

Modified: avalon/trunk/runtime/logkit/build.properties
==============================================================================
--- avalon/trunk/runtime/logkit/build.properties	(original)
+++ avalon/trunk/runtime/logkit/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-logkit
 project.src.main = java
-project.home = ../../central/system
+project.home = ..
+project.system = ../../central/system

Modified: avalon/trunk/runtime/logkit/build.xml
==============================================================================
--- avalon/trunk/runtime/logkit/build.xml	(original)
+++ avalon/trunk/runtime/logkit/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-logkit" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/main/build.properties
==============================================================================
--- avalon/trunk/runtime/main/build.properties	(original)
+++ avalon/trunk/runtime/main/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
 project.name = avalon-runtime
-project.home = ../../central/system
+project.home = ..
+project.system = ../../central/system

Modified: avalon/trunk/runtime/main/build.xml
==============================================================================
--- avalon/trunk/runtime/main/build.xml	(original)
+++ avalon/trunk/runtime/main/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-runtime" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/merlin/api/build.properties
==============================================================================
--- avalon/trunk/runtime/merlin/api/build.properties	(original)
+++ avalon/trunk/runtime/merlin/api/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-merlin-api
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/merlin/api/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/api/build.xml	(original)
+++ avalon/trunk/runtime/merlin/api/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-merlin-api" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/merlin/build.properties
==============================================================================
--- avalon/trunk/runtime/merlin/build.properties	(original)
+++ avalon/trunk/runtime/merlin/build.properties	Fri Jul  2 04:18:34 2004
@@ -1 +1,2 @@
-project.home = ../../central/system
+project.home = ..
+project.system = ../../central/system
\ No newline at end of file

Modified: avalon/trunk/runtime/merlin/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/build.xml	(original)
+++ avalon/trunk/runtime/merlin/build.xml	Fri Jul  2 04:18:34 2004
@@ -3,6 +3,6 @@
 <project name="merlin" default="default" basedir=".">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/reactor.xml"/>
+  <import file="${project.system}/build/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/merlin/cli/build.properties
==============================================================================
--- avalon/trunk/runtime/merlin/cli/build.properties	(original)
+++ avalon/trunk/runtime/merlin/cli/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,4 +1,5 @@
 
 project.name = avalon-merlin-cli
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/merlin/cli/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/cli/build.xml	(original)
+++ avalon/trunk/runtime/merlin/cli/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
   <target name="init" depends="standard.init">
     <filter token="VERSION" value="${project.version}"/>

Modified: avalon/trunk/runtime/merlin/impl/build.properties
==============================================================================
--- avalon/trunk/runtime/merlin/impl/build.properties	(original)
+++ avalon/trunk/runtime/merlin/impl/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,6 +1,7 @@
 
 project.name = avalon-merlin-impl
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system
 
 avalon.artifact.factory = org.apache.avalon.merlin.impl.DefaultFactory

Modified: avalon/trunk/runtime/merlin/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/impl/build.xml	(original)
+++ avalon/trunk/runtime/merlin/impl/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
   <target name="init" depends="standard.init">
     <x:filter key="avalon-logging-logkit-impl" feature="uri" 

Modified: avalon/trunk/runtime/merlin/unit/build.properties
==============================================================================
--- avalon/trunk/runtime/merlin/unit/build.properties	(original)
+++ avalon/trunk/runtime/merlin/unit/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,5 +1,5 @@
 
 project.name = avalon-merlin-unit
-project.system = ../../../central/system
 project.src.main = java
 project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/meta/api/build.properties
==============================================================================
--- avalon/trunk/runtime/meta/api/build.properties	(original)
+++ avalon/trunk/runtime/meta/api/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-meta-api
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/meta/api/build.xml
==============================================================================
--- avalon/trunk/runtime/meta/api/build.xml	(original)
+++ avalon/trunk/runtime/meta/api/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-meta-api" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/meta/impl/build.properties
==============================================================================
--- avalon/trunk/runtime/meta/impl/build.properties	(original)
+++ avalon/trunk/runtime/meta/impl/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-meta-impl
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/meta/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/meta/impl/build.xml	(original)
+++ avalon/trunk/runtime/meta/impl/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-meta-impl" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/meta/spi/build.properties
==============================================================================
--- avalon/trunk/runtime/meta/spi/build.properties	(original)
+++ avalon/trunk/runtime/meta/spi/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-meta-spi
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/meta/spi/build.xml
==============================================================================
--- avalon/trunk/runtime/meta/spi/build.xml	(original)
+++ avalon/trunk/runtime/meta/spi/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,6 +4,6 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/meta/tools/build.properties
==============================================================================
--- avalon/trunk/runtime/meta/tools/build.properties	(original)
+++ avalon/trunk/runtime/meta/tools/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-meta-tools
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/meta/tools/build.xml
==============================================================================
--- avalon/trunk/runtime/meta/tools/build.xml	(original)
+++ avalon/trunk/runtime/meta/tools/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:declare/>

Modified: avalon/trunk/runtime/repository/api/build.properties
==============================================================================
--- avalon/trunk/runtime/repository/api/build.properties	(original)
+++ avalon/trunk/runtime/repository/api/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-repository-api
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/repository/api/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/api/build.xml	(original)
+++ avalon/trunk/runtime/repository/api/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-repository-api" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/repository/build.properties
==============================================================================
--- avalon/trunk/runtime/repository/build.properties	(original)
+++ avalon/trunk/runtime/repository/build.properties	Fri Jul  2 04:18:34 2004
@@ -1 +1,2 @@
-project.home = ../../central/system
+project.system = ../../central/system
+project.home = ..

Modified: avalon/trunk/runtime/repository/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/build.xml	(original)
+++ avalon/trunk/runtime/repository/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,6 +4,6 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/reactor.xml"/>
+  <import file="${project.system}/build/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/repository/cli/build.properties
==============================================================================
--- avalon/trunk/runtime/repository/cli/build.properties	(original)
+++ avalon/trunk/runtime/repository/cli/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-repository-cli
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/repository/cli/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/cli/build.xml	(original)
+++ avalon/trunk/runtime/repository/cli/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-repository-cli" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/repository/impl/build.properties
==============================================================================
--- avalon/trunk/runtime/repository/impl/build.properties	(original)
+++ avalon/trunk/runtime/repository/impl/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,7 +1,8 @@
 
 project.name = avalon-repository-impl
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system
 
 avalon.artifact.factory = org.apache.avalon.repository.impl.DefaultFactory
 avalon.artifact.export = org.apache.avalon.repository.Repository

Modified: avalon/trunk/runtime/repository/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/impl/build.xml	(original)
+++ avalon/trunk/runtime/repository/impl/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
   <target name="package" depends="standard.package">
     <x:artifact/>

Modified: avalon/trunk/runtime/repository/main/build.properties
==============================================================================
--- avalon/trunk/runtime/repository/main/build.properties	(original)
+++ avalon/trunk/runtime/repository/main/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,7 +1,8 @@
 
 project.name = avalon-repository-main
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system
 
 dpml.url = http://www.dpml.net
 maven.url = http://www.ibiblio.org/maven

Modified: avalon/trunk/runtime/repository/main/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/main/build.xml	(original)
+++ avalon/trunk/runtime/repository/main/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
   <target name="init" depends="standard.init">
     <filter token="REPOSITORY_HOSTS" value="${repository.hosts}"/>
     <x:filter key="avalon-repository-impl" feature="uri" 

Modified: avalon/trunk/runtime/repository/spi/build.properties
==============================================================================
--- avalon/trunk/runtime/repository/spi/build.properties	(original)
+++ avalon/trunk/runtime/repository/spi/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-repository-spi
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/repository/spi/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/spi/build.xml	(original)
+++ avalon/trunk/runtime/repository/spi/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-repository-spi" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/repository/test/build.properties
==============================================================================
--- avalon/trunk/runtime/repository/test/build.properties	(original)
+++ avalon/trunk/runtime/repository/test/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-repository-test
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/repository/test/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/test/build.xml	(original)
+++ avalon/trunk/runtime/repository/test/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
   <target name="init" depends="standard.init">
     <x:filter key="avalon-repository-impl" feature="uri" 

Modified: avalon/trunk/runtime/repository/util/build.properties
==============================================================================
--- avalon/trunk/runtime/repository/util/build.properties	(original)
+++ avalon/trunk/runtime/repository/util/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-repository-util
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/repository/util/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/util/build.xml	(original)
+++ avalon/trunk/runtime/repository/util/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-repository-util" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/test/build.properties
==============================================================================
--- avalon/trunk/runtime/test/build.properties	(original)
+++ avalon/trunk/runtime/test/build.properties	Fri Jul  2 04:18:34 2004
@@ -1 +1,2 @@
-project.home = ../../central/system
+project.home = ..
+project.system = ../../central/system

Modified: avalon/trunk/runtime/test/build.xml
==============================================================================
--- avalon/trunk/runtime/test/build.xml	(original)
+++ avalon/trunk/runtime/test/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,6 +4,6 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/reactor.xml"/>
+  <import file="${project.system}/build/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/test/components/build.properties
==============================================================================
--- avalon/trunk/runtime/test/components/build.properties	(original)
+++ avalon/trunk/runtime/test/components/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
 project.name = avalon-test-components
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/test/components/build.xml
==============================================================================
--- avalon/trunk/runtime/test/components/build.xml	(original)
+++ avalon/trunk/runtime/test/components/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,6 +4,6 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/test/dynamics/build.properties
==============================================================================
--- avalon/trunk/runtime/test/dynamics/build.properties	(original)
+++ avalon/trunk/runtime/test/dynamics/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
 project.name = avalon-test-dynamics
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/test/dynamics/build.xml
==============================================================================
--- avalon/trunk/runtime/test/dynamics/build.xml	(original)
+++ avalon/trunk/runtime/test/dynamics/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,6 +4,6 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/test/includes/build.properties
==============================================================================
--- avalon/trunk/runtime/test/includes/build.properties	(original)
+++ avalon/trunk/runtime/test/includes/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
 project.name = avalon-test-includes
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/test/includes/build.xml
==============================================================================
--- avalon/trunk/runtime/test/includes/build.xml	(original)
+++ avalon/trunk/runtime/test/includes/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
   <target name="init" depends="standard.init">
     <x:filter key="avalon-framework-impl" feature="uri" 

Modified: avalon/trunk/runtime/test/playground/build.properties
==============================================================================
--- avalon/trunk/runtime/test/playground/build.properties	(original)
+++ avalon/trunk/runtime/test/playground/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
 project.name = avalon-test-playground
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/test/playground/build.xml
==============================================================================
--- avalon/trunk/runtime/test/playground/build.xml	(original)
+++ avalon/trunk/runtime/test/playground/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
   <target name="init" depends="standard.init">
     <x:filter key="avalon-framework-impl" feature="uri" 

Modified: avalon/trunk/runtime/test/testa/build.properties
==============================================================================
--- avalon/trunk/runtime/test/testa/build.properties	(original)
+++ avalon/trunk/runtime/test/testa/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
 project.name = avalon-test-testa
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/test/testa/build.xml
==============================================================================
--- avalon/trunk/runtime/test/testa/build.xml	(original)
+++ avalon/trunk/runtime/test/testa/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,6 +4,6 @@
     xmlns:x="antlib:org.apache.avalon.tools" >
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/test/testb/build.properties
==============================================================================
--- avalon/trunk/runtime/test/testb/build.properties	(original)
+++ avalon/trunk/runtime/test/testb/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
 project.name = avalon-test-testb
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/test/testb/build.xml
==============================================================================
--- avalon/trunk/runtime/test/testb/build.xml	(original)
+++ avalon/trunk/runtime/test/testb/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools" >
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
 
 </project>

Modified: avalon/trunk/runtime/test/testc/build.properties
==============================================================================
--- avalon/trunk/runtime/test/testc/build.properties	(original)
+++ avalon/trunk/runtime/test/testc/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
 project.name = avalon-test-testc
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/test/testc/build.xml
==============================================================================
--- avalon/trunk/runtime/test/testc/build.xml	(original)
+++ avalon/trunk/runtime/test/testc/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,6 +4,6 @@
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/test/testd/build.properties
==============================================================================
--- avalon/trunk/runtime/test/testd/build.properties	(original)
+++ avalon/trunk/runtime/test/testd/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
 project.name = avalon-test-testd
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/test/testd/build.xml
==============================================================================
--- avalon/trunk/runtime/test/testd/build.xml	(original)
+++ avalon/trunk/runtime/test/testd/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,6 +4,6 @@
     xmlns:x="antlib:org.apache.avalon.tools" >
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/test/teste/build.properties
==============================================================================
--- avalon/trunk/runtime/test/teste/build.properties	(original)
+++ avalon/trunk/runtime/test/teste/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
 project.name = avalon-test-teste
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/test/teste/build.xml
==============================================================================
--- avalon/trunk/runtime/test/teste/build.xml	(original)
+++ avalon/trunk/runtime/test/teste/build.xml	Fri Jul  2 04:18:34 2004
@@ -4,6 +4,6 @@
     xmlns:x="antlib:org.apache.avalon.tools" >
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/util/build.properties
==============================================================================
--- avalon/trunk/runtime/util/build.properties	(original)
+++ avalon/trunk/runtime/util/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
-project.home = ../../central/system
+project.home = ..
+project.system = ../../central/system
 project.test.compile.fork = true

Modified: avalon/trunk/runtime/util/build.xml
==============================================================================
--- avalon/trunk/runtime/util/build.xml	(original)
+++ avalon/trunk/runtime/util/build.xml	Fri Jul  2 04:18:34 2004
@@ -3,6 +3,6 @@
 <project name="test" default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/reactor.xml"/>
+  <import file="${project.system}/build/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/util/configuration/build.properties
==============================================================================
--- avalon/trunk/runtime/util/configuration/build.properties	(original)
+++ avalon/trunk/runtime/util/configuration/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-util-configuration
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/util/configuration/build.xml
==============================================================================
--- avalon/trunk/runtime/util/configuration/build.xml	(original)
+++ avalon/trunk/runtime/util/configuration/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-util-configuration" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/util/criteria/build.properties
==============================================================================
--- avalon/trunk/runtime/util/criteria/build.properties	(original)
+++ avalon/trunk/runtime/util/criteria/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-util-criteria
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/util/criteria/build.xml
==============================================================================
--- avalon/trunk/runtime/util/criteria/build.xml	(original)
+++ avalon/trunk/runtime/util/criteria/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-util-criteria" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/util/defaults/build.properties
==============================================================================
--- avalon/trunk/runtime/util/defaults/build.properties	(original)
+++ avalon/trunk/runtime/util/defaults/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-util-defaults
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/util/defaults/build.xml
==============================================================================
--- avalon/trunk/runtime/util/defaults/build.xml	(original)
+++ avalon/trunk/runtime/util/defaults/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-util-criteria" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/util/env/build.properties
==============================================================================
--- avalon/trunk/runtime/util/env/build.properties	(original)
+++ avalon/trunk/runtime/util/env/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-util-env
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/util/env/build.xml
==============================================================================
--- avalon/trunk/runtime/util/env/build.xml	(original)
+++ avalon/trunk/runtime/util/env/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-util-env" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/util/exception/build.properties
==============================================================================
--- avalon/trunk/runtime/util/exception/build.properties	(original)
+++ avalon/trunk/runtime/util/exception/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-util-exception
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/util/exception/build.xml
==============================================================================
--- avalon/trunk/runtime/util/exception/build.xml	(original)
+++ avalon/trunk/runtime/util/exception/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-util-exception" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/util/extension/api/build.properties
==============================================================================
--- avalon/trunk/runtime/util/extension/api/build.properties	(original)
+++ avalon/trunk/runtime/util/extension/api/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-util-extension-api
 project.src.main = java
-project.home = ../../../../central/system
+project.home = ../../..
+project.system = ../../../../central/system

Modified: avalon/trunk/runtime/util/extension/api/build.xml
==============================================================================
--- avalon/trunk/runtime/util/extension/api/build.xml	(original)
+++ avalon/trunk/runtime/util/extension/api/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-util-extension-api" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/util/extension/build.properties
==============================================================================
--- avalon/trunk/runtime/util/extension/build.properties	(original)
+++ avalon/trunk/runtime/util/extension/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,2 +1,3 @@
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system
 project.test.compile.fork = true

Modified: avalon/trunk/runtime/util/extension/build.xml
==============================================================================
--- avalon/trunk/runtime/util/extension/build.xml	(original)
+++ avalon/trunk/runtime/util/extension/build.xml	Fri Jul  2 04:18:34 2004
@@ -3,6 +3,6 @@
 <project name="test" default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
-  <import file="${project.home}/build/reactor.xml"/>
+  <import file="${project.system}/build/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/runtime/util/extension/impl/build.properties
==============================================================================
--- avalon/trunk/runtime/util/extension/impl/build.properties	(original)
+++ avalon/trunk/runtime/util/extension/impl/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-util-extension-impl
 project.src.main = java
-project.home = ../../../../central/system
+project.home = ../../..
+project.system = ../../../../central/system

Modified: avalon/trunk/runtime/util/extension/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/util/extension/impl/build.xml	(original)
+++ avalon/trunk/runtime/util/extension/impl/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-util-extension-impl" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/util/i18n/build.properties
==============================================================================
--- avalon/trunk/runtime/util/i18n/build.properties	(original)
+++ avalon/trunk/runtime/util/i18n/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-util-i18n
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/util/i18n/build.xml
==============================================================================
--- avalon/trunk/runtime/util/i18n/build.xml	(original)
+++ avalon/trunk/runtime/util/i18n/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-util-i18n" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/runtime/util/lifecycle/build.properties
==============================================================================
--- avalon/trunk/runtime/util/lifecycle/build.properties	(original)
+++ avalon/trunk/runtime/util/lifecycle/build.properties	Fri Jul  2 04:18:34 2004
@@ -1,3 +1,4 @@
 project.name = avalon-util-lifecycle
 project.src.main = java
-project.home = ../../../central/system
+project.home = ../..
+project.system = ../../../central/system

Modified: avalon/trunk/runtime/util/lifecycle/build.xml
==============================================================================
--- avalon/trunk/runtime/util/lifecycle/build.xml	(original)
+++ avalon/trunk/runtime/util/lifecycle/build.xml	Fri Jul  2 04:18:34 2004
@@ -2,5 +2,5 @@
 
 <project name="avalon-util-lifecycle" default="install" basedir=".">
   <property file="build.properties"/>
-  <import file="${project.home}/build/standard.xml"/>
+  <import file="${project.system}/build/standard.xml"/>
 </project>

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PrepareTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PrepareTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PrepareTask.java	Fri Jul  2 04:18:34 2004
@@ -76,7 +76,13 @@
         {
             log( "creating target directory" );
             mkDir( target );
-            mkDir( getContext().getTestDirectory() );
+        }
+
+        final File testBase = getContext().getTestDirectory();
+        if( !testBase.exists() )
+        {
+            log( "creating test directory" );
+            mkDir( testBase );
         }
 
         final File src = getContext().getSrcDirectory();

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org