incubator-composer-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r614261 - in /incubator/composer/trunk/composer-core/src: main/java/org/apache/composer/core/ main/java/org/apache/composer/core/behaviors/ main/java/org/apache/composer/core/containers/ main/java/org/apache/composer/core/injectors/ main/ja...
Date Tue, 22 Jan 2008 17:06:34 GMT
Author: mauro
Date: Tue Jan 22 09:06:30 2008
New Revision: 614261

URL: http://svn.apache.org/viewvc?rev=614261&view=rev
Log:
More renames.

Modified:
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/ContainerBuilder.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/DefaultContainer.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Startable.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/HiddenImplementation.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/PropertyApplicator.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/EmptyContainer.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/ImmutableContainer.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/PropertiesContainer.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/injectors/AbstractInjector.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/injectors/SetterInjector.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/parameters/ComponentParameter.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/security/CustomPermissionsURLClassLoader.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/DefaultContainerTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/alternatives/ImplementationHidingContainerTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/PropertyApplyingTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultContainerLifecycleTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultLazyInstantiationTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultMultipleConstructorTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0199TestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractComponentAdapterTest.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractContainerTest.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractImplementationHidingContainerTest.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractLazyInstantiationTest.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractMultipleConstructorTest.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/visitors/TraversalCheckingVisitorTest.java

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/ContainerBuilder.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/ContainerBuilder.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/ContainerBuilder.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/ContainerBuilder.java
Tue Jan 22 09:06:30 2008
@@ -41,7 +41,7 @@
 import java.util.List;
 
 /**
- * Helps assembles the myriad items available to a picocontainer.
+ * Helps assembles the myriad items available to a Container.
  * <p>Simple Example:</p>
  * <pre>
  * MutableContainer mpc = new ContainerBuilder()

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/DefaultContainer.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/DefaultContainer.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/DefaultContainer.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/DefaultContainer.java
Tue Jan 22 09:06:30 2008
@@ -91,12 +91,12 @@
 	private final ComponentFactory componentFactory;
     
 	/**
-	 * Parent picocontainer
+	 * Parent Container
 	 */
     private Container parent;
     
     /**
-     * All picocontainer children.
+     * All Container children.
      */
     private final Set<Container> children = new HashSet<Container>();
 
@@ -465,7 +465,7 @@
 
     private void throwIfPropertiesLeft(final Properties tmpProperties) {
         if(tmpProperties.size() > 0) {
-            throw new CompositionException("Unprocessed Characteristics:" + tmpProperties
+", refer http://picocontainer.org/unprocessed-properties-help.html");
+            throw new CompositionException("Unprocessed Characteristics:" + tmpProperties
+", refer http://apache.org/incubator/composer/unprocessed-properties-help.html");
         }
     }
 

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Startable.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Startable.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Startable.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Startable.java
Tue Jan 22 09:06:30 2008
@@ -24,7 +24,7 @@
  * and can further be called after every {@link Startable#start()}. If a component implements
the {@link Disposable}
  * interface as well, {@link Startable#stop()} should be called before {@link Disposable#dispose()}.</p>
  * <p/>
- * <p>For more advanced and pluggable lifecycle support, see the functionality offered
by picocontainer-gems
+ * <p>For more advanced and pluggable lifecycle support, see the functionality offered
by composer-gems
  * subproject.</p>
  * @see org.apache.composer.core.Disposable the Disposable interface if you need to <code>dispose()</code>
semantics.
  * @author Paul Hammant

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/HiddenImplementation.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/HiddenImplementation.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/HiddenImplementation.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/HiddenImplementation.java
Tue Jan 22 09:06:30 2008
@@ -32,7 +32,7 @@
  * of a real subject (behind a proxy) provided the key is an interface.
  * <p/>
  * This class exists here, because a) it has no deps on external jars, b) dynamic proxy is
