Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 76956 invoked from network); 14 Jun 2002 13:04:08 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 14 Jun 2002 13:04:08 -0000 Received: (qmail 14405 invoked by uid 97); 14 Jun 2002 13:04:10 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org Received: (qmail 14340 invoked by uid 97); 14 Jun 2002 13:04:09 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 14325 invoked by uid 98); 14 Jun 2002 13:04:08 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 14 Jun 2002 13:04:03 -0000 Message-ID: <20020614130403.40530.qmail@icarus.apache.org> From: bloritsch@apache.org To: jakarta-avalon-cvs@apache.org Subject: cvs commit: jakarta-avalon/src/test/org/apache/avalon/framework/component/test DefaultComponentManagerTestCase.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N bloritsch 2002/06/14 06:04:03 Modified: src/java/org/apache/avalon/framework/component ComponentManager.java ComponentSelector.java Composable.java DefaultComponentManager.java DefaultComponentSelector.java Recomposable.java src/java/org/apache/avalon/framework/container ContainerUtil.java src/java/org/apache/avalon/framework/service ServiceManager.java Serviceable.java src/test/org/apache/avalon/framework/component/test DefaultComponentManagerTestCase.java Log: remainder of fixes Revision Changes Path 1.8 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/component/ComponentManager.java Index: ComponentManager.java =================================================================== RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/ComponentManager.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ComponentManager.java 14 Jun 2002 01:55:52 -0000 1.7 +++ ComponentManager.java 14 Jun 2002 13:04:03 -0000 1.8 @@ -80,7 +80,7 @@ * allows the ComponentManager to handle the End-Of-Life Lifecycle * events associated with the Component. Please note, that no Exceptions * should be thrown at this point. This is to allow easy use of the - * ComponentLocator system without having to trap Exceptions on a release. + * ComponentManager system without having to trap Exceptions on a release. * * @param component The Component we are releasing. */ 1.8 +2 -2 jakarta-avalon/src/java/org/apache/avalon/framework/component/ComponentSelector.java Index: ComponentSelector.java =================================================================== RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/ComponentSelector.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ComponentSelector.java 14 Jun 2002 01:55:52 -0000 1.7 +++ ComponentSelector.java 14 Jun 2002 13:04:03 -0000 1.8 @@ -76,10 +76,10 @@ /** * Return the Component when you are finished with it. This - * allows the ComponentManager to handle the End-Of-Life Lifecycle + * allows the ComponentSelector to handle the End-Of-Life Lifecycle * events associated with the Component. Please note, that no Exceptions * should be thrown at this point. This is to allow easy use of the - * ComponentLocator system without having to trap Exceptions on a release. + * ComponentSelector system without having to trap Exceptions on a release. * * @param component The Component we are releasing. */ 1.7 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/component/Composable.java Index: Composable.java =================================================================== RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/Composable.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Composable.java 14 Jun 2002 01:55:52 -0000 1.6 +++ Composable.java 14 Jun 2002 13:04:03 -0000 1.7 @@ -28,7 +28,7 @@ public interface Composable { /** - * Pass the ComponentLocator to the composer. + * Pass the ComponentManager to the composer. * The Composable implementation should use the specified * ComponentManager to acquire the components it needs for * execution. 1.12 +9 -9 jakarta-avalon/src/java/org/apache/avalon/framework/component/DefaultComponentManager.java Index: DefaultComponentManager.java =================================================================== RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/DefaultComponentManager.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- DefaultComponentManager.java 14 Jun 2002 01:55:52 -0000 1.11 +++ DefaultComponentManager.java 14 Jun 2002 13:04:03 -0000 1.12 @@ -28,7 +28,7 @@ private boolean m_readOnly; /** - * Construct ComponentLocator with no parent. + * Construct ComponentManager with no parent. * */ public DefaultComponentManager() @@ -37,7 +37,7 @@ } /** - * Construct ComponentLocator with specified parent. + * Construct ComponentManager with specified parent. * * @param parent the ComponentManagers parent */ @@ -47,7 +47,7 @@ } /** - * Retrieve Component by role from ComponentLocator. + * Retrieve Component by role from ComponentManager. * * @param role the role * @return the Component @@ -97,7 +97,7 @@ } /** - * Place Component into ComponentLocator. + * Place Component into ComponentManager. * * @param role the components role * @param component the component @@ -115,14 +115,14 @@ */ public void release( final Component component ) { - // if the ComponentLocator handled pooling, it would be + // if the ComponentManager handled pooling, it would be // returned to the pool here. } /** - * Build a human readable representation of ComponentLocator. + * Build a human readable representation of ComponentManager. * - * @return the description of ComponentLocator + * @return the description of ComponentManager */ public String toString() { @@ -143,7 +143,7 @@ /** * Helper method for subclasses to retrieve parent. * - * @return the parent ComponentLocator + * @return the parent ComponentManager */ protected final ComponentManager getParent() { @@ -179,7 +179,7 @@ if( m_readOnly ) { throw new IllegalStateException - ( "ComponentLocator is read only and can not be modified" ); + ( "ComponentManager is read only and can not be modified" ); } } } 1.10 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/component/DefaultComponentSelector.java Index: DefaultComponentSelector.java =================================================================== RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/DefaultComponentSelector.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- DefaultComponentSelector.java 14 Jun 2002 01:55:52 -0000 1.9 +++ DefaultComponentSelector.java 14 Jun 2002 13:04:03 -0000 1.10 @@ -119,7 +119,7 @@ if( m_readOnly ) { throw new IllegalStateException - ( "ComponentLocator is read only and can not be modified" ); + ( "ComponentSelector is read only and can not be modified" ); } } } 1.8 +1 -1 jakarta-avalon/src/java/org/apache/avalon/framework/component/Recomposable.java Index: Recomposable.java =================================================================== RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/Recomposable.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Recomposable.java 14 Jun 2002 01:55:52 -0000 1.7 +++ Recomposable.java 14 Jun 2002 13:04:03 -0000 1.8 @@ -21,7 +21,7 @@ * The Composable implementation should use the specified * ComponentManager to acquire the components it needs for * execution. It should also drop references to any components it - * retrieved from old ComponentLocator. + * retrieved from old ComponentManager. * * @param componentManager The ComponentManager which this * Composable uses. 1.3 +5 -5 jakarta-avalon/src/java/org/apache/avalon/framework/container/ContainerUtil.java Index: ContainerUtil.java =================================================================== RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/container/ContainerUtil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ContainerUtil.java 14 Jun 2002 01:55:52 -0000 1.2 +++ ContainerUtil.java 14 Jun 2002 13:04:03 -0000 1.3 @@ -118,7 +118,7 @@ * implement Composable. * @throws ComponentException if there is a problem servicing object * @throws IllegalArgumentException if the object is Servicable but - * ComponentLocator is null + * ServiceManager is null */ public static void service( final Object object, final ServiceManager serviceManager ) @@ -128,7 +128,7 @@ { if( null == serviceManager ) { - final String message = "serviceManager is null"; + final String message = "ServiceManager is null"; throw new IllegalArgumentException( message ); } ( (Serviceable)object ).service( serviceManager ); @@ -140,7 +140,7 @@ * {@link Composable} interface. * * @param object the object to compose - * @param componentManager the ComponentLocator object to use for object. + * @param componentManager the ComponentManager object to use for object. * May be null in which case the specified object must not * implement Composable. * @throws ComponentException if there is a problem composing object @@ -148,7 +148,7 @@ * which components will be supplied with Components. Please * Use service() from Composable instead. * @throws IllegalArgumentException if the object is Composable but - * ComponentLocator is null + * ComponentManager is null */ public static void compose( final Object object, final ComponentManager componentManager ) 1.5 +3 -3 jakarta-avalon/src/java/org/apache/avalon/framework/service/ServiceManager.java Index: ServiceManager.java =================================================================== RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/service/ServiceManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ServiceManager.java 14 Jun 2002 01:55:52 -0000 1.4 +++ ServiceManager.java 14 Jun 2002 13:04:03 -0000 1.5 @@ -38,7 +38,7 @@ * @author Berin Loritsch * @author Stephen McConnell * @version 1.0 - * @see org.apache.avalon.framework.service.Composable + * @see org.apache.avalon.framework.service.Serviceable * @see org.apache.avalon.framework.service.ServiceSelector * */ @@ -63,7 +63,7 @@ * * @param role The role name of the Object to retrieve. * @return an Object value - * @throws ComponentException if an error occurs + * @throws ServiceException if an error occurs */ Object lookup( String role ) throws ServiceException; @@ -81,7 +81,7 @@ * allows the ServiceManager to handle the End-Of-Life Lifecycle * events associated with the Object. Please note, that no * Exception should be thrown at this point. This is to allow easy use of the - * ComponentLocator system without having to trap Exceptions on a release. + * ServiceManager system without having to trap Exceptions on a release. * * @param object The Object we are releasing. */ 1.7 +9 -9 jakarta-avalon/src/java/org/apache/avalon/framework/service/Serviceable.java Index: Serviceable.java =================================================================== RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/service/Serviceable.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Serviceable.java 14 Jun 2002 01:55:52 -0000 1.6 +++ Serviceable.java 14 Jun 2002 13:04:03 -0000 1.7 @@ -13,11 +13,11 @@ * but on behavioral interfaces. *
* - * The contract surrounding a Composable is that it is a user. - * The Composable is able to use Objects managed + * The contract surrounding a Serviceable is that it is a user. + * The Serviceable is able to use Objects managed * by the ServiceManager it was initialized with. As part * of the contract with the system, the instantiating entity must call - * the compose method before the Composable + * the service method before the Serviceable * can be considered valid. * * @author Federico Barbieri @@ -26,20 +26,20 @@ * @author Berin Loritsch * @author Stephen McConnell * @version 1.0 - * @see org.apache.avalon.framework.service.ComponentLocator + * @see org.apache.avalon.framework.service.ServiceManager * */ public interface Serviceable { /** - * Pass the ComponentManager to the Composable. - * The Composable implementation should use the specified - * ComponentManager to acquire the components it needs for + * Pass the ServiceManager to the Serviceable. + * The Serviceable implementation should use the specified + * ServiceManager to acquire the components it needs for * execution. * * @param manager The ServiceManager which this - * Composable uses. - * @throws ComponentException if an error occurs + * Serviceable uses. + * @throws ServiceException if an error occurs */ void service( ServiceManager manager ) throws ServiceException; 1.4 +1 -1 jakarta-avalon/src/test/org/apache/avalon/framework/component/test/DefaultComponentManagerTestCase.java Index: DefaultComponentManagerTestCase.java =================================================================== RCS file: /home/cvs/jakarta-avalon/src/test/org/apache/avalon/framework/component/test/DefaultComponentManagerTestCase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DefaultComponentManagerTestCase.java 14 Jun 2002 01:55:52 -0000 1.3 +++ DefaultComponentManagerTestCase.java 14 Jun 2002 13:04:03 -0000 1.4 @@ -45,7 +45,7 @@ public DefaultComponentManagerTestCase() { - this("DefaultComponentLocator Test Case"); + this("DefaultComponentManager Test Case"); } public DefaultComponentManagerTestCase( final String name ) -- To unsubscribe, e-mail: For additional commands, e-mail: