CVS: plexus-container/src/java/org/apache/plexus DefaultPlexusContainer.java,1.27,1.28 PlexusContainer.java,1.7,1.8

Update of /cvsroot/plexus/plexus-container/src/java/org/apache/plexus
In directory hogshead.codehaus.org:/tmp/cvs-serv25662/src/java/org/apache/plexus

Modified Files:
	DefaultPlexusContainer.java PlexusContainer.java 
Log Message:
o first pass at integrating bert's patch. checking it in so that bert can
  look at some stuff for me.


Index: DefaultPlexusContainer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container/src/java/org/apache/plexus/DefaultPlexusContainer.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- DefaultPlexusContainer.java	21 Jul 2003 02:16:31 -0000	1.27
+++ DefaultPlexusContainer.java	5 Aug 2003 19:26:23 -0000	1.28
@@ -120,13 +120,6 @@
     private Reader configurationReader;
 
     /**
-     * Lifecycle handler for this container. One lifecycle handler per
-     * container is permitted. This may change in the short term to allow running
-     * components with varying lifecycles in the same container.
-     */
-    private LifecycleHandler lifecycleHandler;
-
-    /**
      *  Typically Plexus will use a ClassWorld for all its class loading and
      *  resource requirements, but it remains to be seen if this will be possible
      *  in environments like j2me. We need to be able to initialize the Plexus
@@ -188,7 +181,6 @@
         initializeComponentRepository();
         initializeResourceManager();
         initializeContext();
-        initializeLifecycleHandler();
         initializeSystemProperties();
     }
 
@@ -233,11 +225,6 @@
     // Post-initialization - can only be called post initialization
     // ----------------------------------------------------------------------
 
-    public LifecycleHandler getLifecycleHandler()
-    {
-        return lifecycleHandler;
-    }
-
     public ClassLoader getClassLoader()
     {
         if ( classLoader == null )
@@ -432,7 +419,8 @@
                                                getConfiguration(),
                                                getLoggerManager(),
                                                this,
-                                               getClassLoader() );
+                                               getClassLoader(),
+                                               getContext() );
 
         setComponentRepository( componentRepository );
     }
@@ -461,22 +449,6 @@
     }
 
     /** 
-     * Initialize the lifecycle handler.
-     */
-    private void initializeLifecycleHandler()
-        throws Exception
-    {
-        LifecycleHandler lh = LifecycleHandlerFactory.create( getDefaultConfiguration(),
-                                                              getConfiguration(),
-                                                              getLoggerManager(),
-                                                              getClassLoader(),
-                                                              getContext(),
-                                                              getComponentRepository() );
-
-        setLifecycleHandler( lh );
-    }
-
-    /** 
      * Initialize system properties.
      *
      * If the application needs to setup any system properties than they will
@@ -592,17 +564,6 @@
     private void setComponentRepository( ComponentRepository componentRepository )
     {
         this.componentRepository = componentRepository;
-    }
-
-    // --[ Lifecycle Handler ]--
-
-    /**
-     *
-     * @param lifecycleHandler
-     */
-    private void setLifecycleHandler( LifecycleHandler lifecycleHandler )
-    {
-        this.lifecycleHandler = lifecycleHandler;
     }
     
     /**

Index: PlexusContainer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container/src/java/org/apache/plexus/PlexusContainer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PlexusContainer.java	13 Jun 2003 01:08:49 -0000	1.7
+++ PlexusContainer.java	5 Aug 2003 19:26:23 -0000	1.8
@@ -3,7 +3,6 @@
 import com.werken.classworlds.ClassWorld;
 
 import org.apache.plexus.configuration.ConfigurationResourceException;
-import org.apache.plexus.lifecycle.LifecycleHandler;
 import org.apache.plexus.service.repository.ComponentRepository;
 
 import java.io.Reader;
@@ -46,9 +45,11 @@
     // Post-initialization - can only be called post initialization
     // ----------------------------------------------------------------------
 
-    /** */
+    /** *//*
     public LifecycleHandler getLifecycleHandler();
 
+
+	public LifecycleHandler getLifecycleHandler(String id);*/
     /** */
     public ClassLoader getClassLoader();