CVS: plexus-container-new/src/java/org/apache/plexus DefaultPlexusContainer.java,1.5,1.6 PlexusContainer.java,1.3,1.4 PlexusTestCase.java,1.1.1.1,1.2

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

Modified Files:
	DefaultPlexusContainer.java PlexusContainer.java 
	PlexusTestCase.java 
Log Message:
o Removed all weird Plexus manglings of Avalon's interfaces. Now Plexus can
  handle many container APIs and many lifecycles so we won't tamper with
  Avalon. Where Avalon applies we will adhere to whatever they decide.
  If users need something different then they can extend the lifecycle as
  they see fit and create different or extended container APIs.



Index: DefaultPlexusContainer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/DefaultPlexusContainer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DefaultPlexusContainer.java	11 Apr 2003 05:20:54 -0000	1.5
+++ DefaultPlexusContainer.java	23 Apr 2003 03:57:12 -0000	1.6
@@ -63,7 +63,7 @@
 import org.apache.plexus.classloader.ResourceManager;
 import org.apache.plexus.configuration.ConfigurationResourceException;
 import org.apache.plexus.configuration.DefaultConfigurationBuilder;
-import org.apache.plexus.context.DefaultPlexusContext;
+import org.apache.plexus.context.DefaultContext;
 import org.apache.plexus.lifecycle.LifecycleHandler;
 import org.apache.plexus.lifecycle.avalon.AvalonLifecycleHandler;
 import org.apache.plexus.lifecycle.avalon.AvalonServiceManager;
@@ -71,7 +71,6 @@
 import org.apache.plexus.logging.ConsoleLogger;
 import org.apache.plexus.logging.LoggerManager;
 import org.apache.plexus.logging.log4j.Log4JLoggerManager;
-import org.apache.plexus.service.PlexusServiceBroker;
 import org.apache.plexus.service.repository.DefaultServiceRepository;
 import org.apache.plexus.service.repository.ServiceRepository;
 import org.apache.plexus.util.InterpolationFilterReader;
@@ -114,7 +113,7 @@
     private LoggerManager loggerManager;
 
     /** Context used for this container. */
-    private DefaultPlexusContext context;
+    private DefaultContext context;
 
     /** Service Repository used for this container. */
     private ServiceRepository serviceRepository;
@@ -429,7 +428,7 @@
      */
     protected void initializeContext()
     {
-        addContextValue( PlexusConstants.RESOURCE_MANAGER_KEY, getResourceManager());
+        addContextValue( PlexusConstants.RESOURCE_MANAGER_KEY, getResourceManager() );
     }
 
     /** Initialize the lifecycle handler.
@@ -442,8 +441,6 @@
         getLifecycleHandler().addEntity( AvalonLifecycleHandler.LOGGER, getLoggerManager().getRootLogger() );
         getLifecycleHandler().addEntity( AvalonLifecycleHandler.CONTEXT, getContext() );
         getLifecycleHandler().addEntity( AvalonLifecycleHandler.SERVICE_MANAGER, new AvalonServiceManager( getServiceRepository() ) );
-        getLifecycleHandler().addEntity( "service.broker", new PlexusServiceBroker( getServiceRepository() ) );
-        getLifecycleHandler().addEntity( "plexus.context", getContext() );
     }
 
     /** Initialize system properties.
@@ -561,7 +558,7 @@
      *
      * @param context
      */
-    void setContext( DefaultPlexusContext context )
+    void setContext( DefaultContext context )
     {
         this.context = context;
     }
@@ -571,11 +568,11 @@
      *
      * @return
      */
-    DefaultPlexusContext getContext()
+    DefaultContext getContext()
     {
         if ( context == null )
         {
-            context = new DefaultPlexusContext();
+            context = new DefaultContext();
         }
 
         return context;

Index: PlexusContainer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/PlexusContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PlexusContainer.java	22 Apr 2003 00:35:52 -0000	1.3
+++ PlexusContainer.java	23 Apr 2003 03:57:12 -0000	1.4
@@ -7,17 +7,16 @@
  */
 package org.apache.plexus;
 
+import com.werken.classworlds.ClassWorld;
+import org.apache.plexus.configuration.ConfigurationResourceException;
+import org.apache.plexus.lifecycle.LifecycleHandler;
+import org.apache.plexus.service.repository.ServiceRepository;
+
 import java.io.File;
 import java.io.InputStream;
 import java.io.Reader;
 import java.net.URL;
 import java.util.Map;
-
-import org.apache.plexus.configuration.ConfigurationResourceException;
-import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.service.repository.ServiceRepository;
-
-import com.werken.classworlds.ClassWorld;
 
 public interface PlexusContainer
 {

Index: PlexusTestCase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/PlexusTestCase.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- PlexusTestCase.java	29 Mar 2003 03:49:44 -0000	1.1.1.1
+++ PlexusTestCase.java	23 Apr 2003 03:57:12 -0000	1.2
@@ -57,12 +57,11 @@
  */
 
 import junit.framework.TestCase;
+import org.apache.avalon.framework.configuration.Configuration;
 
 import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
-
-import org.apache.avalon.framework.configuration.Configuration;
 
 public class PlexusTestCase
     extends TestCase