CVS: plexus-container-new/src/java/org/apache/plexus DefaultPlexusContainer.java,1.14,1.15

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

Modified Files:
	DefaultPlexusContainer.java 
Log Message:
o The factories are now completely responsible for setting up a base entity.
So for each of the factories I've tried to follow the pattern of sending
in the defaultConfiguration, configuration, loggerManager, classLoader and
then any other parameters that the factory requires to setup the base
entity.


Index: DefaultPlexusContainer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/DefaultPlexusContainer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- DefaultPlexusContainer.java	28 Apr 2003 03:12:48 -0000	1.14
+++ DefaultPlexusContainer.java	28 Apr 2003 04:35:37 -0000	1.15
@@ -69,8 +69,8 @@
 import org.apache.plexus.logging.AbstractLogEnabled;
 import org.apache.plexus.logging.LoggerManager;
 import org.apache.plexus.logging.LoggerManagerFactory;
-import org.apache.plexus.service.repository.DefaultServiceRepository;
 import org.apache.plexus.service.repository.ServiceRepository;
+import org.apache.plexus.service.repository.ServiceRepositoryFactory;
 import org.apache.plexus.util.ContextMapAdapter;
 import org.apache.plexus.util.InterpolationFilterReader;
 import org.xml.sax.InputSource;
@@ -264,7 +264,7 @@
         initializeContext();
         initializeDefaultConfiguration();
         initializeConfiguration();
-        initializeLogging();
+        initializeLoggerManager();
         initializeServiceRepository();
         initializeResourceManager();
         initializeLifecycleHandler();
@@ -340,23 +340,16 @@
      *
      *  @throws Exception
      */
-    protected void initializeLogging()
+    protected void initializeLoggerManager()
         throws Exception
     {
-        if ( getConfiguration().getChild( "logging", false ) != null )
-        {
-            setLoggerManager(
-                LoggerManagerFactory.create( getConfiguration().getChild( "logging" ),
-                                             getClassLoader() ) );
-        }
-        else
-        {
-            setLoggerManager(
-                LoggerManagerFactory.create( getDefaultConfiguration().getChild( "logging" ),
-                                             getClassLoader() ) );
-       }
+        LoggerManager loggerManager =
+            LoggerManagerFactory.create( getDefaultConfiguration(),
+                                         getConfiguration(),
+                                         getClassLoader() );
 
-        enableLogging( getLoggerManager().getRootLogger() );
+        enableLogging( loggerManager.getRootLogger() );
+        setLoggerManager( loggerManager );
     }
 
     /** Intialize the service repository.
@@ -366,11 +359,14 @@
     protected void initializeServiceRepository()
         throws Exception
     {
-        setServiceRepository( new DefaultServiceRepository() );
-        setupLogger( getServiceRepository(), "service-repository" );
-        getServiceRepository().setPlexusContainer( this );
-        getServiceRepository().configure( getConfiguration() );
-        getServiceRepository().initialize();
+        ServiceRepository serviceRepository =
+            ServiceRepositoryFactory.create( getDefaultConfiguration(),
+                                             getConfiguration(),
+                                             getLoggerManager(),
+                                             this,
+                                             getClassLoader() );
+
+        setServiceRepository( serviceRepository );
     }
 
 
@@ -395,8 +391,10 @@
     protected void initializeLifecycleHandler()
         throws Exception
     {
-        LifecycleHandler lh = LifecycleHandlerFactory.create(
-            getDefaultConfiguration().getChild( "lifecycle-handler" ), getClassLoader() );
+        LifecycleHandler lh = LifecycleHandlerFactory.create( getDefaultConfiguration(),
+                                                              getConfiguration(),
+                                                              getLoggerManager(),
+                                                              getClassLoader() );
 
         // Add some standard entities to the lifecycle handler. The lifecycle
         // handler may wish to use some of these entities to create new types
@@ -406,8 +404,6 @@
         lh.addEntity( LifecycleHandler.CONTEXT, getContext() );
         lh.addEntity( LifecycleHandler.SERVICE_REPOSITORY, getServiceRepository() );
 
-        setupLogger( getLifecycleHandler(), "lifecycle-handler" );
-
         setLifecycleHandler( lh );
     }
 
@@ -421,7 +417,8 @@
     protected void initializeSystemProperties()
         throws Exception
     {
-        Configuration[] systemProperties = getConfiguration().getChild( "system-properties" ).getChildren( "property" );
+        Configuration[] systemProperties =
+            getConfiguration().getChild( "system-properties" ).getChildren( "property" );
 
         for ( int i = 0; i < systemProperties.length; ++i )
         {