quite easy.
- * The user is prompted to look at picocontainer-gems for alternate and bigger implementations.
+ * The user is prompted to look at composer-gems for alternate and bigger implementations.
  *
  * @author Aslak Helles&oslash;y
  * @author Paul Hammant

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/PropertyApplicator.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/PropertyApplicator.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/PropertyApplicator.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/PropertyApplicator.java
Tue Jan 22 09:06:30 2008
@@ -40,7 +40,7 @@
 /**
  * Decorating component adapter that can be used to set additional properties
  * on a component in a bean style. These properties must be managed manually
- * by the user of the API, and will not be managed by PicoContainer. This class
+ * by the user of the API, and will not be managed by Container. This class
  * is therefore <em>not</em> the same as {@link SetterInjector},
  * which is a true Setter Injection adapter.
  * <p/>

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/EmptyContainer.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/EmptyContainer.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/EmptyContainer.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/EmptyContainer.java
Tue Jan 22 09:06:30 2008
@@ -28,7 +28,7 @@
 import java.lang.annotation.Annotation;
 
 /**
- * empty pico container serving as recoil damper in situations where you
+ * empty container serving as recoil damper in situations where you
  * do not like to check whether container reference suplpied to you
  * is null or not
  *

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/ImmutableContainer.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/ImmutableContainer.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/ImmutableContainer.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/ImmutableContainer.java
Tue Jan 22 09:06:30 2008
@@ -27,7 +27,7 @@
 import java.lang.annotation.Annotation;
 
 /**
-* wrap pico container to achieve immutability
+* wrap container to achieve immutability
  * Typically its used to mock a parent container.
  *
  * @author Konstantin Pribluda

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/PropertiesContainer.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/PropertiesContainer.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/PropertiesContainer.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/PropertiesContainer.java
Tue Jan 22 09:06:30 2008
@@ -23,7 +23,7 @@
 import org.apache.composer.core.Container;
 
 /**
- * immutable pico container constructed from properties.
+ * immutable container constructed from properties.
  * intendet to be used with config parameter
  * 
  * @author k.pribluda

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/injectors/AbstractInjector.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/injectors/AbstractInjector.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/injectors/AbstractInjector.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/injectors/AbstractInjector.java
Tue Jan 22 09:06:30 2008
@@ -350,7 +350,7 @@
             msg.append(ambiguousDependency.getName());
             msg.append("' injected, but there are too many choices to inject. These:");
             msg.append(Arrays.asList(getAmbiguousComponentKeys()));
-            msg.append(", refer http://picocontainer.org/ambiguous-injectable-help.html");
+            msg.append(", refer http://apache.org/incubator/composer/ambiguous-injectable-help.html");
             return msg.toString();
         }
 

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/injectors/SetterInjector.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/injectors/SetterInjector.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/injectors/SetterInjector.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/injectors/SetterInjector.java
Tue Jan 22 09:06:30 2008
@@ -26,7 +26,7 @@
 
 /**
  * Instantiates components using empty constructors and
- * <a href="http://picocontainer.org/setter-injection.html">Setter Injection</a>.
+ * <a href="http://apache.org/incubator/composer/setter-injection.html">Setter Injection</a>.
  * For easy setting of primitive properties, also see {@link PropertyApplicator}.
  * <p/>
  * <em>

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/parameters/ComponentParameter.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/parameters/ComponentParameter.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/parameters/ComponentParameter.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/parameters/ComponentParameter.java
Tue Jan 22 09:06:30 2008
@@ -30,7 +30,7 @@
  * A ComponentParameter should be used to pass in a particular component as argument to a
  * different component's constructor. This is particularly useful in cases where several
  * components of the same type have been registered, but with a different key. Passing a
- * ComponentParameter as a parameter when registering a component will give PicoContainer
a hint
+ * ComponentParameter as a parameter when registering a component will give Container a hint
  * about what other component to use in the constructor. Collecting parameter types are
  * supported for {@link java.lang.reflect.Array},{@link java.util.Collection}and
  * {@link java.util.Map}.

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/security/CustomPermissionsURLClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/security/CustomPermissionsURLClassLoader.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/security/CustomPermissionsURLClassLoader.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/security/CustomPermissionsURLClassLoader.java
Tue Jan 22 09:06:30 2008
@@ -30,7 +30,7 @@
  * CustomPermissionsURLClassLoader extends URLClassLoader, adding the abilty to programatically
add permissions easily.
  * To be effective for permission management, it should be run in conjunction with a policy
that restricts
  * some of the classloaders, but not all.
- * It's not ordinarily used by PicoContainer, but is here because PicoContainer is common
+ * It's not ordinarily used by Container, but is here because Container is common
  * to most classloader trees.
  * 
  * @author Paul Hammant

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java
(original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java
Tue Jan 22 09:06:30 2008
@@ -35,7 +35,7 @@
  * final List allContainers = new ArrayList();
  *
  * PicoVisitor visitor = new TraversalCheckingVisitor() {
- *     public void visitContainer(PicoContainer pico) {
+ *     public void visitContainer(Container pico) {
  *         super.visitContainer(pico);  //Calls checkTraversal for us.
  *         allContainers.add(pico);
  *     }

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/DefaultContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/DefaultContainerTestCase.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/DefaultContainerTestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/DefaultContainerTestCase.java
Tue Jan 22 09:06:30 2008
@@ -220,7 +220,7 @@
 			assertEquals(
 					"class "
 							+ doc
-							+ " needs a 'java.util.Collection' injected, but there are too many choices to inject.
These:[class java.util.ArrayList, class java.util.LinkedList], refer http://picocontainer.org/ambiguous-injectable-help.html",
+							+ " needs a 'java.util.Collection' injected, but there are too many choices to inject.
These:[class java.util.ArrayList, class java.util.LinkedList], refer http://apache.org/incubator/composer/ambiguous-injectable-help.html",
 					expected.getMessage());
 		}
 	}

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/alternatives/ImplementationHidingContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/alternatives/ImplementationHidingContainerTestCase.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/alternatives/ImplementationHidingContainerTestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/alternatives/ImplementationHidingContainerTestCase.java
Tue Jan 22 09:06:30 2008
@@ -52,9 +52,9 @@
          * throw: "org.apache.composer.core.ContainerVerificationException:
          * [[org.apache.composer.core.PicoCompositionException: Either do the
          * specified parameters not match any of the following constructors:
-         * [public PicoContainerBugTest$C(PicoContainerBugTest$A)] or the
+         * [public ContainerBugTest$C(ContainerBugTest$A)] or the
          * constructors were not accessible for 'class
-         * PicoContainerBugTest$C']]".
+         * ContainerBugTest$C']]".
          *
          * I believe that the error comes this way: In method
          * getGreediestSatisfiableConstructor parameters are checked against

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/PropertyApplyingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/PropertyApplyingTestCase.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/PropertyApplyingTestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/PropertyApplyingTestCase.java
Tue Jan 22 09:06:30 2008
@@ -257,7 +257,7 @@
         properties.put("char_", "a");
         properties.put("boolean_", "true");
         properties.put("file_", "/foo/bar");
-        properties.put("url_", "http://www.picocontainer.org/");
+        properties.put("url_", "http://www.apache.org/incubator/composer/");
         properties.put("string_", "g string");
         properties.put("class_", "javax.swing.JLabel");
         PropertyApplicator adapter =
@@ -281,7 +281,7 @@
         assertEquals('a', primitives.char_);
         assertEquals(true, primitives.boolean_);
         assertEquals(new File("/foo/bar"), primitives.file_);
-        assertEquals(new URL("http://www.picocontainer.org/"), primitives.url_);
+        assertEquals(new URL("http://www.apache.org/incubator/composer/"), primitives.url_);
         assertEquals("g string", primitives.string_);
         assertEquals(JLabel.class, primitives.class_);
     }

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultContainerLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultContainerLifecycleTestCase.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultContainerLifecycleTestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultContainerLifecycleTestCase.java
Tue Jan 22 09:06:30 2008
@@ -243,7 +243,7 @@
             parent.start();
             fail("Thrown " + AbstractInjector.UnsatisfiableDependenciesException.class.getName()
+ " expected");
         } catch ( AbstractInjector.UnsatisfiableDependenciesException e) {
-            // FiveTriesToBeMalicious can't get instantiated as there is no PicoContainer
in any component set
+            // FiveTriesToBeMalicious can't get instantiated as there is no Container in
any component set
         }
         String recording = parent.getComponent("recording").toString();
         assertEquals("<One<Two<Three", recording);
@@ -251,7 +251,7 @@
             child.getComponent(FiveTriesToBeMalicious.class);
             fail("Thrown " + AbstractInjector.UnsatisfiableDependenciesException.class.getName()
+ " expected");
         } catch (final AbstractInjector.UnsatisfiableDependenciesException e) {
-            // can't get instantiated as there is no PicoContainer in any component set
+            // can't get instantiated as there is no Container in any component set
         }
         recording = parent.getComponent("recording").toString();
         assertEquals("<One<Two<Three", recording); // still the same

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultLazyInstantiationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultLazyInstantiationTestCase.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultLazyInstantiationTestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultLazyInstantiationTestCase.java
Tue Jan 22 09:06:30 2008
@@ -24,7 +24,7 @@
  * @author Aslak Helles&oslash;y
  */
 public class DefaultLazyInstantiationTestCase extends AbstractLazyInstantiationTest {
-    protected MutableContainer createPicoContainer() {
+    protected MutableContainer createContainer() {
         return new DefaultContainer();
     }
 }

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultMultipleConstructorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultMultipleConstructorTestCase.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultMultipleConstructorTestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultMultipleConstructorTestCase.java
Tue Jan 22 09:06:30 2008
@@ -25,7 +25,7 @@
  * @author Aslak Helles&oslash;y
  */
 public class DefaultMultipleConstructorTestCase extends AbstractMultipleConstructorTest {
-    protected MutableContainer createPicoContainer() {
+    protected MutableContainer createContainer() {
         return new DefaultContainer();
     }
     

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0199TestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0199TestCase.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0199TestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0199TestCase.java
Tue Jan 22 09:06:30 2008
@@ -75,7 +75,7 @@
         }
     }
 
-    @Test public void testPicoContainerCausesDeadlock() throws InterruptedException {
+    @Test public void testContainerCausesDeadlock() throws InterruptedException {
         DefaultContainer container = createContainer();
         container.addComponent("A", A.class);
         container.addComponent("B", B.class);

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractComponentAdapterTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractComponentAdapterTest.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractComponentAdapterTest.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractComponentAdapterTest.java
Tue Jan 22 09:06:30 2008
@@ -120,9 +120,9 @@
         assertSame(getComponentAdapterType(), componentAdapter.getClass());
         final ComponentAdapter notInstantiatablecomponentAdapter = new NotInstantiatableBehavior(
                 componentAdapter);
-        final Container wrappedPicoContainer = wrapComponentInstances(
+        final Container wrappedContainer = wrapComponentInstances(
                 NotInstantiatableBehavior.class, picoContainer, null);
-        notInstantiatablecomponentAdapter.verify(wrappedPicoContainer);
+        notInstantiatablecomponentAdapter.verify(wrappedContainer);
     }
 
     /**
@@ -442,9 +442,9 @@
             final ComponentAdapter componentAdapter = prepRES_dependenciesAreResolved(picoContainer);
             assertSame(getComponentAdapterType(), componentAdapter.getClass());
             assertFalse(picoContainer.getComponentAdapters().contains(componentAdapter));
-            final Container wrappedPicoContainer = wrapComponentInstances(
+            final Container wrappedContainer = wrapComponentInstances(
                     CollectingBehavior.class, picoContainer, wrapperDependencies);
-            final Object instance = componentAdapter.getComponentInstance(wrappedPicoContainer);
+            final Object instance = componentAdapter.getComponentInstance(wrappedContainer);
             assertNotNull(instance);
             assertTrue(dependencies.size() > 0);
         }
@@ -472,10 +472,10 @@
             final ComponentAdapter componentAdapter = prepRES_failingVerificationWithCyclicDependencyException(picoContainer);
             assertSame(getComponentAdapterType(), componentAdapter.getClass());
             assertTrue(picoContainer.getComponentAdapters().contains(componentAdapter));
-            final Container wrappedPicoContainer = wrapComponentInstances(
+            final Container wrappedContainer = wrapComponentInstances(
                     CycleDetectorBehavior.class, picoContainer, wrapperDependencies);
             try {
-                componentAdapter.verify(wrappedPicoContainer);
+                componentAdapter.verify(wrappedContainer);
                 fail("Thrown PicoVerificationException excpected");
             } catch (final AbstractInjector.CyclicDependencyException cycle) {
                 final Class[] dependencies = cycle.getDependencies();
@@ -506,10 +506,10 @@
             final ComponentAdapter componentAdapter = prepRES_failingInstantiationWithCyclicDependencyException(picoContainer);
             assertSame(getComponentAdapterType(), componentAdapter.getClass());
             assertTrue(picoContainer.getComponentAdapters().contains(componentAdapter));
-            final Container wrappedPicoContainer = wrapComponentInstances(
+            final Container wrappedContainer = wrapComponentInstances(
                     CycleDetectorBehavior.class, picoContainer, wrapperDependencies);
             try {
-                componentAdapter.getComponentInstance(wrappedPicoContainer);
+                componentAdapter.getComponentInstance(wrappedContainer);
                 fail("Thrown CyclicDependencyException excpected");
             } catch (final AbstractInjector.CyclicDependencyException e) {
                 final Class[] dependencies = e.getDependencies();
@@ -633,7 +633,7 @@
             final Class decoratingComponentAdapterClass, final Container picoContainer,
             final Object[] wrapperDependencies) {
         assertTrue(AbstractBehavior.class.isAssignableFrom(decoratingComponentAdapterClass));
-        final MutableContainer mutablePicoContainer = new DefaultContainer();
+        final MutableContainer mutableContainer = new DefaultContainer();
         final int size = (wrapperDependencies != null ? wrapperDependencies.length : 0) +
1;
         final Collection allComponentAdapters = picoContainer.getComponentAdapters();
         for (Object allComponentAdapter : allComponentAdapters) {
@@ -642,14 +642,14 @@
             for (int i = 1; i < parameters.length; i++) {
                 parameters[i] = new ConstantParameter(wrapperDependencies[i - 1]);
             }
-            final MutableContainer instantiatingPicoContainer = new DefaultContainer(
+            final MutableContainer instantiatingContainer = new DefaultContainer(
                 new ConstructorInjection());
-            instantiatingPicoContainer.addComponent(
+            instantiatingContainer.addComponent(
                 "decorator", decoratingComponentAdapterClass, parameters);
-            mutablePicoContainer.addAdapter((ComponentAdapter)instantiatingPicoContainer
+            mutableContainer.addAdapter((ComponentAdapter)instantiatingContainer
                 .getComponent("decorator"));
         }
-        return mutablePicoContainer;
+        return mutableContainer;
     }
 
     private boolean supportsParameters(final Class type) {

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractContainerTest.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractContainerTest.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractContainerTest.java
Tue Jan 22 09:06:30 2008
@@ -78,26 +78,26 @@
 
     protected abstract MutableContainer createContainer(Container parent);
 
-    protected final MutableContainer createPicoContainerWithDependsOnTouchableOnly() throws
CompositionException {
+    protected final MutableContainer createContainerWithDependsOnTouchableOnly() throws CompositionException
{
         MutableContainer pico = createContainer(null);
         pico.addComponent(DependsOnTouchable.class);
         return pico;
     }
 
-    protected final MutableContainer createPicoContainerWithTouchableAndDependsOnTouchable()
throws CompositionException {
-        MutableContainer pico = createPicoContainerWithDependsOnTouchableOnly();
+    protected final MutableContainer createContainerWithTouchableAndDependsOnTouchable()
throws CompositionException {
+        MutableContainer pico = createContainerWithDependsOnTouchableOnly();
         pico.as(Characteristics.CACHE).addComponent(Touchable.class, SimpleTouchable.class);
         return pico;
     }
 
     @Test public void testBasicInstantiationAndContainment() throws ComposerException {
-        Container pico = createPicoContainerWithTouchableAndDependsOnTouchable();
+        Container pico = createContainerWithTouchableAndDependsOnTouchable();
         assertTrue("Component should be instance of Touchable",
                    Touchable.class.isAssignableFrom(pico.getComponentAdapter(Touchable.class,
(NameBinding) null).getComponentImplementation()));
     }
 
     @Test public void testRegisteredComponentsExistAndAreTheCorrectTypes() throws ComposerException
{
-        Container pico = createPicoContainerWithTouchableAndDependsOnTouchable();
+        Container pico = createContainerWithTouchableAndDependsOnTouchable();
         assertNotNull("Container should have Touchable addComponent",
                       pico.getComponentAdapter(Touchable.class, (NameBinding) null));
         assertNotNull("Container should have DependsOnTouchable addComponent",
@@ -125,7 +125,7 @@
     }
 
     private Touchable getTouchableFromSerializedContainer() throws IOException, ClassNotFoundException
{
-        MutableContainer pico = createPicoContainerWithTouchableAndDependsOnTouchable();
+        MutableContainer pico = createContainerWithTouchableAndDependsOnTouchable();
         // Add a list too, using a constant parameter
         pico.addComponent("list", ArrayList.class, new ConstantParameter(10));
 
@@ -155,7 +155,7 @@
 
 
     @Test public void testGettingComponentWithMissingDependencyFails() throws ComposerException
{
-        Container picoContainer = createPicoContainerWithDependsOnTouchableOnly();
+        Container picoContainer = createContainerWithDependsOnTouchableOnly();
         try {
             picoContainer.getComponent(DependsOnTouchable.class);
             fail("should need a Touchable");
@@ -333,20 +333,20 @@
         assertTrue("instances should be created in same order as adapters are created",
                    picoContainer.getComponents().get(1) instanceof String);
 
-        MutableContainer reversedPicoContainer = createContainer(null);
-        reversedPicoContainer.addAdapter(c2);
-        reversedPicoContainer.addAdapter(c1);
+        MutableContainer reversedContainer = createContainer(null);
+        reversedContainer.addAdapter(c2);
+        reversedContainer.addAdapter(c1);
         //registration order should be maintained
-        list2 = reversedPicoContainer.getComponentAdapters();
+        list2 = reversedContainer.getComponentAdapters();
         assertEquals(2, list2.size());
         assertEquals(c2.getComponentKey(), ((ComponentAdapter)list2.toArray()[0]).getComponentKey());
         assertEquals(c1.getComponentKey(), ((ComponentAdapter)list2.toArray()[1]).getComponentKey());
 
-        reversedPicoContainer.getComponents(); // create all the instances at once
+        reversedContainer.getComponents(); // create all the instances at once
         assertTrue("instances should be created in same order as adapters are created",
-                   reversedPicoContainer.getComponents().get(0) instanceof String);
+                   reversedContainer.getComponents().get(0) instanceof String);
         assertFalse("instances should be created in same order as adapters are created",
-                    reversedPicoContainer.getComponents().get(1) instanceof String);
+                    reversedContainer.getComponents().get(1) instanceof String);
     }
 
     public static final class NeedsTouchable {
@@ -473,11 +473,11 @@
         }
     }
 
-    // ImplicitPicoContainer injection is bad. It is an open door for hackers. Developers
with
-    // special PicoContainer needs should specifically register() a comtainer they want components
to
+    // ImplicitContainer injection is bad. It is an open door for hackers. Developers with
+    // special Container needs should specifically register() a comtainer they want components
to
     // be able to pick up on.
 
-//    @Test public void testImplicitPicoContainerInjection() {
+//    @Test public void testImplicitContainerInjection() {
 //        MutableContainer pico = createContainer(null);
 //        pico.addAdapter(ContainerDependency.class);
 //        ContainerDependency dep = (ContainerDependency) pico.getComponent(ContainerDependency.class);

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractImplementationHidingContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractImplementationHidingContainerTest.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractImplementationHidingContainerTest.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractImplementationHidingContainerTest.java
Tue Jan 22 09:06:30 2008
@@ -88,7 +88,7 @@
                                                                           IOException, ClassNotFoundException
{
         try {
             super.testSerializedContainerCanRetrieveImplementation();
-            fail("The ImplementationHidingPicoContainer should not be able to retrieve the
component impl");
+            fail("The ImplementationHidingContainer should not be able to retrieve the component
impl");
         } catch (ClassCastException cce) {
             // expected.
         }

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractLazyInstantiationTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractLazyInstantiationTest.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractLazyInstantiationTest.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractLazyInstantiationTest.java
Tue Jan 22 09:06:30 2008
@@ -30,7 +30,7 @@
  */
 public abstract class AbstractLazyInstantiationTest {
 
-    protected abstract MutableContainer createPicoContainer();
+    protected abstract MutableContainer createContainer();
 
     public static class Kilroy {
         public Kilroy(Havana havana) {
@@ -47,7 +47,7 @@
     }
 
     @Test public void testLazyInstantiation() throws ComposerException {
-        MutableContainer pico = createPicoContainer();
+        MutableContainer pico = createContainer();
 
         pico.as(Characteristics.CACHE).addComponent(Kilroy.class);
         pico.as(Characteristics.CACHE).addComponent(Havana.class);

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractMultipleConstructorTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractMultipleConstructorTest.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractMultipleConstructorTest.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/tck/AbstractMultipleConstructorTest.java
Tue Jan 22 09:06:30 2008
@@ -33,7 +33,7 @@
  */
 public abstract class AbstractMultipleConstructorTest {
 
-    protected abstract MutableContainer createPicoContainer();
+    protected abstract MutableContainer createContainer();
 
     public static final class Multi {
         public final String message;
@@ -82,13 +82,13 @@
 
 
     @Test public void testStringWorks() throws ComposerException {
-        MutableContainer pico = createPicoContainer();
+        MutableContainer pico = createContainer();
         pico.addComponent(String.class);
         assertEquals("", pico.getComponent(String.class));
     }
 
     @Test public void testMultiWithOnlySmallSatisfiedDependencyWorks() throws ComposerException
{
-        MutableContainer pico = createPicoContainer();
+        MutableContainer pico = createContainer();
         pico.addComponent(Multi.class);
         pico.addComponent(One.class);
         pico.addComponent(Three.class);
@@ -98,7 +98,7 @@
     }
 
     @Test public void testMultiWithBothSatisfiedDependencyWorks() throws ComposerException
{
-        MutableContainer pico = createPicoContainer();
+        MutableContainer pico = createContainer();
         pico.addComponent(Multi.class);
         pico.addComponent(One.class);
         pico.addComponent(Two.class);
@@ -109,7 +109,7 @@
     }
 
     @Test public void testMultiWithTwoEquallyBigSatisfiedDependenciesFails() throws ComposerException
{
-        MutableContainer pico = createPicoContainer();
+        MutableContainer pico = createContainer();
         pico.addComponent(Multi.class);
         pico.addComponent(One.class);
         pico.addComponent(Two.class);
@@ -124,7 +124,7 @@
     }
 
     @Test public void testMultiWithSatisfyingDependencyAndParametersWorks() throws ComposerException
{
-        MutableContainer pico = createPicoContainer();
+        MutableContainer pico = createContainer();
         pico.addComponent("MultiOneTwo", Multi.class, ComponentParameter.DEFAULT,
                 new ComponentParameter("Two"));
         pico.addComponent("MultiTwoOne", Multi.class, new ComponentParameter("Two"),

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/visitors/TraversalCheckingVisitorTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/visitors/TraversalCheckingVisitorTest.java?rev=614261&r1=614260&r2=614261&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/visitors/TraversalCheckingVisitorTest.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/visitors/TraversalCheckingVisitorTest.java
Tue Jan 22 09:06:30 2008
@@ -120,7 +120,7 @@
         knownContainers.add(child);
         for (Container oneContainer : allContainers) {
             boolean knownContainer = knownContainers.remove(oneContainer);
-            assertTrue("Found a picocontainer that wasn't previously expected.", knownContainer);
+            assertTrue("Found a Container that wasn't previously expected.", knownContainer);
         }
 
         assertTrue("All containers must match what is returned by traversal.",



Mime
View raw message