DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Tue Mar 15 03:36:18 2005
New Revision: 2078

Added:
   development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/
      - copied from r2076, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/
   
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/ComponentTypeHandler.java
      - copied, changed from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/ComponentTypeHandler.java
   
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/Registry.java
      - copied, changed from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/Registry.java
   
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/RegistryNotFoundException.java
      - copied, changed from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/RegistryNotFoundException.java
   
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/RegistryRuntimeException.java
      - copied, changed from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/RegistryRuntimeException.java
   
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeEntry.java
      - copied, changed from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeEntry.java
   
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeHandler.java
      - copied, changed from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeHandler.java
   
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeHandlerRuntimeException.java
      - copied, changed from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeHandlerRuntimeException.java
   
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeNotFoundException.java
      - copied, changed from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeNotFoundException.java
   
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeReference.java
      - copied, changed from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeReference.java
Removed:
   development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/
Modified:
   development/laboratory/plus/build.xml
   
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/ComponentModelBuilderTask.java
   
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/ComponentTypeBuilderTask.java
   
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/RegistryTask.java
   
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/TypeBuilder.java
   
development/laboratory/plus/standard/control/src/main/net/dpml/metro/control/impl/ComponentPartHandler.java
Log:


Modified: development/laboratory/plus/build.xml
==============================================================================
--- development/laboratory/plus/build.xml       (original)
+++ development/laboratory/plus/build.xml       Tue Mar 15 03:36:18 2005
@@ -6,7 +6,7 @@
   <transit:import uri="artifact:template:dpml/magic/reactor"/>
 
   <target name="patch">
-    <replace token="net.dpml.metro.type" value="net.dpml.metro.catalog" 
includes="**/*.java"/>
+    <replace token="net.dpml.metro.meta" value="net.dpml.metro.type" 
includes="**/*.java" dir="."/>
   </target>
 
 </project>

Modified: 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/ComponentModelBuilderTask.java
==============================================================================
--- 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/ComponentModelBuilderTask.java
    (original)
+++ 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/ComponentModelBuilderTask.java
    Tue Mar 15 03:36:18 2005
@@ -48,12 +48,12 @@
 import net.dpml.metro.meta.PartDescriptor;
 import net.dpml.metro.meta.Type;
 
-import net.dpml.metro.type.Registry;
-import net.dpml.metro.type.TypeReference;
-import net.dpml.metro.type.TypeHandler;
-import net.dpml.metro.type.TypeNotFoundException;
-import net.dpml.metro.type.RegistryNotFoundException;
-import net.dpml.metro.type.ComponentTypeHandler;
+import net.dpml.metro.catalog.Registry;
+import net.dpml.metro.catalog.TypeReference;
+import net.dpml.metro.catalog.TypeHandler;
+import net.dpml.metro.catalog.TypeNotFoundException;
+import net.dpml.metro.catalog.RegistryNotFoundException;
+import net.dpml.metro.catalog.ComponentTypeHandler;
 
 import net.dpml.magic.tasks.ProjectTask;
 import net.dpml.magic.model.Resource;

Modified: 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/ComponentTypeBuilderTask.java
==============================================================================
--- 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/ComponentTypeBuilderTask.java
     (original)
+++ 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/ComponentTypeBuilderTask.java
     Tue Mar 15 03:36:18 2005
@@ -41,8 +41,8 @@
 import net.dpml.metro.builder.PartBuilder;
 import net.dpml.metro.builder.IntrospectionException;
 
-import net.dpml.metro.type.RegistryNotFoundException;
-import net.dpml.metro.type.TypeNotFoundException;
+import net.dpml.metro.catalog.RegistryNotFoundException;
+import net.dpml.metro.catalog.TypeNotFoundException;
 
 import net.dpml.metro.control.BadStrategyException;
 

Modified: 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/RegistryTask.java
==============================================================================
--- 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/RegistryTask.java
 (original)
+++ 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/RegistryTask.java
 Tue Mar 15 03:36:18 2005
@@ -36,8 +36,8 @@
 
 import net.dpml.metro.meta.Type;
 
-import net.dpml.metro.type.Registry;
-import net.dpml.metro.type.TypeEntry;
+import net.dpml.metro.catalog.Registry;
+import net.dpml.metro.catalog.TypeEntry;
 
 import net.dpml.metro.builder.impl.TypeBuilder;
 

Modified: 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/TypeBuilder.java
==============================================================================
--- 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/TypeBuilder.java
  (original)
+++ 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/TypeBuilder.java
  Tue Mar 15 03:36:18 2005
@@ -27,8 +27,8 @@
 import net.dpml.metro.control.BadStrategyException;
 
 import net.dpml.metro.meta.Type;
