DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Thu Apr 28 17:04:01 2005
New Revision: 2440

Modified:
   
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionClassLoader.java
   
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
Log:
Enhancment to classloader reporting.

Modified: 
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionClassLoader.java
==============================================================================
--- 
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionClassLoader.java
        (original)
+++ 
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionClassLoader.java
        Thu Apr 28 17:04:01 2005
@@ -76,7 +76,6 @@
     public String toString()
     {
         StringBuffer buffer = new StringBuffer( "classloader stack: " );
-        buffer.append( getPartition().toString() );
         listClasspath( buffer );
         return buffer.toString();
     }
@@ -98,7 +97,8 @@
                 listClasspath( buffer, parent );
             }
             int index = cl.getIndex();
-            buffer.append( "\n  classpath (" + index + ")" );
+            URI partition = cl.getPartition();
+            buffer.append( "\n  composition classloader:" + partition + " (" 
+ index + ")" );
             appendEntries( buffer, cl );
         }
         else if( classloader instanceof URLClassLoader )

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
 Thu Apr 28 17:04:01 2005
@@ -236,9 +236,9 @@
     }
 
    /**
-    * Add a part to the collection of parts managed by this controller.
+    * Return a model using a par turi and key.
     *
-    * @param uri a uri identifying the part to add
+    * @param uri a uri identifying the part
     * @param key the key to assign to the model
     * @return the model of the part
     */
@@ -248,9 +248,7 @@
     {
         Part part = loadPart( uri );
         ClassLoader anchor = 
net.dpml.composition.info.Type.class.getClassLoader();
-        URI partition = getPartition();
-        ClassLoader classloader = new CompositionClassLoader( partition, 
anchor );
-        return getModel( classloader, part, key );
+        return getModel( anchor, part, key );
     }
 
    /**