DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Sun Jul  3 04:32:41 2005
New Revision: 2960

Removed:
   
development/main/metro/composition/control/src/main/net/dpml/composition/data/Mode.java
Modified:
   
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java
   
development/main/metro/composition/control/src/main/net/dpml/composition/data/ComponentProfile.java
   
development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java
Log:
Remove the notion of creation mode from the component deployment profile.

Modified: 
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java
==============================================================================
--- 
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java
  (original)
+++ 
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java
  Sun Jul  3 04:32:41 2005
@@ -44,7 +44,6 @@
 import net.dpml.composition.data.ContextDirective;
 import net.dpml.composition.data.DeploymentProfile;
 import net.dpml.composition.data.CategoriesDirective;
-import net.dpml.composition.data.Mode;
 import net.dpml.composition.info.EntryDescriptor;
 import net.dpml.composition.info.InfoDescriptor;
 import net.dpml.composition.info.Type;
@@ -438,7 +437,6 @@
         String lifestyle = getLifestylePolicy( type ); 
         int collection = getCollectionPolicy( type );
         int activation = getActivationPolicy();
-        Mode mode = Mode.EXPLICIT;
         CategoriesDirective categories = getCategoriesDirective();
         ContextDirective context = getContextDirective( classloader, type );
         PartReference[] parts = getParts( classloader, type );
@@ -451,7 +449,7 @@
 
         return new ComponentProfile( 
           id, activation, collection, lifestyle, classname, categories, 
context, 
-          parts, parameters, configuration, cld, mode );
+          parts, parameters, configuration, cld );
     }
 
    /**

Modified: 
development/main/metro/composition/control/src/main/net/dpml/composition/data/ComponentProfile.java
==============================================================================
--- 
development/main/metro/composition/control/src/main/net/dpml/composition/data/ComponentProfile.java
 (original)
+++ 
development/main/metro/composition/control/src/main/net/dpml/composition/data/ComponentProfile.java
 Sun Jul  3 04:32:41 2005
@@ -140,8 +140,7 @@
     
//--------------------------------------------------------------------------
 
    /**
-    * Creation of a new profile using IMPLICT mode and LIBERAL collection
-    * policies.
+    * Creation of a new profile.
     *
     * @param name the name to assign to the component deployment scenario
     * @param classname the classname of the component type
@@ -155,8 +154,7 @@
           InfoDescriptor.UNDEFINED_COLLECTION, 
           "request", 
           classname, 
-          null, null, null, null, null, null, 
-          Mode.IMPLICIT );
+          null, null, null, null, null, null );
     }
 
    /**
@@ -178,8 +176,7 @@
           template.getParts(),
           template.getParameters(),
           template.getConfiguration(),
-          template.getClassLoaderDirective(),
-          Mode.EXPLICIT );
+          template.getClassLoaderDirective() );
     }
 
     public ComponentProfile(
@@ -193,11 +190,10 @@
            final PartReference[] parts,
            final Parameters parameters,
            final Configuration config,
-           final ClassLoaderDirective classloader,
-           final Mode mode )
+           final ClassLoaderDirective classloader )
         throws NullPointerException
     {
-        super( name, activation, mode, categories, classloader );
+        super( name, activation, categories, classloader );
 
         if( null == classname )
         {

Modified: 
development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java
==============================================================================
--- 
development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java
        (original)
+++ 
development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java
        Sun Jul  3 04:32:41 2005
@@ -74,11 +74,6 @@
     private final int m_activation;
 
    /**
-    * The mode under which this profile was established.
-    */
-    private final Mode m_mode;
-
-   /**
     * Logging category directives.
     */
     private final CategoriesDirective m_categories;
@@ -100,9 +95,9 @@
     * @param categories logging category directives
     */
     public DeploymentProfile( 
-      final String name, int activation, Mode mode, CategoriesDirective 
categories ) 
+      final String name, int activation, CategoriesDirective categories ) 
     {
-        this( name, activation, mode, categories, null );
+        this( name, activation, categories, null );
     }
 
    /**
@@ -113,7 +108,7 @@
     * @param categories logging category directives
     */
     public DeploymentProfile( 
-      final String name, int activation, Mode mode, CategoriesDirective 
categories, ClassLoaderDirective classloader ) 
+      final String name, int activation, CategoriesDirective categories, 
ClassLoaderDirective classloader ) 
     {
         m_activation = activation;
 
@@ -125,15 +120,6 @@
         {
             m_categories = categories;
         }
-
-        if( mode == null )
-        {
-            m_mode = Mode.IMPLICIT;
-        }
-        else
-        {
-            m_mode = mode;
-        }
         
         if( name == null )
         {
@@ -205,15 +191,6 @@
     }
 
     /**
-     * Returns the creation mode for this profile.
-     * @return a value of EXPLICIT, PACKAGED or IMPLICIT
-     */
-    public Mode getMode()
-    {
-        return m_mode;
-    }
-
-    /**
      * Return the classloader directive that describes the creation
      * arguments for the classloader required by this profile.
      *
@@ -264,10 +241,6 @@
                 {
                     return false;
                 }
-                if( false == m_mode.equals( profile.getMode() ) )
-                {
-                    return false;
-                }
                 if( false == m_categories.equals( 
profile.getCategoriesDirective() ) )
                 {
                     return false;
@@ -293,7 +266,6 @@
     {
         int hash = m_name.hashCode();
         hash ^= m_activation;
-        hash ^= m_mode.hashCode();
         hash ^= m_categories.hashCode();
         hash ^= m_classloader.hashCode();
         return hash;