CVS: plexus-components/pull/src/java/org/apache/plexus/summit/pull DefaultPullService.java,1.3,1.4 PullToolValve.java,1.2,1.3

Update of /cvsroot/plexus/plexus-components/pull/src/java/org/apache/plexus/summit/pull
In directory eng.werken.com:/tmp/cvs-serv17971/src/java/org/apache/plexus/summit/pull

Modified Files:
	DefaultPullService.java PullToolValve.java 
Log Message:
o updating for plexus 0.4. and doing pure avalon.


Index: DefaultPullService.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/pull/src/java/org/apache/plexus/summit/pull/DefaultPullService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DefaultPullService.java	19 Feb 2003 01:17:47 -0000	1.3
+++ DefaultPullService.java	1 May 2003 19:31:36 -0000	1.4
@@ -11,13 +11,13 @@
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.plexus.summit.rundata.RunData;
 import org.apache.plexus.summit.view.ViewContext;
+import org.apache.plexus.logging.AbstractLogEnabled;
 
 /**
  * This is a default implementation of the pull service.  It takes avalon
@@ -76,8 +76,8 @@
         while ( itr.hasNext() )
         {
             String key = (String) itr.next();
-            Object component = manager.lookup( 
-                (String) getGlobalTools().get( key ) );
+            String componentKey = (String) getGlobalTools().get( key );
+            Object component = manager.lookup( componentKey );
             globalContextTools.put( key, component );
         }
     }

Index: PullToolValve.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/pull/src/java/org/apache/plexus/summit/pull/PullToolValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PullToolValve.java	17 Feb 2003 19:52:13 -0000	1.2
+++ PullToolValve.java	1 May 2003 19:31:36 -0000	1.3
@@ -18,9 +18,9 @@
  * @author <a href="mailto:[email protected]">Dan Diephouse</a>
  * @since Feb 7, 2003
  */
-public class PullToolValve extends AbstractValve
+public class PullToolValve
+    extends AbstractValve
 {
-
     /**
      * @see org.apache.plexus.summit.pipeline.valve.Valve#invoke(org.apache.plexus.summit.rundata.RunData, org.apache.plexus.summit.pipeline.valve.ValveContext)
      */
@@ -30,7 +30,7 @@
         PullService pull = null;
         try
         {
-            pull = (PullService) getServiceBroker().lookup( PullService.ROLE );
+            pull = (PullService) getServiceManager().lookup( PullService.ROLE );
         }
         catch (ServiceException e)
         {