svn commit: r613941 - in /incubator/composer/trunk/core/src: java/org/apache/composer/core/ java/org/apache/composer/core/visitors/ test/org/apache/composer/core/alternatives/issues/ test/org/apache/composer/core/defaults/ test/org/apache/composer/core...

[ha...@apache.org]

Author: hammant
Date: Mon Jan 21 09:21:05 2008
New Revision: 613941

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

Modified:
    incubator/composer/trunk/core/src/java/org/apache/composer/core/package.html
    incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/alternatives/issues/Issue0214TestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/CollectionComponentParameterTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/DefaultContainerLifecycleTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/GenericsTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/UserQuestionTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractContainerTest.java

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=613941&r1=613940&r2=613941&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:21:05 2008
@@ -4,24 +4,24 @@
 </head>
 <body>
 <p>
-This package contains the core API for PicoContainer, a compact container for working with the
+This package contains the core API for Apache Composer, a compact container for working with the
 <a href="http://www.martinfowler.com/articles/injection.html">dependency injection</a> pattern.
 </p>
 <p>
 When you use
-PicoContainer for dependency injection, you create a new instance of {@link org.apache.composer.core.MutableContainer},
+Apache Composer 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>
 <p>
-Object instances can then be accessed through the {@link org.apache.composer.core.PicoContainer} interface. The container will create all
+Object instances can then be accessed through the {@link org.apache.composer.core.Container} interface. The container will create all
 instances for you automatically, resolving their dependencies and order of instantiation. The default container implementation is
-the {@link org.apache.composer.core.DefaultPicoContainer} class.
+the {@link org.apache.composer.core.DefaultContainer} class.
 </p>
 
 <p>An extensive user guide,
 a list of Frequently Asked Questions (FAQ) with answers and a lot more information is available from the
-<a href="http://www.picocontainer.org/">PicoContainer</a> website. You can also find various extensions, wrappers
+<a href="http://www.picocontainer.org/">Apache Composer</a> website. You can also find various extensions, wrappers
 and utility libraries that are based on this core API there.</p>
 </body>
 </html>

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java?rev=613941&r1=613940&r2=613941&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java (original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java Mon Jan 21 09:21:05 2008
@@ -20,7 +20,7 @@
  * in one PicoVisitor type.  Example:
  *
  *<pre>
- * PicoContainer container = new DefaultPicoContainer();
+ * PicoContainer container = new DefaultContainer();
  * PicoContainer child = container.makeChildContainer();
  *
  * final List allContainers = new ArrayList();

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/alternatives/issues/Issue0214TestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/alternatives/issues/Issue0214TestCase.java?rev=613941&r1=613940&r2=613941&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/alternatives/issues/Issue0214TestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/alternatives/issues/Issue0214TestCase.java Mon Jan 21 09:21:05 2008
@@ -44,7 +44,7 @@
          * "ComponentAdapter delegate = componentFactory.createComponentAdapter(componentKey,
          * componentImplementation, new Parameter[0]);". Instead of "new
          * Parameter[0]" it should be "null" to have a behaviour consistent to
-         * DefaultPicoContainer, i.e. if PicoContainer shall resolve
+         * DefaultContainer, i.e. if PicoContainer shall resolve
          * dependencies itself.
          */
         pico.addComponent(I2.class, C.class);

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/CollectionComponentParameterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/CollectionComponentParameterTestCase.java?rev=613941&r1=613940&r2=613941&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/CollectionComponentParameterTestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/CollectionComponentParameterTestCase.java Mon Jan 21 09:21:05 2008
@@ -127,7 +127,7 @@
 		}
 	}
 
