DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Mon Mar 14 13:45:18 2005
New Revision: 2069

Added:
   
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/TypeBuilder.java
Removed:
   
development/laboratory/plus/api/builder/src/main/net/dpml/metro/builder/TypeBuilder.java
   
development/laboratory/plus/api/part/src/main/net/dpml/metro/part/Registry.java
   
development/laboratory/plus/api/part/src/main/net/dpml/metro/part/RegistryNotFoundException.java
   
development/laboratory/plus/api/part/src/main/net/dpml/metro/part/RegistryRuntimeException.java
   development/laboratory/plus/api/part/src/main/net/dpml/metro/part/Type.java
   
development/laboratory/plus/api/part/src/main/net/dpml/metro/part/TypeEntry.java
   
development/laboratory/plus/api/part/src/main/net/dpml/metro/part/TypeHandler.java
   
development/laboratory/plus/api/part/src/main/net/dpml/metro/part/TypeHandlerRuntimeException.java
   
development/laboratory/plus/api/part/src/main/net/dpml/metro/part/TypeNotFoundException.java
   
development/laboratory/plus/api/part/src/main/net/dpml/metro/part/TypeReference.java
Modified:
   
development/laboratory/plus/api/builder/src/main/net/dpml/metro/builder/Builder.java
   
development/laboratory/plus/api/builder/src/main/net/dpml/metro/builder/PartBuilder.java
   
development/laboratory/plus/api/kernel/src/main/net/dpml/metro/home/Home.java
   development/laboratory/plus/api/part/src/main/net/dpml/metro/part/Part.java
   
development/laboratory/plus/core/src/main/net/dpml/metro/home/impl/TransitHome.java
   
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/model/src/main/net/dpml/metro/meta/ComponentDescriptor.java
   
development/laboratory/plus/standard/model/src/main/net/dpml/metro/meta/ComponentTypeHandler.java
   
development/laboratory/plus/standard/model/src/main/net/dpml/metro/model/ComponentModel.java
Log:
move type concerns out of the part api

Modified: 
development/laboratory/plus/api/builder/src/main/net/dpml/metro/builder/Builder.java
==============================================================================
--- 
development/laboratory/plus/api/builder/src/main/net/dpml/metro/builder/Builder.java
        (original)
+++ 
development/laboratory/plus/api/builder/src/main/net/dpml/metro/builder/Builder.java
        Mon Mar 14 13:45:18 2005
@@ -20,8 +20,6 @@
 
 import java.net.URI;
 
-import net.dpml.metro.part.Type;
-
 /**
  * The contract for builders that create component part.
  *

Modified: 
development/laboratory/plus/api/builder/src/main/net/dpml/metro/builder/PartBuilder.java
==============================================================================
--- 
development/laboratory/plus/api/builder/src/main/net/dpml/metro/builder/PartBuilder.java
    (original)
+++ 
development/laboratory/plus/api/builder/src/main/net/dpml/metro/builder/PartBuilder.java
    Mon Mar 14 13:45:18 2005
@@ -22,9 +22,7 @@
 import java.io.IOException;
 
 import net.dpml.metro.part.Part;
-import net.dpml.metro.part.RegistryNotFoundException;
 import net.dpml.metro.part.BadStrategyException;
-import net.dpml.metro.part.TypeNotFoundException;
 
 /**
  * The contract for builders that create component part.
@@ -54,6 +52,6 @@
     */
     Part buildPart( ClassLoader classloader ) 
        throws IntrospectionException, IOException, ClassNotFoundException,
-       RegistryNotFoundException, BadStrategyException, 
TypeNotFoundException;
+       BadStrategyException;
 
 }

Modified: 
development/laboratory/plus/api/kernel/src/main/net/dpml/metro/home/Home.java
==============================================================================
--- 
development/laboratory/plus/api/kernel/src/main/net/dpml/metro/home/Home.java 
      (original)
+++ 
development/laboratory/plus/api/kernel/src/main/net/dpml/metro/home/Home.java 
      Mon Mar 14 13:45:18 2005
@@ -22,7 +22,6 @@
 import java.io.IOException;
 
 import net.dpml.metro.part.PartHandler;
-import net.dpml.metro.part.TypeHandler;
 
 /**
  * The Home interface defines operations supporting the resolution of 
@@ -33,8 +32,5 @@
  */
 public interface Home
 {
-    TypeHandler resolveTypeHandler( URI uri ) throws 
HandlerNotFoundException, IOException;
-
     PartHandler resolvePartHandler( URI uri ) throws 
HandlerNotFoundException, IOException;
-
 }

