CVS: plexus-container-new/src/java/org/apache/plexus DefaultPlexusContainer.java,1.19,1.20

Update of /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus
In directory eng.werken.com:/tmp/cvs-serv28664/src/java/org/apache/plexus

Modified Files:
	DefaultPlexusContainer.java 
Log Message:
Initialize the context after initializing the ResourceManager so we can
put the classloader from the ResourceManager into the context.

Index: DefaultPlexusContainer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/DefaultPlexusContainer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- DefaultPlexusContainer.java	2 May 2003 13:40:13 -0000	1.19
+++ DefaultPlexusContainer.java	2 May 2003 14:53:35 -0000	1.20
@@ -190,8 +190,6 @@
     public void setClassLoader( ClassLoader classLoader )
     {
         this.classLoader = classLoader;
-        
-        this.getContext().put( "common.classloader", classLoader );
     }
 
     /**
@@ -253,12 +251,13 @@
 
     /**
      * - Initialize ClassLoader
-     * - Initialize the context as there may be values that need to be interpolated
      * - Initialize the default configuration
      * - Initialize the configuration
      * - Initialize logger manager
      * - Initialize service repository
      * - Initialize resource manager
+     * - Initialize the context. Values put into the context at this point won't
+     *   be interpolated into the configuration.  This may need to change later.
      * - Initialize lifecycle handler
      *
      * @throws Exception
@@ -267,12 +266,12 @@
         throws Exception
     {
         initializeClassLoader();
-        initializeContext();
         initializeDefaultConfiguration();
         initializeConfiguration();
         initializeLoggerManager();
         initializeComponentRepository();
         initializeResourceManager();
+        initializeContext();
         initializeLifecycleHandler();
     }
 
@@ -603,4 +602,5 @@
         }
     }
 }
+