-	private MutableContainer getDefaultPicoContainer() {
+	private MutableContainer getDefaultContainer() {
 		MutableContainer mpc = new DefaultContainer(new Caching());
 		mpc.addComponent(Bowl.class);
 		mpc.addComponent(Cod.class);
@@ -137,7 +137,7 @@
 
 	@Test
 	public void testNativeArrays() {
-		MutableContainer mpc = getDefaultPicoContainer();
+		MutableContainer mpc = getDefaultContainer();
 		Cod cod = mpc.getComponent(Cod.class);
 		Bowl bowl = mpc.getComponent(Bowl.class);
 		assertEquals(1, bowl.cods.length);
@@ -217,7 +217,7 @@
 
 	@Test
 	public void testShouldNotInstantiateCollectionForUngenericCollectionParameters() {
-		MutableContainer pico = getDefaultPicoContainer();
+		MutableContainer pico = getDefaultContainer();
 		pico.addComponent(UngenericCollectionBowl.class);
 		try {
 			pico.getComponent(UngenericCollectionBowl.class);
@@ -241,7 +241,7 @@
 
 	@Test
 	public void testShouldFailWhenThereAreNoComponentsToPutInTheArray() {
-		MutableContainer pico = getDefaultPicoContainer();
+		MutableContainer pico = getDefaultContainer();
 		pico.addComponent(AnotherGenericCollectionBowl.class);
 		try {
 			pico.getComponent(AnotherGenericCollectionBowl.class);
@@ -253,7 +253,7 @@
 
 	@Test
 	public void testAllowsEmptyArraysIfEspeciallySet() {
-		MutableContainer pico = getDefaultPicoContainer();
+		MutableContainer pico = getDefaultContainer();
 		pico.addComponent(AnotherGenericCollectionBowl.class,
 				AnotherGenericCollectionBowl.class,
 				ComponentParameter.ARRAY_ALLOW_EMPTY);
@@ -280,7 +280,7 @@
 
 	@Test
 	public void testWillOmitSelfFromCollection() {
-		MutableContainer pico = getDefaultPicoContainer();
+		MutableContainer pico = getDefaultContainer();
 		pico.addComponent(SimpleTouchable.class);
 		pico.addComponent(TouchableObserver.class);
 		Touchable observer = pico.getComponent(TouchableObserver.class);

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/DefaultContainerLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/DefaultContainerLifecycleTestCase.java?rev=613941&r1=613940&r2=613941&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/DefaultContainerLifecycleTestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/DefaultContainerLifecycleTestCase.java Mon Jan 21 09:21:05 2008
@@ -55,7 +55,7 @@
 import org.apache.composer.core.testmodel.RecordingLifecycle.Two;
 
 /**
- * This class tests the lifecycle aspects of DefaultPicoContainer.
+ * This class tests the lifecycle aspects of DefaultContainer.
  *
  * @author Aslak Helles&oslash;y
  * @author Paul Hammant

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=613941&r1=613940&r2=613941&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:21:05 2008
@@ -37,7 +37,7 @@
     private Bowl bowl;
 
     protected void setUp() throws Exception {
-        pico = new DefaultPicoContainer();
+        pico = new DefaultContainer();
 
         shark = new Shark();
         cod = new Cod();

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/UserQuestionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/UserQuestionTestCase.java?rev=613941&r1=613940&r2=613941&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/UserQuestionTestCase.java (original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/defaults/UserQuestionTestCase.java Mon Jan 21 09:21:05 2008
@@ -159,7 +159,7 @@
         MutableContainer pico = new DefaultContainer();
         Map<String,String> map = new HashMap<String,String>();
         pico.addComponent(map);
-        // See class level javadoc in DefaultPicoContainer - about precedence. 
+        // See class level javadoc in DefaultContainer - about precedence.
         pico.addComponent(InterfaceX.class, Something.class);
         pico.addComponent(Disabled.class);
         pico.addComponent(Enabled.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=613941&r1=613940&r2=613941&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:21:05 2008
@@ -599,7 +599,7 @@
             assertEquals("child already started", "Cannot start.  Current container state was: STARTED", e.getMessage());
         }
         //TODO - The Behavior reference in child containers is not used. Thus is is almost pointless
-        // The reason is because DefaultPicoContainer's accept() method visits child containers' on its own.
+        // The reason is because DefaultContainer's accept() method visits child containers' on its own.
         // This may be file for visiting components in a tree for general cases, but for lifecycle, we
         // should hand to each Behavior's start(..) at each appropriate node. See mail-list discussion.
     }