DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Thu Mar 10 15:19:37 2005
New Revision: 2007

Added:
   development/laboratory/plus/metro/builder/src/main/net/dpml/metro/
      - copied from r2005, 
development/laboratory/plus/metro/builder/src/main/net/dpml/composition/
   development/laboratory/plus/metro/control/src/main/net/dpml/metro/
      - copied from r2005, 
development/laboratory/plus/metro/control/src/main/net/dpml/composition/
   development/laboratory/plus/metro/model/src/main/net/dpml/metro/
      - copied from r2005, 
development/laboratory/plus/metro/model/src/main/net/dpml/composition/
   development/laboratory/plus/metro/model/src/test/net/dpml/metro/
      - copied from r2005, 
development/laboratory/plus/metro/model/src/test/net/dpml/composition/
Removed:
   development/laboratory/plus/metro/builder/src/main/net/dpml/composition/
   development/laboratory/plus/metro/control/src/main/net/dpml/composition/
   development/laboratory/plus/metro/model/src/main/net/dpml/composition/
   development/laboratory/plus/metro/model/src/test/net/dpml/composition/
Modified:
   development/laboratory/plus/metro/build.xml
   development/laboratory/plus/metro/builder/build.xml
   
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/BuilderComponent.java
   
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/ComponentModelBuilder.java
   
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/ConstructionException.java
   
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/PartsDataType.java
   
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/antlib.xml
   development/laboratory/plus/metro/control/build.xml
   
development/laboratory/plus/metro/control/src/main/net/dpml/metro/control/DefaultController.java
   development/laboratory/plus/metro/model/build.xml
   
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/ClassLoaderModel.java
   
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/ComponentModel.java
   
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/Model.java
   
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/PartModel.java
   
development/laboratory/plus/metro/model/src/test/net/dpml/metro/model/ComponentModelTestCase.java
   
development/laboratory/plus/metro/model/src/test/net/dpml/metro/model/PartModelTestCase.java
Log:


Modified: development/laboratory/plus/metro/build.xml
==============================================================================
--- development/laboratory/plus/metro/build.xml (original)
+++ development/laboratory/plus/metro/build.xml Thu Mar 10 15:19:37 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="dpml-composition" default="default" basedir="."
+<project name="dpml-metro" default="default" basedir="."
     xmlns:transit="antlib:net.dpml.transit">
 
   <transit:import uri="artifact:template:dpml/magic/reactor"/>

Modified: development/laboratory/plus/metro/builder/build.xml
==============================================================================
--- development/laboratory/plus/metro/builder/build.xml (original)
+++ development/laboratory/plus/metro/builder/build.xml Thu Mar 10 15:19:37 
2005
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="dpml-composition-builder" default="install" basedir="."
+<project name="dpml-metro-builder" default="install" basedir="."
     xmlns:transit="antlib:net.dpml.transit" 
     xmlns:x="plugin:dpml/magic/dpml-magic-core">
 
   <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <target name="init" depends="standard.init">
-    <x:filter key="dpml-composition-control" feature="plugin" 
token="CONTROLLER-URI"/>
+    <x:filter key="dpml-metro-control" feature="plugin" 
token="CONTROLLER-URI"/>
   </target>
 
   <target name="package" depends="standard.package">
     <x:export>
-      <antlib resource="net/dpml/composition/builder/antlib.xml" 
-        urn="plugin:dpml/metro/dpml-composition-builder"/>
+      <antlib resource="net/dpml/metro/builder/antlib.xml" 
+        urn="plugin:dpml/metro/dpml-metro-builder"/>
     </x:export>
   </target>
 

Modified: 
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/BuilderComponent.java
==============================================================================
--- 
development/laboratory/plus/metro/builder/src/main/net/dpml/composition/builder/BuilderComponent.java
       (original)
+++ 
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/BuilderComponent.java
     Thu Mar 10 15:19:37 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.composition.builder;
+package net.dpml.metro.builder;
 
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.Location;

Modified: 
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/ComponentModelBuilder.java
==============================================================================
--- 
development/laboratory/plus/metro/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
  (original)
+++ 
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/ComponentModelBuilder.java
        Thu Mar 10 15:19:37 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.composition.builder;
+package net.dpml.metro.builder;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -31,8 +31,8 @@
 import java.util.LinkedList;
 import java.util.ArrayList;
 
-import net.dpml.composition.model.ComponentModel;
-import net.dpml.composition.model.ClassLoaderModel;
+import net.dpml.metro.model.ComponentModel;
+import net.dpml.metro.model.ClassLoaderModel;
 
 import net.dpml.metro.part.Part;
 import net.dpml.metro.part.PartEnvelope;

Modified: 
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/ConstructionException.java
==============================================================================
--- 
development/laboratory/plus/metro/builder/src/main/net/dpml/composition/builder/ConstructionException.java
  (original)
+++ 
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/ConstructionException.java
        Thu Mar 10 15:19:37 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.composition.builder;
+package net.dpml.metro.builder;
 
 import java.net.URI;
 

Modified: 
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/PartsDataType.java
==============================================================================
--- 
development/laboratory/plus/metro/builder/src/main/net/dpml/composition/builder/PartsDataType.java
  (original)
+++ 
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/PartsDataType.java
        Thu Mar 10 15:19:37 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.composition.builder;
+package net.dpml.metro.builder;
 
 import java.util.List;
 import java.util.LinkedList;

