DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Sat Jun 18 00:27:13 2005
New Revision: 2892

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/LifecycleHandler.java
   development/main/metro/index.xml
Log:
Updates to support net.dpml.logging.Logger

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 Jun 18 00:27:13 2005
@@ -118,7 +118,6 @@
         return m_logger;
     }
 
-
     //--------------------------------------------------------------------
     // PartHandler
     //--------------------------------------------------------------------
@@ -532,6 +531,18 @@
         return Logger.getLogger( channel );
     }
 
+    net.dpml.logging.Logger getLoggingChannel( CompositionModel model )
+    {
+        URI uri = model.getURI();
+        String path = uri.getSchemeSpecificPart();
+        if( path.endsWith( "/" ) )
+        {
+            path = path.substring( 0, path.length() - 1 );
+        }
+        path.replace( '/', '.' );
+        return new DefaultLogger( path );
+    }
+
    /**
     * Return the monitor assigned to this controller.
     *  

Modified: 
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifecycleHandler.java
==============================================================================
--- 
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifecycleHandler.java
      (original)
+++ 
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifecycleHandler.java
      Sat Jun 18 00:27:13 2005
@@ -110,6 +110,10 @@
             {
                 args[i] = model.getCompositionController().getLogChannel( 
model );
             }
+            else if( net.dpml.logging.Logger.class.isAssignableFrom( c ) )
+            {
+                args[i] = 
model.getCompositionController().getLoggingChannel( model );
+            }
             else if( ( null != parts ) && parts.isAssignableFrom( c ) )
             {
                 args[i] = newPartsInvocationHandler( holder, parts );

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml    (original)
+++ development/main/metro/index.xml    Sat Jun 18 00:27:13 2005
@@ -131,6 +131,7 @@
       <include key="dpml-configuration-api" tag="api"/>
       <include key="dpml-parameters-impl"/>
       <include key="dpml-configuration-impl"/>
+      <include key="dpml-depot-console"/>
       <include key="commons-cli"/>
     </dependencies>
   </project>