incubator-composer-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject svn commit: r613940 - in /incubator/composer/trunk/core: ./ src/java/org/apache/composer/core/ src/test/org/apache/composer/core/ src/test/org/apache/composer/core/containers/ src/test/org/apache/composer/core/defaults/ src/test/org/apache/composer/cor...
Date Mon, 21 Jan 2008 17:18:47 GMT
Author: hammant
Date: Mon Jan 21 09:18:44 2008
New Revision: 613940

URL: http://svn.apache.org/viewvc?rev=613940&view=rev
Log:
remove some references to PicoContainer and Pico things

Modified:
    incubator/composer/trunk/core/apache-composer-core.iml
    incubator/composer/trunk/core/src/java/org/apache/composer/core/ComponentAdapter.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/ComponentMonitor.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/ComposerException.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/Container.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerBuilder.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerVisitor.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/DefaultContainer.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/Disposable.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/LifecycleException.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/MutableContainer.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/ObjectReference.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/package.html
    incubator/composer/trunk/core/src/test/org/apache/composer/core/ComposerVisitorTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/ContainerBuilderTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/DefaultContainerTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/DelegatingMutableContainerTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/DefaultContainerTreeSerializationTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/GenericsTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/monitors/NullComponentMonitorTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractContainerTest.java

Modified: incubator/composer/trunk/core/apache-composer-core.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/apache-composer-core.iml?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/apache-composer-core.iml (original)
+++ incubator/composer/trunk/core/apache-composer-core.iml Mon Jan 21 09:18:44 2008
@@ -7,6 +7,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/ComponentAdapter.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/ComponentAdapter.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/ComponentAdapter.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/ComponentAdapter.java Mon Jan 21 09:18:44 2008
@@ -34,7 +34,7 @@
      * Retrieve the key associated with the component.
      *
      * @return the component's key. Should either be a class type (normally an interface) or an identifier that is
-     *         unique (within the scope of the current PicoContainer).
+     *         unique (within the scope of the current Container).
      */
     Object getComponentKey();
 
