svn commit: rev 46326 - in avalon/trunk/central/laboratory/studio: . core/java docs docs/src/main docs/src/main/org docs/src/org event event/api event/impl features launch launch/src/main launch/src/main/org launch/src/org launch/src/test launch/src/test/org launch/test/org magic test test/main test/src/main test/src/main/org test/src/org ui ui/src/main ui/src/main/org ui/src/org ui/src/test ui/src/test/org ui/test/org

[email protected] 19 Sep 2004 10:01:27 -0000
Newsgroups gmane.comp.jakarta.avalon.cvs
Message-ID <[email protected]>
Author: niclas
Date: Sun Sep 19 03:01:27 2004
New Revision: 46326

Added:
   avalon/trunk/central/laboratory/studio/docs/src/main/
   avalon/trunk/central/laboratory/studio/docs/src/main/org/
      - copied from rev 46302, avalon/trunk/central/laboratory/studio/docs/src/org/
   avalon/trunk/central/laboratory/studio/launch/src/main/
   avalon/trunk/central/laboratory/studio/launch/src/main/org/
      - copied from rev 46302, avalon/trunk/central/laboratory/studio/launch/src/org/
   avalon/trunk/central/laboratory/studio/launch/src/test/
   avalon/trunk/central/laboratory/studio/launch/src/test/org/
      - copied from rev 46302, avalon/trunk/central/laboratory/studio/launch/test/org/
   avalon/trunk/central/laboratory/studio/test/main/
   avalon/trunk/central/laboratory/studio/test/src/main/
   avalon/trunk/central/laboratory/studio/test/src/main/org/
      - copied from rev 46302, avalon/trunk/central/laboratory/studio/test/src/org/
   avalon/trunk/central/laboratory/studio/ui/src/main/
   avalon/trunk/central/laboratory/studio/ui/src/main/org/
      - copied from rev 46302, avalon/trunk/central/laboratory/studio/ui/src/org/
   avalon/trunk/central/laboratory/studio/ui/src/test/
   avalon/trunk/central/laboratory/studio/ui/src/test/org/
      - copied from rev 46302, avalon/trunk/central/laboratory/studio/ui/test/org/
Removed:
   avalon/trunk/central/laboratory/studio/core/java/project.properties
   avalon/trunk/central/laboratory/studio/docs/project.properties
   avalon/trunk/central/laboratory/studio/docs/src/org/
   avalon/trunk/central/laboratory/studio/event/api/project.properties
   avalon/trunk/central/laboratory/studio/event/impl/project.properties
   avalon/trunk/central/laboratory/studio/event/project.properties
   avalon/trunk/central/laboratory/studio/features/project.properties
   avalon/trunk/central/laboratory/studio/launch/project.properties
   avalon/trunk/central/laboratory/studio/launch/src/org/
   avalon/trunk/central/laboratory/studio/launch/test/org/
   avalon/trunk/central/laboratory/studio/magic/project.properties
   avalon/trunk/central/laboratory/studio/test/project.properties
   avalon/trunk/central/laboratory/studio/test/src/org/
   avalon/trunk/central/laboratory/studio/ui/project.properties
   avalon/trunk/central/laboratory/studio/ui/src/org/
   avalon/trunk/central/laboratory/studio/ui/test/org/
Modified:
   avalon/trunk/central/laboratory/studio/build.xml
   avalon/trunk/central/laboratory/studio/core/java/build.xml
   avalon/trunk/central/laboratory/studio/docs/build.xml
   avalon/trunk/central/laboratory/studio/event/api/build.xml
   avalon/trunk/central/laboratory/studio/event/build.xml
   avalon/trunk/central/laboratory/studio/event/impl/build.xml
   avalon/trunk/central/laboratory/studio/features/build.xml
   avalon/trunk/central/laboratory/studio/launch/build.xml
   avalon/trunk/central/laboratory/studio/magic/build.xml
   avalon/trunk/central/laboratory/studio/test/build.xml
   avalon/trunk/central/laboratory/studio/ui/build.xml
Log:
Reorganization into better Magic citizens.

Modified: avalon/trunk/central/laboratory/studio/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/build.xml	(original)
+++ avalon/trunk/central/laboratory/studio/build.xml	Sun Sep 19 03:01:27 2004
@@ -3,9 +3,7 @@
 <project name="metro-studio-eclipse" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <property name="project.system" value="../../system/build" />
-
   <x:home index="index.xml"/>
