DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Fri Jun 17 14:41:44 2005
New Revision: 2869

Removed:
   development/main/metro/composition/unit/
Modified:
   
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionManager.java
   
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandler.java
   
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandlerModel.java
   development/main/metro/index.xml
   
development/main/metro/parts/src/main/net/dpml/parts/control/ControllerContext.java
Log:
Removing content no longer needed.

Modified: 
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionManager.java
==============================================================================
--- 
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionManager.java
    (original)
+++ 
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionManager.java
    Fri Jun 17 14:41:44 2005
@@ -74,7 +74,7 @@
     // constructor
     //--------------------------------------------------------------------
 
-    public CompositionManager( ControllerContext context, String[] args )  
throws Exception
+    public CompositionManager( ControllerContext context )  throws Exception
     {
         super( context );
 
@@ -82,6 +82,7 @@
         m_classloader = 
net.dpml.composition.info.Type.class.getClassLoader();
 
         setShutdownHook( this );
+        String[] args = context.getArgs();
         CommandLine line = getCommandLine( args );
         String[] arguments = line.getArgs();
         URI uri = getLauchTargetURI( arguments );

Modified: 
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandler.java
==============================================================================
--- 
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandler.java
   (original)
+++ 
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandler.java
   Fri Jun 17 14:41:44 2005
@@ -71,7 +71,7 @@
         if( model instanceof ControllerContext )
         {
             ControllerContext context = (ControllerContext) model;
-            m_manager = new CompositionManager( context, new String[0] );
+            m_manager = new CompositionManager( context );
         }
         else
         {
@@ -128,7 +128,7 @@
                     catch( Throwable e )
                     {
                         final String error = 
-                          "Unable to load part due: " + url;
+                          "Unable to load part: " + url;
                         throw new ControlRuntimeException( 
m_manager.getURI(), error, e );
                     }
                 }

Modified: 
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandlerModel.java
==============================================================================
--- 
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandlerModel.java
      (original)
+++ 
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandlerModel.java
      Fri Jun 17 14:41:44 2005
@@ -31,8 +31,6 @@
 import java.util.prefs.PreferenceChangeListener;
 import java.util.prefs.PreferenceChangeEvent;
 
-import net.dpml.composition.event.WeakEventProducer;
-
 import net.dpml.parts.control.ControllerContext;
 import net.dpml.parts.control.ControllerContextListener;
 import net.dpml.parts.control.ControllerContextEvent;
@@ -43,7 +41,6 @@
 import net.dpml.transit.model.Logger;
 import net.dpml.transit.util.PropertyResolver;
 
-
 /**
  * The ControllerContext is a management service supplied to a controller 
instance. It 
  * provides support for operations though which the context state may be 
updated and 
@@ -58,18 +55,20 @@
     // state
     
//----------------------------------------------------------------------------
 
-    private Preferences m_preferences;
-    
+   /**
+    * Working directory.
+    */
     private File m_work;
   
+   /**
+    * Temp directory.
+    */
     private File m_temp;
 
-    private Map m_listeners = new WeakHashMap();
-
    /**
-    * Internal synchronization lock.
+    * Commandline arguments.
     */
-    protected final Object m_lock = new Object();
+    private final String[] m_args = new String[0];
 
     
//----------------------------------------------------------------------------
     // constructor
@@ -89,6 +88,15 @@
     
//----------------------------------------------------------------------------
 
    /**
+    * Return any command line arguments.
+    * @return the possibly empty set of command line arguments.
+    */
+    public String[] getArgs() throws RemoteException
+    {
+        return m_args;
+    }
+
+   /**
     * Return the context uri.
     *
     * @return the uri for this context.

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml    (original)
+++ development/main/metro/index.xml    Fri Jun 17 14:41:44 2005
@@ -142,20 +142,6 @@
     </dependencies>
   </project>
 
-  <project basedir="composition/unit">
-    <info>
-      <group>dpml/metro</group>
-      <name>dpml-composition-unit</name>
-      <types>
-        <type>jar</type>
-      </types>
-    </info>
-    <dependencies>
-      <include key="dpml-depot-console"/>
-      <include key="dpml-composition-control"/>
-    </dependencies>
-  </project>
-
   <project basedir="composition/part">
     <info>
       <group>dpml/metro</group>

Modified: 
development/main/metro/parts/src/main/net/dpml/parts/control/ControllerContext.java
==============================================================================
--- 
development/main/metro/parts/src/main/net/dpml/parts/control/ControllerContext.java
 (original)
+++ 
development/main/metro/parts/src/main/net/dpml/parts/control/ControllerContext.java
 Fri Jun 17 14:41:44 2005
@@ -38,6 +38,12 @@
     URI getURI() throws RemoteException;
 
    /**
+    * Return any command line arguments.
+    * @return the possibly empty set of command line arguments.
+    */
+    String[] getArgs() throws RemoteException;
+
+   /**
     * Return the root working directory.
     *
     * @return directory representing the root of the working directory 
hierachy