DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Sat Apr 23 02:19:12 2005
New Revision: 2372

Modified:
   
development/main/metro/classic/api/src/main/net/dpml/composition/model/ContainmentModel.java
   
development/main/metro/classic/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java
   development/main/metro/classic/unit/build.xml
   development/main/metro/index.xml
Log:
More separation in place but overlapping packages names need to be sorted.

Modified: 
development/main/metro/classic/api/src/main/net/dpml/composition/model/ContainmentModel.java
==============================================================================
--- 
development/main/metro/classic/api/src/main/net/dpml/composition/model/ContainmentModel.java
        (original)
+++ 
development/main/metro/classic/api/src/main/net/dpml/composition/model/ContainmentModel.java
        Sat Apr 23 02:19:12 2005
@@ -130,25 +130,6 @@
       throws AssemblyException;
 
    /**
-    * Addition of a new subsidiary deployment model using a supplied part 
uri.
-    *
-    * @param uri a part uri
-    * @return the model of the part
-    * @exception ModelException if an error occurs during model establishment
-    */
-    DeploymentModel addModel( URI uri ) throws ModelException;
-
-   /**
-    * Addition of a new subsidiary deployment model using a supplied part 
uri.
-    *
-    * @param name the name to assign to the deployment model
-    * @param uri a part uri
-    * @return the model of the part
-    * @exception ModelException if an error occurs during model establishment
-    */
-    DeploymentModel addModel( String name, URI uri ) throws ModelException;
-
-   /**
     * Addition of a new subsidiary containment model
     * using a supplied profile url.
     *

Modified: 
development/main/metro/classic/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java
==============================================================================
--- 
development/main/metro/classic/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java
   (original)
+++ 
development/main/metro/classic/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java
   Sat Apr 23 02:19:12 2005
@@ -65,8 +65,6 @@
 import net.dpml.composition.provider.ContainmentContext;
 import net.dpml.composition.provider.ModelFactory;
 
-import net.dpml.composition.control.CompositionPartHandler;
-
 import net.dpml.configuration.Configuration;
 import net.dpml.configuration.impl.DefaultConfigurationBuilder;
 
@@ -567,69 +565,6 @@
     }
 
    /**
-    * Addition of a new subsidiary deployment model using a supplied part 
uri.
-    *
-    * @param uri a part uri
-    * @return the model of the part
-    * @exception ModelException if an error occurs during model establishment
-    */
-    public DeploymentModel addModel( URI uri ) throws ModelException
-    {
-        return addModel( null, uri );
-    }
-
-   /**
-    * Addition of a new subsidiary deployment model using a supplied part 
uri.
-    *
-    * @param uri a part uri
-    * @return the model based on the derived profile
-    * @exception ModelException if an error occurs during model establishment
-    */
-    public DeploymentModel addModel( String name, URI uri ) throws 
ModelException
-    {
-        try
-        {
-            Logger logger = getLogger();
-            CompositionPartHandler handler = new CompositionPartHandler();
-            Part part = handler.loadPart( uri );
-            if( part instanceof DeploymentProfile )
-            {
-                DeploymentProfile profile = (DeploymentProfile) part;
-                DeploymentModel model = createDeploymentModel( name, profile 
);
-                return addModel( model );
-            }
-            else
-            {
-                final String error = 
-                  "Unknown part type ["
-                  + part.getClass().getName()
-                  + "]";
-                throw new ModelException( error );
-            }
-        }
-        catch( ArtifactNotFoundException e )
-        {
-            final String error =
-              "Part not found [" 
-              + uri 
-              + "].";
-            throw new ModelException( error, e );
-        }
-        catch( ModelException e )
-        {
-            throw e;
-        }
-        catch( Throwable e )
-        {
-            final String error = 
-              "Unexpected error while attempting to add a model using the ["
-              + uri
-              + "]";
-            throw new ModelException( error, e );
-        }
-    }
-
-   /**
     * Addition of a new subsidiary model within
     * the containment context.
     *

Modified: development/main/metro/classic/unit/build.xml
==============================================================================
--- development/main/metro/classic/unit/build.xml       (original)
+++ development/main/metro/classic/unit/build.xml       Sat Apr 23 02:19:12 
2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="dpml-metro-unit" default="install" basedir="."
+<project name="dpml-classic-unit" 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"/>

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml    (original)
+++ development/main/metro/index.xml    Sat Apr 23 02:19:12 2005
@@ -380,7 +380,6 @@
       <include key="dpml-util-cli"/>
       <include key="dpml-activation-impl" build="false"/>
       <include key="dpml-test-playground" build="false"/>
-      <include key="dpml-composition-control"/>
     </dependencies>
   </project>