-  <import file="${project.system}/default/reactor.xml"/>
+  <import file="${magic.templates}/default/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/central/laboratory/studio/core/java/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/core/java/build.xml	(original)
+++ avalon/trunk/central/laboratory/studio/core/java/build.xml	Sun Sep 19 03:01:27 2004
@@ -7,6 +7,6 @@
   <property file="project.properties" />
   
   <x:home index="../index.xml"/>
-  <import file="${project.system}/default/standard.xml"/>
+  <import file="${magic.templates}/standard.xml"/>
   
 </project>

Modified: avalon/trunk/central/laboratory/studio/docs/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/docs/build.xml	(original)
+++ avalon/trunk/central/laboratory/studio/docs/build.xml	Sun Sep 19 03:01:27 2004
@@ -6,6 +6,6 @@
   <property file="project.properties" />
   
   <x:home index="../index.xml"/>
-  <import file="${project.system}/default/standard.xml"/>
+  <import file="${magic.templates}/standard.xml"/>
   
 </project>

Modified: avalon/trunk/central/laboratory/studio/event/api/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/event/api/build.xml	(original)
+++ avalon/trunk/central/laboratory/studio/event/api/build.xml	Sun Sep 19 03:01:27 2004
@@ -6,6 +6,6 @@
   <property file="project.properties" />
   
   <x:home index="${project.home}/index.xml"/>
-  <import file="${project.system}/default/standard.xml"/>
+  <import file="${magic.templates}/standard.xml"/>
   
 </project>

Modified: avalon/trunk/central/laboratory/studio/event/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/event/build.xml	(original)
+++ avalon/trunk/central/laboratory/studio/event/build.xml	Sun Sep 19 03:01:27 2004
@@ -3,9 +3,7 @@
 <project name="metro-studio-event" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <property name="project.system" value="../../../system/build" />
-
   <x:home index="../index.xml"/>
-  <import file="${project.system}/default/reactor.xml"/>
+  <import file="${magic.templates}/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/central/laboratory/studio/event/impl/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/event/impl/build.xml	(original)
+++ avalon/trunk/central/laboratory/studio/event/impl/build.xml	Sun Sep 19 03:01:27 2004
@@ -6,6 +6,6 @@
   <property file="project.properties" />
   
   <x:home index="${project.home}/index.xml"/>
-  <import file="${project.system}/default/standard.xml"/>
+  <import file="${magic.templates}/standard.xml"/>
   
 </project>

Modified: avalon/trunk/central/laboratory/studio/features/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/features/build.xml	(original)
+++ avalon/trunk/central/laboratory/studio/features/build.xml	Sun Sep 19 03:01:27 2004
@@ -6,6 +6,6 @@
   <property file="project.properties" />
   
   <x:home index="../index.xml"/>
-  <import file="${project.system}/default/standard.xml"/>
+  <import file="${magic.templates}/standard.xml"/>
   
 </project>

Modified: avalon/trunk/central/laboratory/studio/launch/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/launch/build.xml	(original)
+++ avalon/trunk/central/laboratory/studio/launch/build.xml	Sun Sep 19 03:01:27 2004
@@ -6,6 +6,6 @@
   <property file="project.properties" />
   
   <x:home index="../index.xml"/>
-  <import file="${project.system}/default/standard.xml"/>
+  <import file="${magic.templates}/standard.xml"/>
   
 </project>

Modified: avalon/trunk/central/laboratory/studio/magic/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/magic/build.xml	(original)
+++ avalon/trunk/central/laboratory/studio/magic/build.xml	Sun Sep 19 03:01:27 2004
@@ -7,7 +7,7 @@
   <property file="project.properties" />
   
   <x:home index="../index.xml"/>
-  <import file="${project.system}/default/standard.xml"/>
+  <import file="${magic.templates}/standard.xml"/>
   
   <target name="build" depends="standard.build">
     <x:declare/>

Modified: avalon/trunk/central/laboratory/studio/test/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/test/build.xml	(original)
+++ avalon/trunk/central/laboratory/studio/test/build.xml	Sun Sep 19 03:01:27 2004
@@ -6,6 +6,6 @@
   <property file="project.properties" />
   
   <x:home index="../index.xml"/>
-  <import file="${project.system}/default/standard.xml"/>
+  <import file="${magic.templates}/standard.xml"/>
   
 </project>

Modified: avalon/trunk/central/laboratory/studio/ui/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/ui/build.xml	(original)
+++ avalon/trunk/central/laboratory/studio/ui/build.xml	Sun Sep 19 03:01:27 2004
@@ -6,6 +6,6 @@
   <property file="project.properties" />
   
   <x:home index="../index.xml"/>
-  <import file="${project.system}/default/standard.xml"/>
+  <import file="${magic.templates}/standard.xml"/>
   
 </project>