Modified: 
development/laboratory/plus/api/part/src/main/net/dpml/metro/part/Part.java
==============================================================================
--- 
development/laboratory/plus/api/part/src/main/net/dpml/metro/part/Part.java 
(original)
+++ 
development/laboratory/plus/api/part/src/main/net/dpml/metro/part/Part.java 
Mon Mar 14 13:45:18 2005
@@ -22,7 +22,7 @@
 import java.net.URI;
 
 /**
- * The common interface implemented by all component parts.
+ * The common interface implemented by all parts.
  *
  * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product 
Meta Library</a>
  * @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
@@ -30,12 +30,6 @@
 public interface Part extends Serializable
 {
   /**
-   * Return a reference to the type managed by this part.
-   * @return the type reference
-   */
-   TypeReference getTypeReference();
-
-  /**
    * Return an array of control descriptors associated with the part.
    * @return the control descriptor array
    */

Modified: 
development/laboratory/plus/core/src/main/net/dpml/metro/home/impl/TransitHome.java
==============================================================================
--- 
development/laboratory/plus/core/src/main/net/dpml/metro/home/impl/TransitHome.java
 (original)
+++ 
development/laboratory/plus/core/src/main/net/dpml/metro/home/impl/TransitHome.java
 Mon Mar 14 13:45:18 2005
@@ -27,10 +27,7 @@
 import net.dpml.metro.home.HandlerNotFoundException;
 import net.dpml.metro.home.HomeRuntimeException;
 import net.dpml.metro.part.PartHandler;
-import net.dpml.metro.part.TypeHandler;
 import net.dpml.metro.part.Handler;
-import net.dpml.metro.part.TypeHandler;
-import net.dpml.metro.part.PartHandler;
 
 import net.dpml.transit.repository.StandardLoader;
 import net.dpml.transit.TransitException;
@@ -62,12 +59,6 @@
         }
     }
 
-    public TypeHandler resolveTypeHandler( URI uri ) throws 
HandlerNotFoundException, IOException
-    {
-        Handler handler = resolveHandler( uri );
-        return (TypeHandler) handler;
-    }
-
     public PartHandler resolvePartHandler( URI uri ) throws 