-import net.dpml.metro.type.TypeNotFoundException;
-import net.dpml.metro.type.RegistryNotFoundException;
+import net.dpml.metro.catalog.TypeNotFoundException;
+import net.dpml.metro.catalog.RegistryNotFoundException;
 
 /**
  * The contract for builders that create component part.

Modified: 
development/laboratory/plus/standard/control/src/main/net/dpml/metro/control/impl/ComponentPartHandler.java
==============================================================================
--- 
development/laboratory/plus/standard/control/src/main/net/dpml/metro/control/impl/ComponentPartHandler.java
 (original)
+++ 
development/laboratory/plus/standard/control/src/main/net/dpml/metro/control/impl/ComponentPartHandler.java
 Tue Mar 15 03:36:18 2005
@@ -37,7 +37,7 @@
 import net.dpml.metro.control.HandlerNotFoundException;
 import net.dpml.metro.control.DelegationException;
 
-import net.dpml.metro.type.ComponentTypeHandler;
+import net.dpml.metro.catalog.ComponentTypeHandler;
 
 import net.dpml.transit.artifact.Handler;
 import net.dpml.transit.repository.StandardLoader;

Copied: 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/ComponentTypeHandler.java
 (from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/ComponentTypeHandler.java)
==============================================================================
--- 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/ComponentTypeHandler.java
    (original)
+++ 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/ComponentTypeHandler.java
 Tue Mar 15 03:36:18 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.metro.type;
+package net.dpml.metro.catalog;
 
 import java.io.InputStream;
 import java.io.IOException;
@@ -28,12 +28,12 @@
 
 import net.dpml.metro.meta.Type;
 
-import net.dpml.metro.type.TypeHandler;
-import net.dpml.metro.type.TypeHandlerRuntimeException;
-import net.dpml.metro.type.TypeReference;
-import net.dpml.metro.type.Registry;
-import net.dpml.metro.type.RegistryNotFoundException;
-import net.dpml.metro.type.TypeNotFoundException;
+import net.dpml.metro.catalog.TypeHandler;
+import net.dpml.metro.catalog.TypeHandlerRuntimeException;
+import net.dpml.metro.catalog.TypeReference;
+import net.dpml.metro.catalog.Registry;
+import net.dpml.metro.catalog.RegistryNotFoundException;
+import net.dpml.metro.catalog.TypeNotFoundException;
 
 import net.dpml.metro.control.BadStrategyException;
 

Copied: 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/Registry.java
 (from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/Registry.java)
==============================================================================
--- 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/Registry.java
        (original)
+++ 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/Registry.java
     Tue Mar 15 03:36:18 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.metro.type;
+package net.dpml.metro.catalog;
 
 import java.io.InputStream;
 import java.io.IOException;

Copied: 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/RegistryNotFoundException.java
 (from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/RegistryNotFoundException.java)
==============================================================================
--- 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/RegistryNotFoundException.java
       (original)
+++ 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/RegistryNotFoundException.java
    Tue Mar 15 03:36:18 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.metro.type;
+package net.dpml.metro.catalog;
 
 import java.net.URL;
 

Copied: 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/RegistryRuntimeException.java
 (from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/RegistryRuntimeException.java)
==============================================================================
--- 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/RegistryRuntimeException.java
        (original)
+++ 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/RegistryRuntimeException.java
     Tue Mar 15 03:36:18 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.metro.type;
+package net.dpml.metro.catalog;
 
 /**
  * Unexpected runtime exception indicating an interanl registry error.

Copied: 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeEntry.java
 (from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeEntry.java)
==============================================================================
--- 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeEntry.java
       (original)
+++ 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeEntry.java
    Tue Mar 15 03:36:18 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.metro.type;
+package net.dpml.metro.catalog;
 
 import java.io.Serializable;
 import java.io.InputStream;

Copied: 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeHandler.java
 (from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeHandler.java)
==============================================================================
--- 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeHandler.java
     (original)
+++ 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeHandler.java
  Tue Mar 15 03:36:18 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.metro.type;
+package net.dpml.metro.catalog;
 
 import java.io.InputStream;
 import java.io.IOException;

Copied: 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeHandlerRuntimeException.java
 (from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeHandlerRuntimeException.java)
==============================================================================
--- 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeHandlerRuntimeException.java
     (original)
+++ 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeHandlerRuntimeException.java
  Tue Mar 15 03:36:18 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.metro.type;
+package net.dpml.metro.catalog;
 
 /**
  * Unexpected runtime exception indicating an internal type handler error.

Copied: 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeNotFoundException.java
 (from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeNotFoundException.java)
==============================================================================
--- 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeNotFoundException.java
   (original)
+++ 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeNotFoundException.java
        Tue Mar 15 03:36:18 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.metro.type;
+package net.dpml.metro.catalog;
 
 /**
  * Exception thrown when an attempt is made to reference an unknown catalog 
entry.

Copied: 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeReference.java
 (from r2077, 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeReference.java)
==============================================================================
--- 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/type/TypeReference.java
   (original)
+++ 
development/laboratory/plus/standard/part/src/main/net/dpml/metro/catalog/TypeReference.java
        Tue Mar 15 03:36:18 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.metro.type;
+package net.dpml.metro.catalog;
 
 import java.net.URI;
 import java.util.Properties;