CVS: plexus-container-new/src/test/org/apache/plexus DefaultServiceB.java,1.1.1.1,1.2

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

Modified Files:
	DefaultServiceB.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: DefaultServiceB.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/test/org/apache/plexus/DefaultServiceB.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- DefaultServiceB.java	29 Mar 2003 03:49:44 -0000	1.1.1.1
+++ DefaultServiceB.java	23 Apr 2003 03:57:13 -0000	1.2
@@ -4,15 +4,15 @@
 import org.apache.avalon.framework.activity.Startable;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.service.ServiceException;
-import org.apache.plexus.context.Contextualizable;
-import org.apache.plexus.context.PlexusContext;
-import org.apache.plexus.logging.AbstractLogEnabled;
-import org.apache.plexus.service.ServiceBroker;
-import org.apache.plexus.service.Serviceable;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
 import org.apache.plexus.classloader.ResourceManager;
+import org.apache.plexus.logging.AbstractLogEnabled;
 
 /** This service implements all the start phases:
  *
@@ -47,7 +47,7 @@
         enableLogging = true;
     }
 
-    public void contextualize( PlexusContext context )
+    public void contextualize( Context context )
         throws ContextException
     {
         contextualize = true;
@@ -55,7 +55,7 @@
         resourceManager = (ResourceManager) context.get( "plexus:resource-manager" );
     }
 
-    public void service( ServiceBroker serviceBroker )
+    public void service( ServiceManager serviceManager )
         throws ServiceException
     {
         service = true;