@@ -61,7 +61,7 @@
 
     /**
      * Verify that all dependencies for this adapter can be satisifed. Normally, the adapter should verify this by
-     * checking that the associated PicoContainer contains all the needed dependnecies.
+     * checking that the associated Container contains all the needed dependnecies.
      *
      * @param container the {@link Container}, that is used to resolve any possible dependencies of the instance.
      * @throws CompositionException if one or more dependencies cannot be resolved.

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/ComponentMonitor.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/ComponentMonitor.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/ComponentMonitor.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/ComponentMonitor.java Mon Jan 21 09:18:44 2008
@@ -50,7 +50,7 @@
      * @param container
      * @param componentAdapter
      * @param constructor the Constructor used to instantiate the addComponent
-     * @param instantiated the component that was instantiated by PicoContainer
+     * @param instantiated the component that was instantiated by Composer
      * @param injected the components during instantiation.
      * @param duration the duration in milliseconds of the instantiation
      */

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/ComposerException.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/ComposerException.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/ComposerException.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/ComposerException.java Mon Jan 21 09:18:44 2008
@@ -20,8 +20,8 @@
 import java.io.PrintWriter;
 
 /**
- * Superclass for all Exceptions in PicoContainer. You can use this if you want to catch all exceptions thrown by
- * PicoContainer. Be aware that some parts of the PicoContainer API will also throw {@link NullPointerException} when
+ * Superclass for all Exceptions in Composer. You can use this if you want to catch all exceptions thrown by
+ * Composer. Be aware that some parts of the Composer API will also throw {@link NullPointerException} when
  * <code>null</code> values are provided for method arguments, and this is not allowed.
  * 
  * @author Paul Hammant

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/Container.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/Container.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/Container.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/Container.java Mon Jan 21 09:18:44 2008
@@ -22,15 +22,15 @@
 
 
 /**
- * This is the core interface for PicoContainer. It is used to retrieve component instances from the container; it only
+ * This is the core interface for Composer. It is used to retrieve component instances from the container; it only
  * has accessor methods (in addition to the {@link #accept(ContainerVisitor)} method). In order to register components in a
- * PicoContainer, use a {@link MutableContainer}, such as {@link DefaultContainer}.
+ * Container, use a {@link MutableContainer}, such as {@link DefaultContainer}.
  *
  * @author Paul Hammant
  * @author Aslak Helles&oslash;y
  * @author Jon Tirs&eacute;n
  * @see <a href="package-summary.html#package_description">See package description for basic overview how to use
- *      PicoContainer.</a>
+ *      Container.</a>
  */
 public interface Container {
 

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerBuilder.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerBuilder.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerBuilder.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerBuilder.java Mon Jan 21 09:18:44 2008
@@ -44,7 +44,7 @@
  * Helps assembles the myriad items available to a picocontainer.
  * <p>Simple Example:</p>
  * <pre>
- * MutablePicoContainer mpc = new PicoBuilder()
+ * MutableContainer mpc = new ContainerBuilder()
  * &nbsp;&nbsp;.withCaching()
  * &nbsp;&nbsp;.withLifecycle()
  * &nbsp;&nbsp;.build();

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerVisitor.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerVisitor.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerVisitor.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerVisitor.java Mon Jan 21 09:18:44 2008
@@ -26,7 +26,7 @@
  */
 public interface ContainerVisitor {
     /**
-     * Entry point for the PicoVisitor traversal. The given node is the first object, that is 
+     * Entry point for the ContainerVisitor traversal. The given node is the first object, that is 
      * asked for acceptance. Only objects of type {@link Container}, {@link ComponentAdapter},
      * or {@link Parameter} are valid.
      * 

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/DefaultContainer.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/DefaultContainer.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/DefaultContainer.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/DefaultContainer.java Mon Jan 21 09:18:44 2008
@@ -598,7 +598,7 @@
     }
 
     /**
-     * Start the components of this PicoContainer and all its logical child containers.
+     * Start the components of this Container and all its logical child containers.
      * The starting of the child container is only attempted if the parent
      * container start successfully.  The child container for which start is attempted
      * is tracked so that upon stop, only those need to be stopped.
@@ -632,7 +632,7 @@
     }
 
     /**
-     * Stop the components of this PicoContainer and all its logical child containers.
+     * Stop the components of this Container and all its logical child containers.
      * The stopping of the child containers is only attempted for those that have been
      * started, possibly not successfully.
      * The lifecycle operation is delegated to the component adapter,
@@ -666,7 +666,7 @@
      * Checks the status of the child container to see if it's been started
      * to prevent IllegalStateException upon stop
      *
-     * @param child the child PicoContainer
+     * @param child the child Container
      *
      * @return A boolean, <code>true</code> if the container is started
      */
@@ -685,7 +685,7 @@
     }
 
     /**
-     * Dispose the components of this PicoContainer and all its logical child containers.
+     * Dispose the components of this Container and all its logical child containers.
      * The lifecycle operation is delegated to the component adapter,
      * if it is an instance of {@link Behavior lifecycle manager}.
      * The actual {@link LifecycleStrategy lifecycle strategy} supported
@@ -734,7 +734,7 @@
     		throw new IllegalArgumentException(MESSAGE);
     	}
     	
-    	//Todo: Circular Import Dependency on AbstractDelegatingPicoContainer
+    	//Todo: Circular Import Dependency on AbstractDelegatingContainer
     	if (child instanceof AbstractDelegatingContainer) {
     		AbstractDelegatingContainer delegateChild = (AbstractDelegatingContainer) child;
     		while(delegateChild != null) {
@@ -845,7 +845,7 @@
     /**
      * {@inheritDoc}
      * Loops over all component adapters and invokes
-     * start(PicoContainer) method on the ones which are LifecycleManagers
+     * start(Container) method on the ones which are LifecycleManagers
      */
     private void startAdapters() {
         Collection<ComponentAdapter<?>> adapters = getComponentAdapters();
@@ -876,7 +876,7 @@
     /**
      * {@inheritDoc}
      * Loops over started component adapters (in inverse order) and invokes
-     * stop(PicoContainer) method on the ones which are LifecycleManagers
+     * stop(Container) method on the ones which are LifecycleManagers
      */
     private void stopAdapters() {
         for (int i = startedComponentAdapters.size() - 1; 0 <= i; i--) {
@@ -895,7 +895,7 @@
     /**
      * {@inheritDoc}
      * Loops over all component adapters (in inverse order) and invokes
-     * dispose(PicoContainer) method on the ones which are LifecycleManagers
+     * dispose(Container) method on the ones which are LifecycleManagers
      */
     private void disposeAdapters() {
         for (int i = getOrderedComponentAdapters().size() - 1; 0 <= i; i--) {

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/Disposable.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/Disposable.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/Disposable.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/Disposable.java Mon Jan 21 09:18:44 2008
@@ -22,7 +22,7 @@
  * Startable#stop()} (if the component implements the {@link Startable} interface).
  * @see org.apache.composer.core.Startable the Startable interface if you need to <code>start()</code> and
  *      <code>stop()</code> semantics.
- * @see Container the main PicoContainer interface (and hence its subinterfaces and
+ * @see Container the main Container interface (and hence its subinterfaces and
  *      implementations like {@link DefaultContainer}) implement this interface.
  */
 public interface Disposable {

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/LifecycleException.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/LifecycleException.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/LifecycleException.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/LifecycleException.java Mon Jan 21 09:18:44 2008
@@ -39,7 +39,7 @@
     }
 
     public String getMessage() {
-        return "PicoLifecycleException: method '" + method + "', instance '"+ instance + ", " + super.getMessage();
+        return "LifecycleException: method '" + method + "', instance '"+ instance + ", " + super.getMessage();
     }
 
 }

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/MutableContainer.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/MutableContainer.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/MutableContainer.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/MutableContainer.java Mon Jan 21 09:18:44 2008
@@ -25,7 +25,7 @@
  * @author Paul Hammant
  * @author Aslak Helles&oslash;y
  * @author Jon Tirs&eacute;n
- * @see <a href="package-summary.html#package_description">See package description for basic overview how to use PicoContainer.</a>
+ * @see <a href="package-summary.html#package_description">See package description for basic overview how to use MutableContainer.</a>
  */
 public interface MutableContainer extends Container, Startable, Disposable {
 
@@ -37,7 +37,7 @@
      * <h4>Tips for Parameter usage</h4>
      * <ul>
      * <li><strong>Partial Autowiring: </strong>If you have two constructor args to match and you only wish to specify one of the constructors and
-     * let PicoContainer wire the other one, you can use as parameters:
+     * let Composer wire the other one, you can use as parameters:
      * <code><strong>new ComponentParameter()</strong>, new ComponentParameter("someService")</code>
      * The default constructor for the component parameter indicates auto-wiring should take place for
      * that parameter.
@@ -56,7 +56,7 @@
      *                     to the constructor when it is instantiated. Container implementations may ignore
      *                     one or more of these hints.
      *
-     * @return the same instance of MutablePicoContainer
+     * @return the same instance of MutableContainer
      *
      * @throws CompositionException if registration of the component fails.
      * @see org.apache.composer.core.Parameter
@@ -73,7 +73,7 @@
      *
      * @param implOrInstance Component implementation or instance
      *
-     * @return the same instance of MutablePicoContainer
+     * @return the same instance of MutableContainer
      *
      * @throws CompositionException if registration fails.
      */
@@ -85,7 +85,7 @@
      * @param name the name of the config item
      * @param val the value of the config item
      *
-     * @return the same instance of MutablePicoContainer
+     * @return the same instance of MutableContainer
      *
      * @throws CompositionException if registration fails.
      */
@@ -97,7 +97,7 @@
      *
      * @param componentAdapter the addAdapter
      *
-     * @return the same instance of MutablePicoContainer
+     * @return the same instance of MutableContainer
      *
      * @throws CompositionException if registration fails.
      */
@@ -117,12 +117,12 @@
      *
      * @param componentInstance the component instance to unregister.
      *
-     * @return the same instance of MutablePicoContainer
+     * @return the same instance of MutableContainer
      */
     <T> ComponentAdapter<T> removeComponentByInstance(T componentInstance);
 
     /**
-     * Make a child container, using the same implementation of MutablePicoContainer as the parent.
+     * Make a child container, using the same implementation of MutableContainer as the parent.
      * It will have a reference to this as parent.  This will list the resulting MPC as a child.
      * Lifecycle events will be cascaded from parent to child
      * as a consequence of this.
@@ -140,7 +140,7 @@
      *
      * @param child the child container
      *
-     * @return the same instance of MutablePicoContainer
+     * @return the same instance of MutableContainer
      *
      */
     MutableContainer addChildContainer(Container child);
@@ -161,7 +161,7 @@
      * You can change the characteristic of registration of all subsequent components in this container.
      *
      * @param properties
-     * @return the same Pico instance with changed properties
+     * @return the same container instance with changed properties
      */
     MutableContainer change(Properties... properties);
 
@@ -169,7 +169,7 @@
      * You can set for the following operation only the characteristic of registration of a component on the fly.
      *
      * @param properties
-     * @return the same Pico instance with temporary properties
+     * @return the same container instance with temporary properties
      */
     MutableContainer as(Properties... properties);
 

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/ObjectReference.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/ObjectReference.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/ObjectReference.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/ObjectReference.java Mon Jan 21 09:18:44 2008
@@ -20,7 +20,7 @@
  * A way to refer to objects that are stored in "awkward" places (for example inside a
  * <code>HttpSession</code> or {@link ThreadLocal}).
  * <p/>
- * This interface is typically implemented by someone integrating Pico into an existing container.
+ * This interface is typically implemented by someone integrating Composer into an existing container.
  *
  * @author Joe Walnes
  */

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/package.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/package.html?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/package.html (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/package.html Mon Jan 21 09:18:44 2008
@@ -9,7 +9,7 @@
 </p>
 <p>
 When you use
-PicoContainer for dependency injection, you create a new instance of {@link org.apache.composer.core.MutablePicoContainer},
+PicoContainer for dependency injection, you create a new instance of {@link org.apache.composer.core.MutableContainer},
 register classes (and possibly
 {@link org.apache.composer.core.ComponentAdapter}s and component instances created through other means).
 </p>

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/ComposerVisitorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/ComposerVisitorTestCase.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/ComposerVisitorTestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/ComposerVisitorTestCase.java Mon Jan 21 09:18:44 2008
@@ -33,7 +33,7 @@
 
 
 /**
- * Test general PicoVisitor behaviour.
+ * Test general ContainerVisitor behaviour.
  * @author J&ouml;rg Schaible
  * @author Mauro Talevi
  */
@@ -46,7 +46,7 @@
         MutableContainer pico = new DefaultContainer();
         try {
             pico.accept(new VerifyingVisitor());
-            fail("PicoVisitorTraversalException expected");
+            fail("ComposerVisitorTraversalException expected");
         } catch (AbstractContainerVisitor.ComposerVisitorTraversalException e) {
             assertTrue(e.getMessage().indexOf(VerifyingVisitor.class.getName()) >= 0);
         }
@@ -85,8 +85,8 @@
         }});
         try {
             visitor.traverse(pico);
-            fail("PicoCompositionException expected");
-        } catch (RuntimeException e) {
+            fail("ComposerCompositionException expected");
+        } catch (CompositionException e) {
             assertEquals("message", e.getMessage());
             assertSame(exception, e.getCause());
         }

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/ContainerBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/ContainerBuilderTestCase.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/ContainerBuilderTestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/ContainerBuilderTestCase.java Mon Jan 21 09:18:44 2008
@@ -370,7 +370,7 @@
     }
 
 
-    @Test public void testWithCustomPicoContainer() {
+    @Test public void testWithCustomContainer() {
         MutableContainer mpc = new ContainerBuilder().implementedBy(TestContainer.class).build();
         String foo = simplifyRepresentation(mpc);
         assertEquals("org.apache.composer.core.ContainerBuilderTestCase_-TestContainer\n" +
@@ -417,13 +417,13 @@
         foo = foo.replaceAll("\n    delegate\n","\n");
         foo = foo.replaceAll("\n      delegate\n","\n");
         foo = foo.replaceAll("\n        delegate\n","\n");
-        foo = foo.replaceAll("\n  componentCharacteristic class=\"org.apache.composer.core.DefaultPicoContainer$1\"","");
+        foo = foo.replaceAll("\n  componentCharacteristic class=\"org.apache.composer.core.DefaultContainer$1\"","");
         foo = foo.replaceAll("\n  componentProperties","");
         foo = foo.replaceAll("\n    startedComponentAdapters","");
         foo = foo.replaceAll("\"class=","\"\nclass=");
         foo = foo.replaceAll("\n  componentFactory\n","\n");
         foo = foo.replaceAll("\n  lifecycleManager","");
-        foo = foo.replaceAll("class=\"org.apache.composer.core.DefaultPicoContainer_1\"","");
+        foo = foo.replaceAll("class=\"org.apache.composer.core.DefaultContainer_1\"","");
         foo = foo.replaceAll("class=","=");
         foo = foo.replaceAll("\"","");
         foo = foo.replaceAll(" \n","\n");

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/DefaultContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/DefaultContainerTestCase.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/DefaultContainerTestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/DefaultContainerTestCase.java Mon Jan 21 09:18:44 2008
@@ -60,7 +60,7 @@
 public final class DefaultContainerTestCase extends
         AbstractContainerTest {
 
-	protected MutableContainer createPicoContainer(Container parent) {
+	protected MutableContainer createContainer(Container parent) {
 		return new DefaultContainer(parent);
 	}
 
@@ -78,8 +78,8 @@
 	}
 
 	@Test public void testUpDownDependenciesCannotBeFollowed() {
-		MutableContainer parent = createPicoContainer(null);
-		MutableContainer child = createPicoContainer(parent);
+		MutableContainer parent = createContainer(null);
+		MutableContainer child = createContainer(parent);
 
 		// ComponentF -> ComponentA -> ComponentB+C
 		child.addComponent(ComponentF.class);
@@ -98,7 +98,7 @@
 	}
 
 	@Test public void testComponentsCanBeRemovedByInstance() {
-		MutableContainer pico = createPicoContainer(null);
+		MutableContainer pico = createContainer(null);
 		pico.addComponent(HashMap.class);
 		pico.addComponent(ArrayList.class);
 		List list = pico.getComponent(List.class);
@@ -110,14 +110,14 @@
 	}
 
 	@Test public void testComponentInstancesListIsReturnedForNullType() {
-		MutableContainer pico = createPicoContainer(null);
+		MutableContainer pico = createContainer(null);
 		List componentInstances = pico.getComponents(null);
 		assertNotNull(componentInstances);
 		assertEquals(0, componentInstances.size());
 	}
 
 	@Test public void testComponentsWithCommonSupertypeWhichIsAConstructorArgumentCanBeLookedUpByConcreteType() {
-		MutableContainer pico = createPicoContainer(null);
+		MutableContainer pico = createContainer(null);
 		pico.addComponent(LinkedList.class, LinkedList.class, Parameter.ZERO);
 		pico.addComponent(ArrayList.class);
 		assertEquals(ArrayList.class, pico
@@ -126,13 +126,13 @@
 
 	/*
 	 * When pico tries to resolve DecoratedTouchable it find as dependency
-	 * itself and SimpleTouchable. Problem is basically the same as above. Pico
+	 * itself and SimpleTouchable. Problem is basically the same as above. Comooser
 	 * should not consider self as solution.
 	 * 
 	 * JS fixed it ( PICO-222 ) KP
 	 */
 	@Test public void testUnambiguouSelfDependency() {
-		MutableContainer pico = createPicoContainer(null);
+		MutableContainer pico = createContainer(null);
 		pico.addComponent(SimpleTouchable.class);
 		pico.addComponent(DecoratedTouchable.class);
 		Touchable t = (Touchable) pico
@@ -140,8 +140,8 @@
 		assertNotNull(t);
 	}
 
-	@Test public void testPicoUsedInBuilderStyle() {
-		MutableContainer pico = createPicoContainer(null);
+	@Test public void testUsedInBuilderStyle() {
+		MutableContainer pico = createContainer(null);
 		Touchable t = pico.change(Characteristics.CACHE).addComponent(
 				SimpleTouchable.class).addComponent(DecoratedTouchable.class)
 				.getComponent(DecoratedTouchable.class);
@@ -183,7 +183,7 @@
 		}
 	}
 
-	@Test public void testDefaultPicoContainerReturnsNewInstanceForEachCallWhenUsingTransientComponentAdapter() {
+	@Test public void testDefaultContainerReturnsNewInstanceForEachCallWhenUsingTransientComponentAdapter() {
 
 		DefaultContainer picoContainer = new DefaultContainer(
 				new Caching().wrap(new ConstructorInjection()));
@@ -208,7 +208,7 @@
 	}
 
 	@Test public void testShouldProvideInfoAboutDependingWhenAmbiguityHappens() {
-		MutableContainer pico = this.createPicoContainer(null);
+		MutableContainer pico = this.createContainer(null);
 		pico.addComponent(new ArrayList());
 		pico.addComponent(new LinkedList());
 		pico.addComponent(DependsOnCollection.class);
@@ -502,7 +502,7 @@
 
 	@Test public void testCanRegisterTwoComponentsImplementingSameInterfaceOneWithInterfaceAsKey()
 			throws Exception {
-		MutableContainer container = createPicoContainer(null);
+		MutableContainer container = createContainer(null);
 
 		container.addComponent(SimpleA.class);
 		container.addComponent(A.class, WrappingA.class);
@@ -515,7 +515,7 @@
 
 	@Test public void testCanRegisterTwoComponentsWithSameImplementionAndDifferentKey()
 			throws Exception {
-		MutableContainer container = createPicoContainer(null);
+		MutableContainer container = createContainer(null);
 
 		container.addComponent(SimpleA.class);
 		container.addComponent("A", SimpleA.class);
@@ -528,8 +528,8 @@
 				.getComponent(SimpleA.class));
 	}
 
-	@Test public void testPicoCanDifferentiateBetweenNamedStringsThatWouldOtherwiseBeAmbiguous() {
-		MutableContainer mpc = createPicoContainer(null);
+	@Test public void testComposerCanDifferentiateBetweenNamedStringsThatWouldOtherwiseBeAmbiguous() {
+		MutableContainer mpc = createContainer(null);
 		mpc.addComponent("greeting", "1");
 		mpc.addComponent("message", "2");
 		mpc.as(Characteristics.USE_NAMES).addComponent(
@@ -538,8 +538,8 @@
 				.getMessage());
 	}
 
-	@Test public void testPicoCanDifferentiateBetweenNamedObjectsThatWouldOtherwiseBeAmbiguous() {
-		MutableContainer mpc = createPicoContainer(null);
+	@Test public void testComposerCanDifferentiateBetweenNamedObjectsThatWouldOtherwiseBeAmbiguous() {
+		MutableContainer mpc = createContainer(null);
 		Horse dobbin = new Horse();
 		Horse redRum = new Horse();
 		mpc.addComponent("dobbin", dobbin);
@@ -548,8 +548,8 @@
 		assertEquals(redRum, mpc.getComponent(CdiTurtle.class).horse);
 	}
 
-	@Test public void testPicoCanDifferentiateBetweenNamedIntsThatWouldOtherwiseBeAmbiguous() {
-		MutableContainer mpc = createPicoContainer(null);
+	@Test public void testComposerCanDifferentiateBetweenNamedIntsThatWouldOtherwiseBeAmbiguous() {
+		MutableContainer mpc = createContainer(null);
 		mpc.addComponent("one", 1);
 		mpc.addComponent("two", 2);
 		mpc.as(Characteristics.USE_NAMES).addComponent(NeedsTwo.class);
@@ -619,7 +619,7 @@
 
 	@Test public void testMixingOfSDIandCDI() {
 
-		MutableContainer container = createPicoContainer(null).change(
+		MutableContainer container = createContainer(null).change(
 				Characteristics.CACHE);
 		container.addComponent(Horse.class);
 		container.change(SDI);
@@ -637,7 +637,7 @@
 
 	@Test public void testMixingOfSDIandCDIDifferently() {
 
-		MutableContainer container = createPicoContainer(null).change(
+		MutableContainer container = createContainer(null).change(
 				Characteristics.CACHE);
 		container.addComponent(Horse.class);
 		container.addComponent(CdiTurtle.class);
@@ -654,7 +654,7 @@
 
 	@Test public void testMixingOfSDIandCDIInBuilderStyle() {
 
-		MutableContainer container = createPicoContainer(null).change(
+		MutableContainer container = createContainer(null).change(
 				Characteristics.CACHE);
 		container.addComponent(Horse.class).change(SDI).addComponent(
 				SdiDonkey.class).addComponent(SdiRabbit.class).change(CDI)
@@ -680,7 +680,7 @@
 
 	@Test public void testMixingOfSDIandCDIWithTemporaryCharacterizations() {
 
-		MutableContainer container = createPicoContainer(null).change(
+		MutableContainer container = createContainer(null).change(
 				Characteristics.CACHE);
 		container.addComponent(Horse.class);
 		container.addComponent(CdiTurtle.class);
@@ -696,7 +696,7 @@
 
 	@Test public void testMixingOfSDIandCDIWithTemporaryCharacterizationsDifferently() {
 
-		MutableContainer container = createPicoContainer(null).change(
+		MutableContainer container = createContainer(null).change(
 				Characteristics.CACHE);
 		container.as(SDI).addComponent(SdiDonkey.class);
 		container.as(SDI).addComponent(SdiRabbit.class);
@@ -729,7 +729,7 @@
 	}
 
 	@Test public void testThatComponentCannotBeRemovedFromStartedContainer() {
-		MutableContainer container = createPicoContainer(null);
+		MutableContainer container = createContainer(null);
 		container.addComponent(Map.class, HashMap.class);
 		container.start();
 		try {
@@ -740,7 +740,7 @@
 	}
 
 	@Test public void testThatSimpleStringComponentIsAddedOnlyOnce() {
-		MutableContainer container = createPicoContainer(null);
+		MutableContainer container = createContainer(null);
 		container.addComponent("foo bar");
 		assertEquals(1, container.getComponentAdapters().size());
 	}

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/DelegatingMutableContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/DelegatingMutableContainerTestCase.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/DelegatingMutableContainerTestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/DelegatingMutableContainerTestCase.java Mon Jan 21 09:18:44 2008
@@ -29,7 +29,7 @@
 
 public class DelegatingMutableContainerTestCase extends AbstractContainerTest {
 
-    protected MutableContainer createPicoContainer(Container parent) {
+    protected MutableContainer createContainer(Container parent) {
         return new MyDelegatingMutableContainer(new DefaultContainer());
     }
 

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java Mon Jan 21 09:18:44 2008
@@ -39,14 +39,14 @@
 public class ImplementationHidingWithDefaultContainerTestCase extends AbstractImplementationHidingContainerTest {
 
     protected MutableContainer createImplementationHidingPicoContainer() {
-        return createPicoContainer(null);
+        return createContainer(null);
     }
 
     protected Properties[] getProperties() {
         return new Properties[] {Characteristics.NO_CACHE, Characteristics.NO_HIDE_IMPL};
     }
 
-    protected MutableContainer createPicoContainer(Container parent) {
+    protected MutableContainer createContainer(Container parent) {
         return new DefaultContainer(new Caching().wrap(new ImplementationHiding().wrap(new ConstructorInjection())), parent);
     }
     

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/DefaultContainerTreeSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/DefaultContainerTreeSerializationTestCase.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/DefaultContainerTreeSerializationTestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/DefaultContainerTreeSerializationTestCase.java Mon Jan 21 09:18:44 2008
@@ -40,7 +40,7 @@
  * @author Paul Hammant
  */
 public class DefaultContainerTreeSerializationTestCase extends AbstractContainerTest {
-    protected MutableContainer createPicoContainer(Container parent) {
+    protected MutableContainer createContainer(Container parent) {
         return new DefaultContainer(parent);
     }
 
@@ -51,8 +51,8 @@
     @Test public void testContainerIsDeserializableWithParent() throws ComposerException,
                                                                  IOException, ClassNotFoundException {
 
-        Container parent = createPicoContainer(null);
-        MutableContainer child = createPicoContainer(parent);
+        Container parent = createContainer(null);
+        MutableContainer child = createContainer(parent);
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream oos = new ObjectOutputStream(baos);

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/GenericsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/GenericsTestCase.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/GenericsTestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/GenericsTestCase.java Mon Jan 21 09:18:44 2008
@@ -31,7 +31,7 @@
     }
 
     /*
-    private MutablePicoContainer pico;
+    private MutableContainer pico;
     private Shark shark;
     private Cod cod;
     private Bowl bowl;

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/monitors/NullComponentMonitorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/monitors/NullComponentMonitorTestCase.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/monitors/NullComponentMonitorTestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/monitors/NullComponentMonitorTestCase.java Mon Jan 21 09:18:44 2008
@@ -50,7 +50,7 @@
         } catch (LifecycleException e) {
             assertEquals(makeMethod(), e.getMethod());
             assertEquals("foo", e.getInstance());
-            assertEquals("PicoLifecycleException: method 'public java.lang.String java.lang.String.toString()', instance 'foo, java.lang.RuntimeException", e.getMessage());
+            assertEquals("LifecycleException: method 'public java.lang.String java.lang.String.toString()', instance 'foo, java.lang.RuntimeException", e.getMessage());
         }
         assertNull(ncm.noComponentFound(makePico(), String.class));
 

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractContainerTest.java?rev=613940&r1=613939&r2=613940&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractContainerTest.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractContainerTest.java Mon Jan 21 09:18:44 2008
@@ -73,13 +73,13 @@
 import org.apache.composer.core.visitors.AbstractContainerVisitor;
 import org.apache.composer.core.visitors.VerifyingVisitor;
 
-/** This test tests (at least it should) all the methods in MutablePicoContainer. */
+/** This test tests (at least it should) all the methods in MutableContainer. */
 public abstract class AbstractContainerTest {
 
-    protected abstract MutableContainer createPicoContainer(Container parent);
+    protected abstract MutableContainer createContainer(Container parent);
 
     protected final MutableContainer createPicoContainerWithDependsOnTouchableOnly() throws CompositionException {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
         pico.addComponent(DependsOnTouchable.class);
         return pico;
     }
@@ -110,7 +110,7 @@
     }
 
     @Test public void testRegistersSingleInstance() throws ComposerException {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
         StringBuffer sb = new StringBuffer();
         pico.addComponent(sb);
         assertSame(sb, pico.getComponent(StringBuffer.class));
@@ -174,7 +174,7 @@
 
     @Test public void testDuplicateRegistration() {
         try {
-            MutableContainer pico = createPicoContainer(null);
+            MutableContainer pico = createContainer(null);
             pico.addComponent(Object.class);
             pico.addComponent(Object.class);
             fail("Should have failed with duplicate registration");
@@ -184,14 +184,14 @@
     }
 
     @Test public void testExternallyInstantiatedObjectsCanBeRegisteredAndLookedUp() throws ComposerException {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
         final HashMap map = new HashMap();
         pico.as(getProperties()).addComponent(Map.class, map);
         assertSame(map, pico.getComponent(Map.class));
     }
 
     @Test public void testAmbiguousResolution() throws CompositionException {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
         pico.addComponent("ping", String.class);
         pico.addComponent("pong", "pang");
         try {
@@ -202,12 +202,12 @@
     }
 
     @Test public void testLookupWithUnregisteredKeyReturnsNull() throws CompositionException {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
         assertNull(pico.getComponent(String.class));
     }
 
     @Test public void testLookupWithUnregisteredTypeReturnsNull() throws CompositionException {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
         assertNull(pico.getComponent(String.class));
     }
 
@@ -218,7 +218,7 @@
     }
 
     @Test public void testUnsatisfiableDependenciesExceptionGivesVerboseEnoughErrorMessage() {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
         pico.addComponent(ComponentD.class);
 
         try {
@@ -238,7 +238,7 @@
     }
 
     @Test public void testUnsatisfiableDependenciesExceptionGivesUnsatisfiedDependencyTypes() {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
         // D depends on E and B
         pico.addComponent(ComponentD.class);
 
@@ -281,7 +281,7 @@
     }
 
     @Test public void testCyclicDependencyThrowsCyclicDependencyException() {
-        assertCyclicDependencyThrowsCyclicDependencyException(createPicoContainer(null));
+        assertCyclicDependencyThrowsCyclicDependencyException(createContainer(null));
     }
 
     private static void assertCyclicDependencyThrowsCyclicDependencyException(MutableContainer pico) {
@@ -304,12 +304,12 @@
     }
 
     @Test public void testCyclicDependencyThrowsCyclicDependencyExceptionWithParentContainer() {
-        MutableContainer pico = createPicoContainer(createPicoContainer(null));
+        MutableContainer pico = createContainer(createContainer(null));
         assertCyclicDependencyThrowsCyclicDependencyException(pico);
     }
 
     @Test public void testRemovalNonRegisteredComponentAdapterWorksAndReturnsNull() {
-        final MutableContainer picoContainer = createPicoContainer(null);
+        final MutableContainer picoContainer = createContainer(null);
         assertNull(picoContainer.removeComponent("COMPONENT DOES NOT EXIST"));
     }
 
@@ -319,7 +319,7 @@
         ConstructorInjector c1 = new ConstructorInjector("1", Object.class, null, new NullComponentMonitor(), new NullLifecycleStrategy(), false);
         ConstructorInjector c2 = new ConstructorInjector("2", String.class, null, new NullComponentMonitor(), new NullLifecycleStrategy(), false);
 
-        MutableContainer picoContainer = createPicoContainer(null);
+        MutableContainer picoContainer = createContainer(null);
         picoContainer.addAdapter(c1).addAdapter(c2);
         Collection<ComponentAdapter<?>> list2 = picoContainer.getComponentAdapters();
         //registration order should be maintained
@@ -333,7 +333,7 @@
         assertTrue("instances should be created in same order as adapters are created",
                    picoContainer.getComponents().get(1) instanceof String);
 
-        MutableContainer reversedPicoContainer = createPicoContainer(null);
+        MutableContainer reversedPicoContainer = createContainer(null);
         reversedPicoContainer.addAdapter(c2);
         reversedPicoContainer.addAdapter(c1);
         //registration order should be maintained
@@ -366,7 +366,7 @@
     }
 
     @Test public void testSameInstanceCanBeUsedAsDifferentTypeWhenCaching() {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
         pico.as(Characteristics.CACHE).addComponent("wt", WashableTouchable.class);
         pico.addComponent("nw", NeedsWashable.class);
         pico.as(Characteristics.CACHE).addComponent("nt", NeedsTouchable.class);
@@ -377,7 +377,7 @@
     }
 
     @Test public void testRegisterComponentWithObjectBadType() throws CompositionException {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
 
         try {
             pico.addComponent(Serializable.class, new Object());
@@ -400,7 +400,7 @@
 
     // http://jira.codehaus.org/secure/ViewIssue.jspa?key=PICO-52
     @Test public void testPico52() {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
 
         pico.addComponent("foo", JMSService.class, new ConstantParameter("0"), new ConstantParameter("something"));
         JMSService jms = (JMSService)pico.getComponent("foo");
@@ -444,7 +444,7 @@
     }
 
     @Test public void testAggregatedVerificationException() {
-        MutableContainer pico = createPicoContainer(null);
+        MutableContainer pico = createContainer(null);
         pico.addComponent(ComponentA.class);
         pico.addComponent(ComponentE.class);
         try {
@@ -462,7 +462,7 @@
 
 //    @Test public void testRegistrationOfAdapterSetsHostingContainerAsSelf() {
 //        final InstanceAdapter componentAdapter = new InstanceAdapter("", new Object());
-//        final MutablePicoContainer picoContainer = createPicoContainer(null);
+//        final MutableContainer picoContainer = createContainer(null);
 //        picoContainer.addAdapter(componentAdapter);
 //        assertSame(picoContainer, componentAdapter.getContainer());
 //    }
@@ -478,25 +478,25 @@
     // be able to pick up on.
 
 //    @Test public void testImplicitPicoContainerInjection() {
-//        MutablePicoContainer pico = createPicoContainer(null);
+//        MutableContainer pico = createContainer(null);
 //        pico.addAdapter(ContainerDependency.class);
 //        ContainerDependency dep = (ContainerDependency) pico.getComponent(ContainerDependency.class);
 //        assertSame(pico, dep.pico);
 //    }
 
     @Test public void testShouldReturnNullWhenUnregistereingUnmanagedComponent() {
-        final MutableContainer pico = createPicoContainer(null);
+        final MutableContainer pico = createContainer(null);
         assertNull(pico.removeComponentByInstance("yo"));
     }
 
     @Test public void testShouldReturnNullForComponentAdapterOfUnregisteredType() {
-        final MutableContainer pico = createPicoContainer(null);
+        final MutableContainer pico = createContainer(null);
         assertNull(pico.getComponent(List.class));
     }
 
     @Test public void testShouldReturnNonMutableParent() {
         DefaultContainer parent = new DefaultContainer();
-        final MutableContainer picoContainer = createPicoContainer(parent);
+        final MutableContainer picoContainer = createContainer(parent);
         assertNotSame(parent, picoContainer.getParent());
         assertFalse(picoContainer.getParent() instanceof MutableContainer);
     }
@@ -521,7 +521,7 @@
     }
 
     @Test public void testContainerCascadesDefaultLifecycle() {
-        final MutableContainer picoContainer = createPicoContainer(null);
+        final MutableContainer picoContainer = createContainer(null);
         Foo foo = new Foo();
         picoContainer.addComponent(foo);
         picoContainer.start();
@@ -533,9 +533,9 @@
     }
 
     @Test public void testComponentInstancesFromParentsAreNotDirectlyAccessible2() {
-        final MutableContainer a = createPicoContainer(null);
-        final MutableContainer b = createPicoContainer(a);
-        final MutableContainer c = createPicoContainer(b);
+        final MutableContainer a = createContainer(null);
+        final MutableContainer b = createContainer(a);
+        final MutableContainer c = createContainer(b);
 
         Object ao = new Object();
         Object bo = new Object();
@@ -551,9 +551,9 @@
     }
 
     @Test public void testStartStopAndDisposeCascadedtoChildren() {
-        final MutableContainer parent = createPicoContainer(null);
+        final MutableContainer parent = createContainer(null);
         parent.addComponent(new StringBuffer());
-        final MutableContainer child = createPicoContainer(parent);
+        final MutableContainer child = createContainer(parent);
         parent.addChildContainer(child);
         child.addComponent(LifeCycleMonitoring.class);
         parent.start();
@@ -581,13 +581,13 @@
     }
 
     @Test public void testMakingOfChildContainer() {
-        final MutableContainer parent = createPicoContainer(null);
+        final MutableContainer parent = createContainer(null);
         MutableContainer child = parent.makeChildContainer();
         assertNotNull(child);
     }
 
     @Test public void testMakingOfChildContainerPercolatesLifecycleManager() {
-        final MutableContainer parent = createPicoContainer(null);
+        final MutableContainer parent = createContainer(null);
         parent.addComponent("one", TestLifecycleComponent.class);
         MutableContainer child = parent.makeChildContainer();
         assertNotNull(child);
@@ -643,11 +643,11 @@
     }
 
     @Test public void testStartStopAndDisposeNotCascadedtoRemovedChildren() {
-        final MutableContainer parent = createPicoContainer(null);
+        final MutableContainer parent = createContainer(null);
         parent.addComponent(new StringBuffer());
         StringBuffer sb = parent.getComponents(StringBuffer.class).get(0);
 
-        final MutableContainer child = createPicoContainer(parent);
+        final MutableContainer child = createContainer(parent);
         assertEquals(parent, parent.addChildContainer(child));
         child.addComponent(LifeCycleMonitoring.class);
         assertTrue(parent.removeChildContainer(child));
@@ -662,7 +662,7 @@
     @Test public void testShouldCascadeStartStopAndDisposeToChild() {
 
         StringBuffer sb = new StringBuffer();
-        final MutableContainer parent = createPicoContainer(null);
+        final MutableContainer parent = createContainer(null);
         parent.addComponent(sb);
         parent.addComponent(Map.class, HashMap.class);
 
@@ -740,7 +740,7 @@
     protected abstract Properties[] getProperties();
 
     @Test public void testAcceptImplementsBreadthFirstStrategy() {
-        final MutableContainer parent = createPicoContainer(null);
+        final MutableContainer parent = createContainer(null);
         final MutableContainer child = parent.makeChildContainer();
         ComponentAdapter hashMapAdapter =
             parent.as(getProperties()).addAdapter(new ConstructorInjector(HashMap.class, HashMap.class, null, new NullComponentMonitor(), new NullLifecycleStrategy(), false))
@@ -778,7 +778,7 @@
 
     @Test public void testAmbiguousDependencies() throws CompositionException {
 
-        MutableContainer pico = this.createPicoContainer(null);
+        MutableContainer pico = this.createContainer(null);
 
         // Register two Touchables that Fred will be confused about
         pico.addComponent(SimpleTouchable.class);
@@ -822,7 +822,7 @@
     }
 
     @Test public void testNoArgConstructorToBeSelected() {
-        MutableContainer pico = this.createPicoContainer(null);
+        MutableContainer pico = this.createContainer(null);
         pico.addComponent(ComponentA.class);
         pico.addComponent(NonGreedyClass.class, NonGreedyClass.class, Parameter.ZERO);
 



Mime
View raw message