CVS: plexus-container-new/src/java/org/apache/plexus/lifecycle/avalon AvalonServiceSelector.java,1.4,1.5
[email protected] Sat, 17 May 2003 18:53:56 -0500
| Newsgroups | gmane.comp.java.plexus.devel |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/avalon
In directory eng.werken.com:/tmp/cvs-serv6277
Modified Files:
AvalonServiceSelector.java
Log Message:
o using serviceManager over broker.
Index: AvalonServiceSelector.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/lifecycle/avalon/AvalonServiceSelector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- AvalonServiceSelector.java 10 May 2003 16:39:29 -0000 1.4
+++ AvalonServiceSelector.java 17 May 2003 23:53:48 -0000 1.5
@@ -75,7 +75,7 @@
implements ServiceSelector, Serviceable, Configurable
{
/** Service Manager. */
- private ServiceManager broker;
+ private ServiceManager serviceManager;
/** Role being selected. */
private String selectableRole;
@@ -89,7 +89,7 @@
public Object select( Object hint )
throws ServiceException
{
- return broker.lookup( selectableRole + hint );
+ return serviceManager.lookup( selectableRole + hint );
}
/**
@@ -97,7 +97,7 @@
*/
public boolean isSelectable( Object hint )
{
- return broker.hasService( selectableRole + hint );
+ return serviceManager.hasService( selectableRole + hint );
}
/**
@@ -105,16 +105,16 @@
*/
public void release( Object component )
{
- broker.release( component );
+ serviceManager.release( component );
}
/**
- * @see org.apache.plexus.service.Serviceable#service(org.apache.plexus.service.ServiceBroker)
+ * @see Serviceable#service(ServiceManager)
*/
- public void service( ServiceManager broker )
+ public void service( ServiceManager serviceManager )
throws ServiceException
{
- this.broker = broker;
+ this.serviceManager = serviceManager;
}
/**