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

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

Modified Files:
	DefaultPlexusContainer.java PlexusContainer.java 
	PlexusTestCase.java 
Log Message:
o This will require a separate message as more than a few changes have
occurred in order to support handling for various instantiation strategies
and scriptable components.



Index: DefaultPlexusContainer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/DefaultPlexusContainer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- DefaultPlexusContainer.java	28 Apr 2003 13:04:48 -0000	1.17
+++ DefaultPlexusContainer.java	1 May 2003 19:35:35 -0000	1.18
@@ -70,8 +70,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.ServiceRepository;
-import org.apache.plexus.service.repository.ServiceRepositoryFactory;
+import org.apache.plexus.service.repository.ComponentRepository;
+import org.apache.plexus.service.repository.ComponentRepositoryFactory;
 import org.apache.plexus.util.ContextMapAdapter;
 import org.apache.plexus.util.InterpolationFilterReader;
 import org.xml.sax.InputSource;
@@ -108,7 +108,7 @@
     private DefaultContext context;
 
     /** Service Repository used for this container. */
-    private ServiceRepository serviceRepository;
+    private ComponentRepository componentRepository;
 
     /** Configuration for this container. */
     private Configuration configuration;
@@ -229,9 +229,9 @@
 
     // --[ ServiceRepository ]--
 
-    public ServiceRepository getServiceRepository()
+    public ComponentRepository getComponentRepository()
     {
-        return serviceRepository;
+        return componentRepository;
     }
 
     // --[ LifecycleHandler ]--
@@ -269,7 +269,7 @@
         initializeDefaultConfiguration();
         initializeConfiguration();
         initializeLoggerManager();
-        initializeServiceRepository();
+        initializeComponentRepository();
         initializeResourceManager();
         initializeLifecycleHandler();
     }
@@ -323,6 +323,14 @@
         throws Exception
     {
         InputStream is = getClassLoader().getResourceAsStream( "org/apache/plexus/plexus.conf" );
+
+        if ( is == null )
+        {
+            throw new IllegalStateException( "The internal default plexus.conf is missing. " +
+                                             "This is highly irregular, your plexus JAR is " +
+                                             "most likely corrupt." );
+        }
+
         setDefaultConfiguration( builder.build( new InputSource( new InputStreamReader( is ) ) ) );
     }
 
@@ -360,17 +368,17 @@
      *
      *  @throws Exception
      */
-    protected void initializeServiceRepository()
+    protected void initializeComponentRepository()
         throws Exception
     {
-        ServiceRepository serviceRepository =
-            ServiceRepositoryFactory.create( getDefaultConfiguration(),
-                                             getConfiguration(),
-                                             getLoggerManager(),
-                                             this,
-                                             getClassLoader() );
+        ComponentRepository componentRepository =
+            ComponentRepositoryFactory.create( getDefaultConfiguration(),
+                                               getConfiguration(),
+                                               getLoggerManager(),
+                                               this,
+                                               getClassLoader() );
 
-        setServiceRepository( serviceRepository );
+        setComponentRepository( componentRepository );
     }
 
 
@@ -405,15 +413,9 @@
         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
-        // of entities for its lifecycle phases. For example the AvalonLifecycleHandler
-        // uses the ServiceRepository and adapts it to create an Avalon ServiceManager.
-        lh.addEntity( LifecycleHandler.LOGGER, getLoggerManager().getRootLogger() );
-        lh.addEntity( LifecycleHandler.CONTEXT, getContext() );
-        lh.addEntity( LifecycleHandler.SERVICE_REPOSITORY, getServiceRepository() );
+                                                              getClassLoader(),
+                                                              getContext(),
+                                                              getComponentRepository() );
 
         setLifecycleHandler( lh );
     }
@@ -544,11 +546,11 @@
 
     /**
      *
-     * @param serviceRepository
+     * @param componentRepository
      */
-    void setServiceRepository( ServiceRepository serviceRepository )
+    void setComponentRepository( ComponentRepository componentRepository )
     {
-        this.serviceRepository = serviceRepository;
+        this.componentRepository = componentRepository;
     }
 
     // --[ Lifecycle Handler ]--
@@ -585,11 +587,11 @@
             {
                 if ( id.length() == 0 )
                 {
-                    getServiceRepository().lookup( role );
+                    getComponentRepository().lookup( role );
                 }
                 else
                 {
-                    getServiceRepository().lookup( role, id );
+                    getComponentRepository().lookup( role, id );
                 }
             }
             catch ( ServiceException e )

Index: PlexusContainer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/PlexusContainer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PlexusContainer.java	27 Apr 2003 16:27:39 -0000	1.5
+++ PlexusContainer.java	1 May 2003 19:35:35 -0000	1.6
@@ -10,7 +10,7 @@
 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 org.apache.plexus.service.repository.ComponentRepository;
 
 import java.io.Reader;
 
@@ -66,6 +66,6 @@
     void dispose();
 
     // required for loader servlet
-    ServiceRepository getServiceRepository();
+    ComponentRepository getComponentRepository();
 
 }

Index: PlexusTestCase.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/PlexusTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PlexusTestCase.java	27 Apr 2003 16:27:39 -0000	1.3
+++ PlexusTestCase.java	1 May 2003 19:35:35 -0000	1.4
@@ -57,7 +57,6 @@
  */
 
 import junit.framework.TestCase;
-import org.apache.avalon.framework.configuration.Configuration;
 
 import java.io.File;
 import java.io.InputStream;
@@ -235,18 +234,12 @@
     protected Object getComponent( String role )
         throws Exception
     {
-        return getContainer().getServiceRepository().lookup( role );
+        return getContainer().getComponentRepository().lookup( role );
     }
 
     protected Object getComponent( String role, String id )
         throws Exception
     {
-        return getContainer().getServiceRepository().lookup( role, id );
-    }
-
-    protected Object getComponent( String role, Configuration configuration )
-        throws Exception
-    {
-        return getContainer().getServiceRepository().lookup( role, configuration );
+        return getContainer().getComponentRepository().lookup( role, id );
     }
 }