HandlerNotFoundException, IOException
     {
         Handler handler = resolveHandler( uri );

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
    Mon Mar 14 13:45:18 2005
@@ -37,17 +37,18 @@
 
 import net.dpml.metro.builder.PartBuilder;
 import net.dpml.metro.builder.IntrospectionException;
+import net.dpml.metro.builder.BuilderRuntimeException;
 import net.dpml.metro.meta.PartDescriptor;
 import net.dpml.metro.meta.ComponentTypeHandler;
 import net.dpml.metro.part.Part;
 import net.dpml.metro.part.PartHolder;
-import net.dpml.metro.part.Registry;
-import net.dpml.metro.part.Type;
-import net.dpml.metro.part.TypeReference;
-import net.dpml.metro.part.TypeHandler;
-import net.dpml.metro.part.TypeNotFoundException;
-import net.dpml.metro.part.RegistryNotFoundException;
 import net.dpml.metro.part.BadStrategyException;
+import net.dpml.metro.type.Registry;
+import net.dpml.metro.type.Type;
+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.magic.tasks.ProjectTask;
 import net.dpml.magic.model.Resource;
@@ -127,10 +128,19 @@
     * @exception Exception if a construction error occurs
     */
     public Part buildPart( ClassLoader classloader ) 
-       throws IntrospectionException, IOException, ClassNotFoundException, 
RegistryNotFoundException,
-       BadStrategyException, TypeNotFoundException
+       throws IntrospectionException, IOException, ClassNotFoundException,
+       BadStrategyException
     {
-        return buildPart( classloader, null );
+        try
+        {
+            return buildPart( classloader, null );
+        }
+        catch( Throwable e )
+        {
+            final String error = 
+              "Part construction failure.";
+            throw new BuildException( error, e, getLocation() );
+        }
     }
 
    /**

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
     Mon Mar 14 13:45:18 2005
@@ -35,14 +35,13 @@
 import net.dpml.metro.meta.PartDescriptor;
 import net.dpml.metro.meta.InfoDescriptor;
 import net.dpml.metro.part.Part;
-import net.dpml.metro.part.Type;
 import net.dpml.metro.part.Descriptor;
-import net.dpml.metro.part.RegistryNotFoundException;
 import net.dpml.metro.part.BadStrategyException;
-import net.dpml.metro.part.TypeNotFoundException;
-import net.dpml.metro.builder.TypeBuilder;
 import net.dpml.metro.builder.PartBuilder;
 import net.dpml.metro.builder.IntrospectionException;
+import net.dpml.metro.type.Type;
+import net.dpml.metro.type.RegistryNotFoundException;
+import net.dpml.metro.type.TypeNotFoundException;
 
 import net.dpml.magic.model.Definition;
 import net.dpml.magic.project.Context;

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
 Mon Mar 14 13:45:18 2005
@@ -34,11 +34,13 @@
 import java.util.LinkedList;
 import java.util.ArrayList;
 
-import net.dpml.metro.part.Type;
-import net.dpml.metro.part.Registry;
-import net.dpml.metro.part.TypeEntry;
+import net.dpml.metro.type.Type;
+import net.dpml.metro.type.Registry;
+import net.dpml.metro.type.TypeEntry;
+
+import net.dpml.metro.builder.impl.TypeBuilder;
+
 import net.dpml.metro.builder.IntrospectionException;
-import net.dpml.metro.builder.TypeBuilder;
 
 import net.dpml.magic.tasks.ProjectTask;
 import net.dpml.magic.model.Policy;

Added: 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/TypeBuilder.java
==============================================================================
--- (empty file)
+++ 
development/laboratory/plus/standard/builder/src/main/net/dpml/metro/builder/impl/TypeBuilder.java
  Mon Mar 14 13:45:18 2005
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2005 Stephen J. McConnell
+ *
+ * Licensed  under the  Apache License,  Version 2.0  (the "License");
+ * you may not use  this file  except in  compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.builder.impl;
+
+import java.io.IOException;
+import java.net.URI;
+
+import net.dpml.metro.builder.Builder;
+import net.dpml.metro.builder.IntrospectionException;
+import net.dpml.metro.part.BadStrategyException;
+import net.dpml.metro.type.TypeNotFoundException;
+import net.dpml.metro.type.RegistryNotFoundException;
+import net.dpml.metro.type.Type;
+
+/**
+ * The contract for builders that create component part.
+ *
+ * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product 
Meta Library</a>
+ * @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
+ */
+public interface TypeBuilder extends Builder
+{
+   /**
+    * Return a urn identitifying the type handler for this builder.
+    *
+    * @return a uri identifing the type handler.
+    */
+    URI getTypeHandlerURI();
+
+   /**
+    * Build a part type.
+    * @return the serializable part type.
+    * @exception IntrospectionException if a introspection occurs during 
type construction
+    */
+    Type buildType( ClassLoader classloader ) 
+       throws IntrospectionException, IOException, ClassNotFoundException,
+        RegistryNotFoundException, BadStrategyException, 
TypeNotFoundException;
+
+}

Modified: 
development/laboratory/plus/standard/model/src/main/net/dpml/metro/meta/ComponentDescriptor.java
==============================================================================
--- 
development/laboratory/plus/standard/model/src/main/net/dpml/metro/meta/ComponentDescriptor.java
    (original)
+++ 
development/laboratory/plus/standard/model/src/main/net/dpml/metro/meta/ComponentDescriptor.java
    Mon Mar 14 13:45:18 2005
@@ -21,7 +21,7 @@
 import java.io.Serializable;
 import java.util.Properties;
 
-import net.dpml.metro.part.Type;
+import net.dpml.metro.type.Type;
 import net.dpml.metro.part.Descriptor;
 
 /**

Modified: 
development/laboratory/plus/standard/model/src/main/net/dpml/metro/meta/ComponentTypeHandler.java
==============================================================================
--- 
development/laboratory/plus/standard/model/src/main/net/dpml/metro/meta/ComponentTypeHandler.java
   (original)
+++ 
development/laboratory/plus/standard/model/src/main/net/dpml/metro/meta/ComponentTypeHandler.java
   Mon Mar 14 13:45:18 2005
@@ -26,14 +26,14 @@
 import java.net.URI;
 import java.net.URL;
 
-import net.dpml.metro.part.Type;
-import net.dpml.metro.part.TypeHandler;
-import net.dpml.metro.part.TypeHandlerRuntimeException;
-import net.dpml.metro.part.TypeReference;
-import net.dpml.metro.part.Registry;
+import net.dpml.metro.type.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.part.BadStrategyException;
-import net.dpml.metro.part.RegistryNotFoundException;
-import net.dpml.metro.part.TypeNotFoundException;
 
 import net.dpml.transit.artifact.Handler;
 

Modified: 
development/laboratory/plus/standard/model/src/main/net/dpml/metro/model/ComponentModel.java
==============================================================================
--- 
development/laboratory/plus/standard/model/src/main/net/dpml/metro/model/ComponentModel.java
        (original)
+++ 
development/laboratory/plus/standard/model/src/main/net/dpml/metro/model/ComponentModel.java
        Mon Mar 14 13:45:18 2005
@@ -22,8 +22,8 @@
 import java.net.URI;
 
 import net.dpml.metro.part.Part;
-import net.dpml.metro.part.TypeReference;
 import net.dpml.metro.part.ControlDescriptor;
+import net.dpml.metro.type.TypeReference;
 
 /**
  * The part directive is a directive that can be handled as a part within a