DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Sat Apr 23 14:33:34 2005
New Revision: 2380

Added:
   development/main/metro/classic/composition/api/
      - copied from r2373, development/main/metro/classic/api/
   development/main/metro/classic/composition/impl/
      - copied from r2373, development/main/metro/classic/impl/
   development/main/metro/classic/composition/spi/
      - copied from r2373, development/main/metro/classic/spi/
   development/main/metro/classic/composition/test/
      - copied from r2373, development/main/metro/classic/test/
Removed:
   development/main/metro/classic/api/
   development/main/metro/classic/impl/
   development/main/metro/classic/spi/
   development/main/metro/classic/test/
Modified:
   
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
   development/main/metro/index.xml
Log:
housekeeping

Modified: 
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
==============================================================================
--- 
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
 (original)
+++ 
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
 Sat Apr 23 14:33:34 2005
@@ -426,11 +426,23 @@
             final String error = 
               "Unsupported model implementation class ["
               + model.getClass().getName()
-              + "] passed to resolve/n.";
+              + "] passed to resolve/3.";
             throw new UnsupportedOperationException( error );
         }
     }
 
+    public Holder getHolder( CompositionModel model, Object key ) throws 
LifecycleException, InvocationTargetException
+    {
+        if( null == key )
+        {
+           return m_lifestyleHandler.aquire( model );
+        }
+        else
+        {
+           return m_lifestyleHandler.aquire( model, key );
+        }
+    }
+
    /**
     * Release an instance.
     * 
@@ -544,18 +556,6 @@
         }
     }
 
-    public Holder getHolder( CompositionModel model, Object key ) throws 
LifecycleException, InvocationTargetException
-    {
-        if( null == key )
-        {
-           return m_lifestyleHandler.aquire( model );
-        }
-        else
-        {
-           return m_lifestyleHandler.aquire( model, key );
-        }
-    }
-
     //--------------------------------------------------------------------
     // private
     //--------------------------------------------------------------------

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml    (original)
+++ development/main/metro/index.xml    Sat Apr 23 14:33:34 2005
@@ -305,9 +305,9 @@
 
   <!-- FROM PROTECTED INDEX -->
 
-  <!-- Composition -->
+  <!-- Classic Composition -->
 
-  <project basedir="classic/api">
+  <project basedir="classic/composition/api">
     <info>
       <group>dpml/metro/protected</group>
       <name>dpml-classic-api</name>
@@ -333,7 +333,7 @@
     </dependencies>
   </project>
 
-  <project basedir="classic/spi">
+  <project basedir="classic/composition/spi">
     <info>
       <group>dpml/metro/private</group>
       <name>dpml-classic-spi</name>
@@ -350,7 +350,7 @@
     </dependencies>
   </project>
 
-  <project basedir="classic/impl">
+  <project basedir="classic/composition/impl">
     <info>
       <group>dpml/metro/private</group>
       <name>dpml-classic-impl</name>
@@ -383,7 +383,7 @@
     </dependencies>
   </project>
 
-  <project basedir="classic/test">
+  <project basedir="classic/composition/test">
     <info>
       <group>dpml/test</group>
       <name>dpml-classic-test</name>
@@ -413,6 +413,8 @@
     </dependencies>
   </project>
 
+  <!-- FT Composition -->
+
   <project basedir="composition/api">
     <info>
       <group>dpml/metro/private</group>