CVS: plexus-container-new/src/java/org/apache/plexus/lifecycle/avalon AvalonLifecycleHandler.java,1.7,1.8 AvalonServiceManager.java,1.3,1.4

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

Modified Files:
	AvalonLifecycleHandler.java AvalonServiceManager.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: AvalonLifecycleHandler.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/avalon/AvalonLifecycleHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- AvalonLifecycleHandler.java	25 Apr 2003 19:23:29 -0000	1.7
+++ AvalonLifecycleHandler.java	1 May 2003 19:35:36 -0000	1.8
@@ -58,11 +58,7 @@
 
 import org.apache.plexus.lifecycle.AbstractLifecycleHandler;
 import org.apache.plexus.lifecycle.LifecycleHandler;
-import org.apache.plexus.lifecycle.phase.Phase;
-import org.apache.plexus.service.repository.ServiceCapsule;
-import org.apache.plexus.service.repository.ServiceRepository;
-
-import java.util.Iterator;
+import org.apache.plexus.service.repository.ComponentRepository;
 
 /** An Avalon service lifecycle handler.
  *
@@ -98,7 +94,7 @@
     public void initialize()
         throws Exception
     {
-        addEntity( SERVICE_MANAGER, new AvalonServiceManager(
-            (ServiceRepository) getEntities().get( LifecycleHandler.SERVICE_REPOSITORY ) ) );
+        ComponentRepository cr = (ComponentRepository) getEntities().get( LifecycleHandler.SERVICE_REPOSITORY );
+        addEntity( SERVICE_MANAGER, new AvalonServiceManager( cr ) );
     }
 }

Index: AvalonServiceManager.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/avalon/AvalonServiceManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- AvalonServiceManager.java	24 Apr 2003 17:31:24 -0000	1.3
+++ AvalonServiceManager.java	1 May 2003 19:35:36 -0000	1.4
@@ -59,7 +59,7 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.plexus.logging.AbstractLogEnabled;
-import org.apache.plexus.service.repository.ServiceRepository;
+import org.apache.plexus.service.repository.ComponentRepository;
 
 /**
  * Extended <code>ServiceManager</code> implementation.
@@ -80,7 +80,7 @@
     // ----------------------------------------------------------------------
 
     /** */
-    private ServiceRepository serviceRepository;
+    private ComponentRepository componentRepository;
 
     // ----------------------------------------------------------------------
     // Constructors
@@ -91,9 +91,15 @@
      *
      * @todo We shouldn't be handing the parent container to the child here.
      */
-    public AvalonServiceManager( ServiceRepository serviceRepository )
+    public AvalonServiceManager( ComponentRepository componentRepository )
     {
-        this.serviceRepository = serviceRepository;
+        if ( componentRepository == null )
+        {
+            throw new IllegalStateException(
+                "You cannot initialize an AvalonServiceManager with a null ComponentRespository" );
+        }
+
+        this.componentRepository = componentRepository;
     }
 
     // ----------------------------------------------------------------------
@@ -101,30 +107,29 @@
     // ----------------------------------------------------------------------
 
     /**
-     * @see ServiceRepository#lookup(String)
+     * @see ComponentRepository#lookup(String)
      */
     public Object lookup( String role )
         throws ServiceException
     {
         // We have to add some magic here to deal with Selectors.
-
-        return serviceRepository.lookup( role );
+        return componentRepository.lookup( role );
     }
 
     /**
-     * @see ServiceRepository#hasService(String)
+     * @see ComponentRepository#hasService(String)
      */
     public boolean hasService( String role )
     {
-        return serviceRepository.hasService( role );
+        return componentRepository.hasService( role );
     }
 
     /**
-     * @see ServiceRepository#release(Object)
+     * @see ComponentRepository#release(Object)
      */
     public void release( Object service )
     {
-        serviceRepository.release( service );
+        componentRepository.release( service );
     }
 
     // ----------------------------------------------------------------------
@@ -132,27 +137,27 @@
     // ----------------------------------------------------------------------
 
     /**
-     * @see ServiceRepository#lookup(String,String)
+     * @see ComponentRepository#lookup(String,String)
      */
     public Object lookup( String role, String id )
         throws ServiceException
     {
-        return serviceRepository.lookup( role, id );
+        return componentRepository.lookup( role, id );
     }
 
     /**
-     * @see ServiceRepository#hasService(String,String)
+     * @see ComponentRepository#hasService(String,String)
      */
     public boolean hasService( String role, String id )
     {
-        return serviceRepository.hasService( role, id );
+        return componentRepository.hasService( role, id );
     }
 
     /**
-     * @see ServiceRepository#dispose()
+     * @see ComponentRepository#dispose()
      */
     public void dispose()
     {
-        serviceRepository.dispose();
+        componentRepository.dispose();
     }
 }