DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Mon Mar 21 12:12:30 2005
New Revision: 2104

Removed:
   development/main/metro/activity/api/
   
development/main/metro/composition/api/src/main/net/dpml/composition/data/BlockIncludeDirective.java
   
development/main/metro/composition/api/src/main/net/dpml/composition/data/LibraryDirective.java
   
development/main/metro/composition/impl/src/main/net/dpml/composition/data/writer/XMLComponentProfileWriter.java
   
development/main/metro/composition/impl/src/main/net/dpml/composition/data/writer/XMLContainmentProfileWriter.java
Modified:
   
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java
   
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java
Log:
housekeepingRemove redundant directory level.

Modified: 
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java
==============================================================================
--- 
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java
        (original)
+++ 
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLContainmentProfileCreator.java
        Mon Mar 21 12:12:30 2005
@@ -26,7 +26,6 @@
 import net.dpml.composition.data.ExcludeDirective;
 import net.dpml.composition.data.FilesetDirective;
 import net.dpml.composition.data.IncludeDirective;
-import net.dpml.composition.data.LibraryDirective;
 import net.dpml.composition.data.MetaDataException;
 import net.dpml.composition.data.NamedComponentProfile;
 import net.dpml.composition.data.ServiceDirective;

Modified: 
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java
==============================================================================
--- 
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java
       (original)
+++ 
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContainmentModel.java
       Mon Mar 21 12:12:30 2005
@@ -32,7 +32,7 @@
 import java.util.List;
 
 import net.dpml.composition.data.BlockCompositionDirective;
-import net.dpml.composition.data.BlockIncludeDirective;
+//import net.dpml.composition.data.BlockIncludeDirective;
 import net.dpml.composition.data.ComponentProfile;
 import net.dpml.composition.data.ContainmentProfile;
 import net.dpml.composition.data.DeploymentProfile;
@@ -659,11 +659,6 @@
               createComponentProfile( (NamedComponentProfile) profile );
             model = createComponentModel( deployment );
         }
-        else if( profile instanceof BlockIncludeDirective )
-        {
-            BlockIncludeDirective directive = (BlockIncludeDirective) 
profile;
-            model = createContainmentModel( directive );
-        }
         else if( profile instanceof BlockCompositionDirective )
         {
             BlockCompositionDirective directive = 
(BlockCompositionDirective) profile;
@@ -1071,46 +1066,6 @@
 
    /**
     * Create a containment model that is derived from an external
-    * source profile defintion.
-    *
-    * @param directive the block include directive
-    * @return the containment model established by the include
-    */
-    private ContainmentModel createContainmentModel(
-      BlockIncludeDirective directive )
-      throws ModelException
-    {
-        final String name = directive.getName();
-        final String path = directive.getPath();
-
-        try
-        {
-            if( path.indexOf( ":" ) < 0 )
-            {
-                URL anchor =
-                  m_context.getSystemContext().getWorkingDirectory().toURL();
-                URL url = new URL( anchor, path );
-                return createContainmentModel( name, url );
-            }
-            else
-            {
-                URL url = new URL( path );
-                return createContainmentModel( name, url );
-            }
-        }
-        catch( MalformedURLException e )
-        {
-            final String error =
-              "Unable to include block [" + name
-              + "] into the containmment model ["
-              + getQualifiedName()
-              + "] because of a url related error.";
-            throw new ModelException( error, e );
-        }
-    }
-
-   /**
-    * Create a containment model that is derived from an external
     * source containment profile defintion.
     *
     * @param name the name of the containment model to be created.