Modified: 
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/antlib.xml
==============================================================================
--- 
development/laboratory/plus/metro/builder/src/main/net/dpml/composition/builder/antlib.xml
  (original)
+++ 
development/laboratory/plus/metro/builder/src/main/net/dpml/metro/builder/antlib.xml
        Thu Mar 10 15:19:37 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 
 <antlib>
-  <taskdef name="component" 
classname="net.dpml.composition.builder.ComponentModelBuilder"/>
+  <taskdef name="component" 
classname="net.dpml.metro.builder.ComponentModelBuilder"/>
 </antlib>

Modified: development/laboratory/plus/metro/control/build.xml
==============================================================================
--- development/laboratory/plus/metro/control/build.xml (original)
+++ development/laboratory/plus/metro/control/build.xml Thu Mar 10 15:19:37 
2005
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="dpml-composition-control" default="install" basedir="."
+<project name="dpml-metro-control" default="install" basedir="."
     xmlns:transit="antlib:net.dpml.transit" 
     xmlns:x="plugin:dpml/magic/dpml-magic-core">
 
   <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <target name="package" depends="standard.package">
-    <x:export class="net.dpml.composition.control.DefaultController"/>
+    <x:export class="net.dpml.metro.control.DefaultController"/>
   </target>
 
 </project>

Modified: 
development/laboratory/plus/metro/control/src/main/net/dpml/metro/control/DefaultController.java
==============================================================================
--- 
development/laboratory/plus/metro/control/src/main/net/dpml/composition/control/DefaultController.java
      (original)
+++ 
development/laboratory/plus/metro/control/src/main/net/dpml/metro/control/DefaultController.java
    Thu Mar 10 15:19:37 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.composition.control;
+package net.dpml.metro.control;
 
 import java.net.URI;
 

Modified: development/laboratory/plus/metro/model/build.xml
==============================================================================
--- development/laboratory/plus/metro/model/build.xml   (original)
+++ development/laboratory/plus/metro/model/build.xml   Thu Mar 10 15:19:37 
2005
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="dpml-composition-model" default="install" basedir="."
+<project name="dpml-metro-model" default="install" basedir="."
     xmlns:transit="antlib:net.dpml.transit" 
     xmlns:x="plugin:dpml/magic/dpml-magic-core">
 
   <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <target name="init" depends="standard.init">
-    <x:filter key="dpml-composition-control" feature="plugin" 
token="STRATEGY-URI"/>
+    <x:filter key="dpml-metro-control" feature="plugin" 
token="STRATEGY-URI"/>
   </target>
 
   <target name="package" depends="standard.package">
     <x:export>
-      <antlib resource="net/dpml/composition/model/antlib.xml" 
-        urn="plugin:dpml/metro/dpml-composition-model"/>
+      <antlib resource="net/dpml/metro/model/antlib.xml" 
+        urn="plugin:dpml/metro/dpml-metro-model"/>
     </x:export>
   </target>
 

Modified: 
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/ClassLoaderModel.java
==============================================================================
--- 
development/laboratory/plus/metro/model/src/main/net/dpml/composition/model/ClassLoaderModel.java
   (original)
+++ 
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/ClassLoaderModel.java
 Thu Mar 10 15:19:37 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.composition.model;
+package net.dpml.metro.model;
 
 import java.io.Serializable;
 import java.net.URI;

Modified: 
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/ComponentModel.java
==============================================================================
--- 
development/laboratory/plus/metro/model/src/main/net/dpml/composition/model/ComponentModel.java
     (original)
+++ 
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/ComponentModel.java
   Thu Mar 10 15:19:37 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.composition.model;
+package net.dpml.metro.model;
 
 import java.io.Serializable;
 

Modified: 
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/Model.java
==============================================================================
--- 
development/laboratory/plus/metro/model/src/main/net/dpml/composition/model/Model.java
      (original)
+++ 
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/Model.java
    Thu Mar 10 15:19:37 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.composition.model;
+package net.dpml.metro.model;
 
 import java.io.Serializable;
 

Modified: 
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/PartModel.java
==============================================================================
--- 
development/laboratory/plus/metro/model/src/main/net/dpml/composition/model/PartModel.java
  (original)
+++ 
development/laboratory/plus/metro/model/src/main/net/dpml/metro/model/PartModel.java
        Thu Mar 10 15:19:37 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.composition.model;
+package net.dpml.metro.model;
 
 import java.net.URI;
 

Modified: 
development/laboratory/plus/metro/model/src/test/net/dpml/metro/model/ComponentModelTestCase.java
==============================================================================
--- 
development/laboratory/plus/metro/model/src/test/net/dpml/composition/model/ComponentModelTestCase.java
     (original)
+++ 
development/laboratory/plus/metro/model/src/test/net/dpml/metro/model/ComponentModelTestCase.java
   Thu Mar 10 15:19:37 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.composition.model;
+package net.dpml.metro.model;
 
 import java.io.File;
 import java.io.FileInputStream;

Modified: 
development/laboratory/plus/metro/model/src/test/net/dpml/metro/model/PartModelTestCase.java
==============================================================================
--- 
development/laboratory/plus/metro/model/src/test/net/dpml/composition/model/PartModelTestCase.java
  (original)
+++ 
development/laboratory/plus/metro/model/src/test/net/dpml/metro/model/PartModelTestCase.java
        Thu Mar 10 15:19:37 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.composition.model;
+package net.dpml.metro.model;
 
 import java.io.Serializable;