incubator-composer-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r614436 [1/2] - in /incubator/composer/trunk/composer-core/src: main/java/org/apache/composer/core/ main/java/org/apache/composer/core/containers/ test/java/org/apache/composer/core/ test/java/org/apache/composer/core/adapters/ test/java/or...
Date Wed, 23 Jan 2008 06:31:26 GMT
Author: mauro
Date: Tue Jan 22 22:31:20 2008
New Revision: 614436

URL: http://svn.apache.org/viewvc?rev=614436&view=rev
Log:
Moved DefaultContainer to o.a.c.containers package.

Added:
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/DefaultContainer.java
      - copied, changed from r614271, incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/DefaultContainer.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/DefaultContainerTestCase.java
      - copied, changed from r614271, incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/DefaultContainerTestCase.java
Removed:
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/DefaultContainer.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/DefaultContainerTestCase.java
Modified:
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/ComponentFactory.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Container.java
    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/Disposable.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/CommandLineArgumentsContainer.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/containers/TransientContainer.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/ComposerVisitorTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/ContainerBuilderTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/InstanceAdapterTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/SimpleNamedBindingAnnotationTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/TypedBindingAnnotationTestCase.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/AutomatingTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/BehaviorAdapterTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/CachedTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/CachingTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/ImplementationHidingTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/InterceptingTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/OptInCachingTestCase.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/behaviors/StoringTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/SynchronizedTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/ThreadCachingTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/CommandLineArgumentsContainerTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/DelegatingMutableContainerTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/ImmutableContainerTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/PropertiesContainerTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/AbstractComponentMonitorTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ChildContainerTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/CollectionComponentParameterTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ComponentKeysTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ComposerExceptionsTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultComponentRegistryTestCase.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/DefaultContainerTreeSerializationTestCase.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/DelegatingContainerTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/NoneOfTheseTestsAffectCoverageMeaningTheyCouldGoTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/UserQuestionTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/XStreamSerialisationTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0191TestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0196TestCase.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/defaults/issues/Issue0229TestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0265TestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0280TestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AdaptingInjectionTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AnnotatedFieldInjectorTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AnnotatedMethodInjectionTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AnnotatedMethodInjectorTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/ConstructorInjectionTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/ConstructorInjectorTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/MethodInjectionTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/MultiInjectionTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/SetterInjectionTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/SetterInjectorTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/parameters/ConfigParameterTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/parameters/ParameterTestCase.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/AbstractComponentFactoryTest.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/visitors/MethodCallingVisitorTest.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/ComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/ComponentFactory.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/ComponentFactory.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/ComponentFactory.java Tue Jan 22 22:31:20 2008
@@ -21,6 +21,7 @@
 import org.apache.composer.core.CompositionException;
 import org.apache.composer.core.ComponentMonitor;
 import org.apache.composer.core.LifecycleStrategy;
+import org.apache.composer.core.containers.DefaultContainer;
 
 import java.util.Properties;
 

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Container.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Container.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Container.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Container.java Tue Jan 22 22:31:20 2008
@@ -20,6 +20,8 @@
 import java.util.List;
 import java.lang.annotation.Annotation;
 
+import org.apache.composer.core.containers.DefaultContainer;
+
 
 /**
  * This is the core interface for Composer. It is used to retrieve component instances from the container; it only

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=614436&r1=614435&r2=614436&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 22:31:20 2008
@@ -23,6 +23,7 @@
 import org.apache.composer.core.behaviors.Locking;
 import org.apache.composer.core.behaviors.Automating;
 import org.apache.composer.core.injectors.MethodInjection;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.containers.EmptyContainer;
 import org.apache.composer.core.containers.TransientContainer;
 import static org.apache.composer.core.injectors.Injectors.CDI;
@@ -44,17 +45,14 @@
  * Helps assembles the myriad items available to a Container.
  * <p>Simple Example:</p>
  * <pre>
- * MutableContainer mpc = new ContainerBuilder()
- * &nbsp;&nbsp;.withCaching()
- * &nbsp;&nbsp;.withLifecycle()
- * &nbsp;&nbsp;.build();
+ * MutableContainer container = new ContainerBuilder().withCaching().withLifecycle().build();
  * </pre>
  * @author Paul Hammant
  */
 public class ContainerBuilder {
 
     private Container parentContainer;
-    private Class<? extends MutableContainer> mpcClass = DefaultContainer.class;
+    private Class<? extends MutableContainer> containerClass = DefaultContainer.class;
     private ComponentMonitor componentMonitor;
     private List<Object> containerComps = new ArrayList<Object>();
 
@@ -145,10 +143,10 @@
             temp.addComponent(ComponentMonitor.class, componentMonitorClass);
         }
         temp.addComponent(LifecycleStrategy.class, lifecycleStrategyClass);
-        temp.addComponent("mpc", mpcClass);
+        temp.addComponent("mc", containerClass);
 
 
-        return (MutableContainer) temp.getComponent("mpc");
+        return (MutableContainer) temp.getComponent("mc");
     }
 
     public ContainerBuilder withHiddenImplementations() {
@@ -209,7 +207,7 @@
     }
 
     public ContainerBuilder implementedBy(Class<? extends MutableContainer> containerClass) {
-        mpcClass = containerClass;
+        containerClass = containerClass;
         return this;
     }
 

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Disposable.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Disposable.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Disposable.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Disposable.java Tue Jan 22 22:31:20 2008
@@ -16,6 +16,8 @@
  */
 package org.apache.composer.core;
 
+import org.apache.composer.core.containers.DefaultContainer;
+
 /**
  * An interface which is implemented by components that need to dispose of resources during the shutdown of that
  * component. The {@link Disposable#dispose()} must be called once during shutdown, directly after {@link

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/CommandLineArgumentsContainer.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/CommandLineArgumentsContainer.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/CommandLineArgumentsContainer.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/CommandLineArgumentsContainer.java Tue Jan 22 22:31:20 2008
@@ -22,7 +22,6 @@
 import java.util.List;
 
 import org.apache.composer.core.ComponentAdapter;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.CompositionException;
 import org.apache.composer.core.Container;

Copied: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/DefaultContainer.java (from r614271, 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/containers/DefaultContainer.java?p2=incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/DefaultContainer.java&p1=incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/DefaultContainer.java&r1=614271&r2=614436&rev=614436&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/containers/DefaultContainer.java Tue Jan 22 22:31:20 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.composer.core;
+package org.apache.composer.core.containers;
 
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
@@ -30,16 +30,30 @@
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.composer.core.Behavior;
+import org.apache.composer.core.BehaviorFactory;
+import org.apache.composer.core.BindKey;
+import org.apache.composer.core.Characteristics;
+import org.apache.composer.core.ComponentAdapter;
+import org.apache.composer.core.ComponentFactory;
+import org.apache.composer.core.ComponentMonitor;
+import org.apache.composer.core.ComponentMonitorStrategy;
+import org.apache.composer.core.ComposerException;
+import org.apache.composer.core.CompositionException;
+import org.apache.composer.core.Container;
+import org.apache.composer.core.ContainerVisitor;
+import org.apache.composer.core.Disposable;
+import org.apache.composer.core.LifecycleStrategy;
+import org.apache.composer.core.MutableContainer;
+import org.apache.composer.core.NameBinding;
+import org.apache.composer.core.Parameter;
+import org.apache.composer.core.Startable;
 import org.apache.composer.core.adapters.InstanceAdapter;
 import org.apache.composer.core.behaviors.AbstractBehaviorFactory;
 import org.apache.composer.core.behaviors.AdaptingBehavior;
 import org.apache.composer.core.behaviors.Cached;
 import org.apache.composer.core.behaviors.Caching;
 import org.apache.composer.core.behaviors.HiddenImplementation;
-import org.apache.composer.core.containers.AbstractDelegatingMutableContainer;
-import org.apache.composer.core.containers.AbstractDelegatingContainer;
-import org.apache.composer.core.containers.EmptyContainer;
-import org.apache.composer.core.containers.ImmutableContainer;
 import org.apache.composer.core.injectors.AbstractInjector;
 import org.apache.composer.core.injectors.AdaptingInjection;
 import org.apache.composer.core.lifecycle.LifecycleState;

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=614436&r1=614435&r2=614436&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 22:31:20 2008
@@ -18,7 +18,6 @@
 
 import java.util.Properties;
 
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.Container;
 

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/TransientContainer.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/TransientContainer.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/TransientContainer.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/containers/TransientContainer.java Tue Jan 22 22:31:20 2008
@@ -16,7 +16,6 @@
  */
 package org.apache.composer.core.containers;
 
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.injectors.ConstructorInjection;
 import org.apache.composer.core.behaviors.Caching;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/ComposerVisitorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/ComposerVisitorTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/ComposerVisitorTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/ComposerVisitorTestCase.java Tue Jan 22 22:31:20 2008
@@ -28,6 +28,7 @@
 import org.jmock.integration.junit4.JMock;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.visitors.AbstractContainerVisitor;
 import org.apache.composer.core.visitors.VerifyingVisitor;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/ContainerBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/ContainerBuilderTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/ContainerBuilderTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/ContainerBuilderTestCase.java Tue Jan 22 22:31:20 2008
@@ -31,6 +31,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.apache.composer.core.behaviors.ImplementationHiding;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.containers.EmptyContainer;
 import org.apache.composer.core.lifecycle.LifecycleState;
 import org.apache.composer.core.monitors.ConsoleComponentMonitor;
@@ -53,8 +54,8 @@
         xs.alias("CONTAINER", DefaultContainer.class);
         xs.registerConverter(new Converter() {
             public boolean canConvert(Class aClass) {
-                return aClass.getName().equals("org.apache.composer.core.DefaultContainer$1") ||
-                       aClass.getName().equals("org.apache.composer.core.Properties") ||
+                return aClass.getName().equals("org.apache.composer.core.containers.DefaultContainer$1") ||
+                       aClass.getName().equals("org.apache.composer.core.Characteristics") ||
                        aClass == Boolean.class ||
                        aClass == HashSet.class ||
                        aClass == ArrayList.class;
@@ -71,8 +72,8 @@
     }
 
     @Test public void testBasic() {
-        MutableContainer mpc = new ContainerBuilder().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.injectors.AdaptingInjection\n" +
                 "  parent=org.apache.composer.core.containers.EmptyContainer\n" +
@@ -85,8 +86,8 @@
 
         new NullComponentMonitor();
 
-        MutableContainer mpc = new ContainerBuilder().withLifecycle().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withLifecycle().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.injectors.AdaptingInjection\n" +
                 "  parent=org.apache.composer.core.containers.EmptyContainer\n" +
@@ -97,8 +98,8 @@
     }
 
     @Test public void testWithReflectionLifecycle() {
-        MutableContainer mpc = new ContainerBuilder().withReflectionLifecycle().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withReflectionLifecycle().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.injectors.AdaptingInjection\n" +
                 "  parent=org.apache.composer.core.containers.EmptyContainer\n" +
@@ -115,8 +116,8 @@
 
 
     @Test public void testWithConsoleMonitor() {
-        MutableContainer mpc = new ContainerBuilder().withConsoleMonitor().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withConsoleMonitor().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.injectors.AdaptingInjection\n" +
                 "  parent=org.apache.composer.core.containers.EmptyContainer\n" +
@@ -127,8 +128,8 @@
     }
 
     @Test public void testWithConsoleMonitorAndLifecycleUseTheSameUltimateMonitor() {
-        MutableContainer mpc = new ContainerBuilder().withLifecycle().withConsoleMonitor().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withLifecycle().withConsoleMonitor().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                      "  componentFactory=org.apache.composer.core.injectors.AdaptingInjection\n" +
                      "  parent=org.apache.composer.core.containers.EmptyContainer\n" +
@@ -141,8 +142,8 @@
 
 
     @Test public void testWithCustomMonitorByClass() {
-        MutableContainer mpc = new ContainerBuilder().withMonitor(ConsoleComponentMonitor.class).build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withMonitor(ConsoleComponentMonitor.class).build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.injectors.AdaptingInjection\n" +
                 "  parent=org.apache.composer.core.containers.EmptyContainer\n" +
@@ -165,8 +166,8 @@
     }
 
     @Test public void testWithImplementationHiding() {
-        MutableContainer mpc = new ContainerBuilder().withHiddenImplementations().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withHiddenImplementations().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.behaviors.ImplementationHiding\n" +
                 "    delegate=org.apache.composer.core.injectors.AdaptingInjection\n" +
@@ -177,8 +178,8 @@
     }
 
     @Test public void testWithImplementationHidingInstance() {
-        MutableContainer mpc = new ContainerBuilder().withComponentFactory(new ImplementationHiding()).build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withComponentFactory(new ImplementationHiding()).build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.behaviors.ImplementationHiding\n" +
                 "    delegate=org.apache.composer.core.injectors.AdaptingInjection\n" +
@@ -189,8 +190,8 @@
     }
 
     @Test public void testWithCafsListChainThingy() {
-        MutableContainer mpc = new ContainerBuilder(SDI()).withBehaviors(caching(), synchronizing(), implementationHiding()).build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder(SDI()).withBehaviors(caching(), synchronizing(), implementationHiding()).build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.behaviors.Caching\n" +
                 "    delegate=org.apache.composer.core.behaviors.Synchronizing\n" +
@@ -207,8 +208,8 @@
     public static class CustomParentcontainer extends EmptyContainer {}
 
     @Test public void testWithCustomParentContainer() {
-        MutableContainer mpc = new ContainerBuilder(new CustomParentcontainer()).build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder(new CustomParentcontainer()).build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.injectors.AdaptingInjection\n" +
                 "  parent=org.apache.composer.core.ContainerBuilderTestCase_CustomParentcontainer\n" +
@@ -218,8 +219,8 @@
     }
 
     @Test public void testWithBogusParentContainerBehavesAsIfNotSet() {
-        MutableContainer mpc = new ContainerBuilder((Container)null).build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder((Container)null).build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                      "  componentFactory=org.apache.composer.core.injectors.AdaptingInjection\n" +
                      "  parent=org.apache.composer.core.containers.EmptyContainer\n" +
@@ -230,8 +231,8 @@
 
 
     @Test public void testWithSetterDI() {
-        MutableContainer mpc = new ContainerBuilder().withSetterInjection().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withSetterInjection().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.injectors.SetterInjection\n" +
                 "    set\n" +
@@ -242,8 +243,8 @@
     }
 
     @Test public void testWithAnnotatedMethodDI() {
-            MutableContainer mpc = new ContainerBuilder().withAnnotatedMethodInjection().build();
-        String foo = simplifyRepresentation(mpc);
+            MutableContainer mc = new ContainerBuilder().withAnnotatedMethodInjection().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.injectors.AnnotatedMethodInjection\n" +
                 "    org.apache.composer.core.annotations.Inject\n" +
@@ -254,8 +255,8 @@
     }
 
     @Test public void testWithAnnotatedFieldDI() {
-            MutableContainer mpc = new ContainerBuilder().withAnnotatedFieldInjection().build();
-        String foo = simplifyRepresentation(mpc);
+            MutableContainer mc = new ContainerBuilder().withAnnotatedFieldInjection().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.injectors.AnnotatedFieldInjection\n" +
                 "    org.apache.composer.core.annotations.Inject\n" +
@@ -266,8 +267,8 @@
     }
 
     @Test public void testWithCtorDI() {
-        MutableContainer mpc = new ContainerBuilder().withConstructorInjection().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withConstructorInjection().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.injectors.ConstructorInjection\n" +
                 "  parent=org.apache.composer.core.containers.EmptyContainer\n" +
@@ -277,8 +278,8 @@
     }
 
     @Test public void testWithImplementationHidingAndSetterDI() {
-        MutableContainer mpc = new ContainerBuilder().withHiddenImplementations().withSetterInjection().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withHiddenImplementations().withSetterInjection().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.behaviors.ImplementationHiding\n" +
                 "    delegate=org.apache.composer.core.injectors.SetterInjection\n" +
@@ -290,8 +291,8 @@
     }
 
     @Test public void testWithCachingImplementationHidingAndSetterDI() {
-        MutableContainer mpc = new ContainerBuilder().withCaching().withHiddenImplementations().withSetterInjection().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withCaching().withHiddenImplementations().withSetterInjection().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.behaviors.Caching\n" +
                 "    delegate=org.apache.composer.core.behaviors.ImplementationHiding\n" +
@@ -304,8 +305,8 @@
     }
 
     @Test public void testWithSynchronizing() {
-        MutableContainer mpc = new ContainerBuilder().withSynchronizing().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withSynchronizing().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.behaviors.Synchronizing\n" +
                 "    delegate=org.apache.composer.core.injectors.AdaptingInjection\n" +
@@ -316,8 +317,8 @@
     }
 
     @Test public void testWithLocking() {
-        MutableContainer mpc = new ContainerBuilder().withLocking().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withLocking().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.behaviors.Locking\n" +
                 "    delegate=org.apache.composer.core.injectors.AdaptingInjection\n" +
@@ -328,8 +329,8 @@
     }
 
     @Test public void testWithPropertyApplier() {
-        MutableContainer mpc = new ContainerBuilder().withPropertyApplier().build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withPropertyApplier().build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                      "  componentFactory=org.apache.composer.core.behaviors.PropertyApplying\n" +
                      "    delegate=org.apache.composer.core.injectors.AdaptingInjection\n" +
@@ -341,8 +342,8 @@
 
     //TODO - fix up to refer to SomeContainerDependency
     @Test public void testWithCustomComponentFactory() {
-        MutableContainer mpc = new ContainerBuilder().withCustomContainerComponent(new SomeContainerDependency()).withComponentFactory(CustomComponentFactory.class).build();
-        String foo = simplifyRepresentation(mpc);
+        MutableContainer mc = new ContainerBuilder().withCustomContainerComponent(new SomeContainerDependency()).withComponentFactory(CustomComponentFactory.class).build();
+        String foo = simplifyRepresentation(mc);
         assertEquals("CONTAINER\n" +
                      "  componentFactory=org.apache.composer.core.ContainerBuilderTestCase_CustomComponentFactory\n" +
                      "  parent=org.apache.composer.core.containers.EmptyContainer\n" +
@@ -371,14 +372,14 @@
 
 
     @Test public void testWithCustomContainer() {
-        MutableContainer mpc = new ContainerBuilder().implementedBy(TestContainer.class).build();
-        String foo = simplifyRepresentation(mpc);
-        assertEquals("org.apache.composer.core.ContainerBuilderTestCase_-TestContainer\n" +
+        MutableContainer mc = new ContainerBuilder().implementedBy(TestContainer.class).build();
+        String foo = simplifyRepresentation(mc);
+        assertEquals("CONTAINER\n" +
                 "  componentFactory=org.apache.composer.core.injectors.AdaptingInjection\n" +
                 "  parent=org.apache.composer.core.containers.EmptyContainer\n" +
                 "  lifecycleStrategy=org.apache.composer.core.lifecycle.NullLifecycleStrategy\n" +
                 "  componentMonitor=org.apache.composer.core.monitors.NullComponentMonitor\n" +
-                "org.apache.composer.core.ContainerBuilderTestCase_-TestContainer",foo);
+                "CONTAINER",foo);
     }
 
 
@@ -389,8 +390,8 @@
     }
 
 
-    private String simplifyRepresentation(MutableContainer mpc) {
-        String foo = xs.toXML(mpc);
+    private String simplifyRepresentation(MutableContainer mc) {
+        String foo = xs.toXML(mc);
         foo = foo.replace('$','_');
         foo = foo.replaceAll("/>","");
         foo = foo.replaceAll("</","");
@@ -417,13 +418,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.DefaultContainer$1\"","");
+        foo = foo.replaceAll("\n  componentCharacteristic class=\"org.apache.composer.core.containers.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.DefaultContainer_1\"","");
+        foo = foo.replaceAll("class=\"org.apache.composer.core.containers.DefaultContainer_1\"","");
         foo = foo.replaceAll("class=","=");
         foo = foo.replaceAll("\"","");
         foo = foo.replaceAll(" \n","\n");

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/InstanceAdapterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/InstanceAdapterTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/InstanceAdapterTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/InstanceAdapterTestCase.java Tue Jan 22 22:31:20 2008
@@ -25,11 +25,11 @@
 
 import org.junit.Test;
 import org.apache.composer.core.ComponentAdapter;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.Disposable;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.Startable;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;
 import org.apache.composer.core.lifecycle.StartableLifecycleStrategy;
 import org.apache.composer.core.monitors.NullComponentMonitor;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/SimpleNamedBindingAnnotationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/SimpleNamedBindingAnnotationTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/SimpleNamedBindingAnnotationTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/SimpleNamedBindingAnnotationTestCase.java Tue Jan 22 22:31:20 2008
@@ -30,7 +30,6 @@
 import org.apache.composer.core.Characteristics;
 import org.apache.composer.core.ComponentAdapter;
 import org.apache.composer.core.ComponentMonitor;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.InjectionFactory;
 import org.apache.composer.core.LifecycleStrategy;
 import org.apache.composer.core.MutableContainer;
@@ -38,6 +37,7 @@
 import org.apache.composer.core.CompositionException;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.behaviors.AbstractBehaviorFactory;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.AbstractInjector;
 
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/TypedBindingAnnotationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/TypedBindingAnnotationTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/TypedBindingAnnotationTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/TypedBindingAnnotationTestCase.java Tue Jan 22 22:31:20 2008
@@ -25,10 +25,10 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.annotations.Bind;
 import org.apache.composer.core.annotations.Inject;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.AbstractInjector;
 import org.apache.composer.core.injectors.AnnotatedFieldInjection;
 import org.apache.composer.core.injectors.ConstructorInjection;

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=614436&r1=614435&r2=614436&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 22:31:20 2008
@@ -16,9 +16,9 @@
  */
 package org.apache.composer.core.alternatives;
 
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.behaviors.ImplementationHiding;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.ConstructorInjection;
 import org.apache.composer.core.visitors.VerifyingVisitor;
 import org.junit.Test;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AutomatingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AutomatingTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AutomatingTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AutomatingTestCase.java Tue Jan 22 22:31:20 2008
@@ -23,9 +23,9 @@
 import static org.apache.composer.core.behaviors.Behaviors.caching;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.ContainerBuilder;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.ConstructorInjector;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;
 import org.apache.composer.core.monitors.NullComponentMonitor;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/BehaviorAdapterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/BehaviorAdapterTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/BehaviorAdapterTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/BehaviorAdapterTestCase.java Tue Jan 22 22:31:20 2008
@@ -30,10 +30,10 @@
 import org.apache.composer.core.ComponentAdapter;
 import org.apache.composer.core.ComponentMonitor;
 import org.apache.composer.core.ComponentMonitorStrategy;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.LifecycleStrategy;
 import org.apache.composer.core.CompositionException;
 import org.apache.composer.core.Container;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.testmodel.SimpleTouchable;
 import org.apache.composer.core.testmodel.Touchable;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/CachedTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/CachedTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/CachedTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/CachedTestCase.java Tue Jan 22 22:31:20 2008
@@ -28,10 +28,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.composer.core.ComponentAdapter;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.LifecycleStrategy;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.Container;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.testmodel.SimpleTouchable;
 import org.apache.composer.core.testmodel.Touchable;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/CachingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/CachingTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/CachingTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/CachingTestCase.java Tue Jan 22 22:31:20 2008
@@ -23,8 +23,8 @@
 import org.apache.composer.core.Characteristics;
 import org.apache.composer.core.ComponentAdapter;
 import org.apache.composer.core.ComponentFactory;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.adapters.InstanceAdapter;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.ConstructorInjection;
 import org.apache.composer.core.injectors.ConstructorInjector;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/ImplementationHidingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/ImplementationHidingTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/ImplementationHidingTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/ImplementationHidingTestCase.java Tue Jan 22 22:31:20 2008
@@ -25,8 +25,8 @@
 import org.apache.composer.core.Characteristics;
 import org.apache.composer.core.ComponentAdapter;
 import org.apache.composer.core.ComponentFactory;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.adapters.InstanceAdapter;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.AdaptingInjection;
 import org.apache.composer.core.injectors.ConstructorInjection;
 import org.apache.composer.core.injectors.ConstructorInjector;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/InterceptingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/InterceptingTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/InterceptingTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/InterceptingTestCase.java Tue Jan 22 22:31:20 2008
@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
+import org.apache.composer.core.containers.DefaultContainer;
 
 public class InterceptingTestCase {
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/OptInCachingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/OptInCachingTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/OptInCachingTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/OptInCachingTestCase.java Tue Jan 22 22:31:20 2008
@@ -23,8 +23,8 @@
 import org.apache.composer.core.Characteristics;
 import org.apache.composer.core.ComponentAdapter;
 import org.apache.composer.core.ComponentFactory;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.adapters.InstanceAdapter;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.ConstructorInjection;
 import org.apache.composer.core.injectors.ConstructorInjector;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;

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=614436&r1=614435&r2=614436&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 22:31:20 2008
@@ -36,9 +36,9 @@
 import org.apache.composer.core.Characteristics;
 import org.apache.composer.core.ComponentAdapter;
 import org.apache.composer.core.ComponentFactory;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.Parameter;
 import org.apache.composer.core.CompositionException;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.AdaptingInjection;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;
 import org.apache.composer.core.monitors.NullComponentMonitor;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/StoringTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/StoringTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/StoringTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/StoringTestCase.java Tue Jan 22 22:31:20 2008
@@ -24,7 +24,7 @@
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
+import org.apache.composer.core.containers.DefaultContainer;
 
 public class StoringTestCase {
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/SynchronizedTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/SynchronizedTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/SynchronizedTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/SynchronizedTestCase.java Tue Jan 22 22:31:20 2008
@@ -30,8 +30,8 @@
 import org.junit.Test;
 import org.apache.composer.core.BehaviorFactory;
 import org.apache.composer.core.ComponentAdapter;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.Container;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.ConstructorInjection;
 import org.apache.composer.core.injectors.ConstructorInjector;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/ThreadCachingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/ThreadCachingTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/ThreadCachingTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/ThreadCachingTestCase.java Tue Jan 22 22:31:20 2008
@@ -22,7 +22,7 @@
 import static org.junit.Assert.assertSame;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
+import org.apache.composer.core.containers.DefaultContainer;
 
 public class ThreadCachingTestCase {
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/CommandLineArgumentsContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/CommandLineArgumentsContainerTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/CommandLineArgumentsContainerTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/CommandLineArgumentsContainerTestCase.java Tue Jan 22 22:31:20 2008
@@ -26,7 +26,6 @@
 
 import org.junit.Test;
 import org.apache.composer.core.Characteristics;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.annotations.Inject;
 import org.apache.composer.core.injectors.AbstractInjector;
 import org.apache.composer.core.injectors.AnnotatedFieldInjection;

Copied: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/DefaultContainerTestCase.java (from r614271, 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/containers/DefaultContainerTestCase.java?p2=incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/DefaultContainerTestCase.java&p1=incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/DefaultContainerTestCase.java&r1=614271&r2=614436&rev=614436&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/containers/DefaultContainerTestCase.java Tue Jan 22 22:31:20 2008
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.composer.core;
+package org.apache.composer.core.containers;
 
+import static org.apache.composer.core.Characteristics.CDI;
+import static org.apache.composer.core.Characteristics.SDI;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.apache.composer.core.Characteristics.CDI;
-import static org.apache.composer.core.Characteristics.SDI;
 
 import java.io.Serializable;
 import java.io.StringWriter;
@@ -36,9 +36,18 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.junit.Test;
+import org.apache.composer.core.Characteristics;
+import org.apache.composer.core.ComponentAdapter;
+import org.apache.composer.core.ComponentFactory;
+import org.apache.composer.core.ComponentMonitor;
+import org.apache.composer.core.CompositionException;
+import org.apache.composer.core.Container;
+import org.apache.composer.core.ContainerVisitor;
+import org.apache.composer.core.LifecycleStrategy;
+import org.apache.composer.core.MutableContainer;
+import org.apache.composer.core.Parameter;
+import org.apache.composer.core.Startable;
 import org.apache.composer.core.behaviors.Caching;
-import org.apache.composer.core.containers.EmptyContainer;
 import org.apache.composer.core.injectors.AbstractInjector;
 import org.apache.composer.core.injectors.ConstructorInjection;
 import org.apache.composer.core.injectors.ConstructorInjector;
@@ -50,6 +59,7 @@
 import org.apache.composer.core.testmodel.DependsOnTouchable;
 import org.apache.composer.core.testmodel.SimpleTouchable;
 import org.apache.composer.core.testmodel.Touchable;
+import org.junit.Test;
 
 /**
  * @author Aslak Helles&oslash;y

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/DelegatingMutableContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/DelegatingMutableContainerTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/DelegatingMutableContainerTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/DelegatingMutableContainerTestCase.java Tue Jan 22 22:31:20 2008
@@ -21,7 +21,6 @@
 
 import org.junit.Test;
 import org.apache.composer.core.Characteristics;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.tck.AbstractContainerTest;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/ImmutableContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/ImmutableContainerTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/ImmutableContainerTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/ImmutableContainerTestCase.java Tue Jan 22 22:31:20 2008
@@ -28,7 +28,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.composer.core.ComponentAdapter;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.NameBinding;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.ContainerVisitor;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java Tue Jan 22 22:31:20 2008
@@ -24,7 +24,6 @@
 
 import org.junit.Test;
 import org.apache.composer.core.Characteristics;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.behaviors.Caching;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/PropertiesContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/PropertiesContainerTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/PropertiesContainerTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/containers/PropertiesContainerTestCase.java Tue Jan 22 22:31:20 2008
@@ -22,7 +22,6 @@
 import java.util.Properties;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 
 /**
  * test that properties container works properly

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/AbstractComponentMonitorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/AbstractComponentMonitorTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/AbstractComponentMonitorTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/AbstractComponentMonitorTestCase.java Tue Jan 22 22:31:20 2008
@@ -35,8 +35,8 @@
 import org.apache.composer.core.ComponentAdapter;
 import org.apache.composer.core.ComponentMonitor;
 import org.apache.composer.core.ComponentMonitorStrategy;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.Container;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.ConstructorInjector;
 import org.apache.composer.core.monitors.AbstractComponentMonitor;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ChildContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ChildContainerTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ChildContainerTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ChildContainerTestCase.java Tue Jan 22 22:31:20 2008
@@ -20,8 +20,8 @@
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.parameters.ComponentParameter;
 import org.apache.composer.core.testmodel.AlternativeTouchable;
 import org.apache.composer.core.testmodel.DependsOnTouchable;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/CollectionComponentParameterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/CollectionComponentParameterTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/CollectionComponentParameterTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/CollectionComponentParameterTestCase.java Tue Jan 22 22:31:20 2008
@@ -41,12 +41,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.composer.core.ComponentAdapter;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.CompositionException;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.adapters.InstanceAdapter;
 import org.apache.composer.core.behaviors.Caching;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.AbstractInjector;
 import org.apache.composer.core.injectors.ConstructorInjector;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ComponentKeysTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ComponentKeysTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ComponentKeysTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ComponentKeysTestCase.java Tue Jan 22 22:31:20 2008
@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.parameters.ComponentParameter;
 import org.apache.composer.core.testmodel.DecoratedTouchable;
 import org.apache.composer.core.testmodel.DependsOnTouchable;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ComposerExceptionsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ComposerExceptionsTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ComposerExceptionsTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/ComposerExceptionsTestCase.java Tue Jan 22 22:31:20 2008
@@ -31,9 +31,9 @@
 
 import org.junit.Test;
 import org.apache.composer.core.ComponentAdapter;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.CompositionException;
 import org.apache.composer.core.ComposerException;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.AbstractInjector;
 import org.apache.composer.core.injectors.ConstructorInjector;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultComponentRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultComponentRegistryTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultComponentRegistryTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultComponentRegistryTestCase.java Tue Jan 22 22:31:20 2008
@@ -25,8 +25,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.apache.composer.core.ComponentAdapter;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.CompositionException;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.ConstructorInjector;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;
 import org.apache.composer.core.monitors.NullComponentMonitor;

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=614436&r1=614435&r2=614436&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 22:31:20 2008
@@ -35,13 +35,13 @@
 import org.junit.runner.RunWith;
 import org.apache.composer.core.ComponentAdapter;
 import org.apache.composer.core.ComponentMonitor;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.LifecycleStrategy;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.LifecycleException;
 import org.apache.composer.core.Startable;
 import org.apache.composer.core.behaviors.Caching;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.AbstractInjector;
 import org.apache.composer.core.injectors.AdaptingInjection;
 import org.apache.composer.core.injectors.ConstructorInjection;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultContainerTreeSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultContainerTreeSerializationTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultContainerTreeSerializationTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DefaultContainerTreeSerializationTestCase.java Tue Jan 22 22:31:20 2008
@@ -28,10 +28,10 @@
 import java.util.Properties;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.ComposerException;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.tck.AbstractContainerTest;
 
 

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=614436&r1=614435&r2=614436&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 22:31:20 2008
@@ -16,8 +16,8 @@
  */
 package org.apache.composer.core.defaults;
 
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.tck.AbstractLazyInstantiationTest;
 
 /**

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=614436&r1=614435&r2=614436&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 22:31:20 2008
@@ -17,8 +17,8 @@
 package org.apache.composer.core.defaults;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.tck.AbstractMultipleConstructorTest;
 
 /**

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DelegatingContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DelegatingContainerTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DelegatingContainerTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/DelegatingContainerTestCase.java Tue Jan 22 22:31:20 2008
@@ -24,9 +24,9 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.CompositionException;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.AbstractInjector;
 import org.apache.composer.core.testmodel.DependsOnTouchable;
 import org.apache.composer.core.testmodel.SimpleTouchable;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/NoneOfTheseTestsAffectCoverageMeaningTheyCouldGoTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/NoneOfTheseTestsAffectCoverageMeaningTheyCouldGoTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/NoneOfTheseTestsAffectCoverageMeaningTheyCouldGoTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/NoneOfTheseTestsAffectCoverageMeaningTheyCouldGoTestCase.java Tue Jan 22 22:31:20 2008
@@ -28,10 +28,10 @@
 import java.util.List;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.NameBinding;
 import org.apache.composer.core.CompositionException;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.parameters.ComponentParameter;
 import org.apache.composer.core.parameters.ConstantParameter;
 import org.apache.composer.core.testmodel.DependsOnTouchable;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/UserQuestionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/UserQuestionTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/UserQuestionTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/UserQuestionTestCase.java Tue Jan 22 22:31:20 2008
@@ -25,11 +25,11 @@
 
 import org.junit.Test;
 import org.apache.composer.core.Characteristics;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.CompositionException;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.adapters.AbstractAdapter;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.ConstructorInjection;
 
 /**

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/XStreamSerialisationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/XStreamSerialisationTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/XStreamSerialisationTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/XStreamSerialisationTestCase.java Tue Jan 22 22:31:20 2008
@@ -19,9 +19,9 @@
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.Container;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.testmodel.DependsOnTouchable;
 import org.apache.composer.core.testmodel.SimpleTouchable;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0191TestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0191TestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0191TestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0191TestCase.java Tue Jan 22 22:31:20 2008
@@ -19,8 +19,8 @@
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.AbstractInjector;
 
 public final class Issue0191TestCase {

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0196TestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0196TestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0196TestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0196TestCase.java Tue Jan 22 22:31:20 2008
@@ -20,8 +20,8 @@
 import junit.framework.Assert;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
+import org.apache.composer.core.containers.DefaultContainer;
 
 public class Issue0196TestCase {
     public static class Descriptor {

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=614436&r1=614435&r2=614436&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 22:31:20 2008
@@ -22,9 +22,9 @@
 import java.util.List;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.behaviors.Synchronizing;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.injectors.ConstructorInjection;
 
 public final class Issue0199TestCase {

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0229TestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0229TestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0229TestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0229TestCase.java Tue Jan 22 22:31:20 2008
@@ -19,7 +19,7 @@
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.visitors.VerifyingVisitor;
 
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0265TestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0265TestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0265TestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0265TestCase.java Tue Jan 22 22:31:20 2008
@@ -16,24 +16,24 @@
  */
 package org.apache.composer.core.defaults.issues;
 
-import static org.junit.Assert.assertNotNull;
 import static org.apache.composer.core.tck.MockFactory.mockeryWithCountingNamingScheme;
+import static org.junit.Assert.assertNotNull;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.apache.composer.core.Characteristics;
 import org.apache.composer.core.ComponentAdapter;
 import org.apache.composer.core.ComponentMonitor;
-import org.apache.composer.core.DefaultContainer;
-import org.apache.composer.core.DefaultContainerTestCase;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.Startable;
+import org.apache.composer.core.containers.DefaultContainer;
+import org.apache.composer.core.containers.DefaultContainerTestCase;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @RunWith(JMock.class)
 public class Issue0265TestCase {

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0280TestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0280TestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0280TestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/defaults/issues/Issue0280TestCase.java Tue Jan 22 22:31:20 2008
@@ -20,9 +20,9 @@
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.CompositionException;
+import org.apache.composer.core.containers.DefaultContainer;
 
 public class Issue0280TestCase {
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AdaptingInjectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AdaptingInjectionTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AdaptingInjectionTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AdaptingInjectionTestCase.java Tue Jan 22 22:31:20 2008
@@ -30,9 +30,9 @@
 import org.apache.composer.core.Characteristics;
 import org.apache.composer.core.ComponentAdapter;
 import org.apache.composer.core.ComponentFactory;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.Parameter;
 import org.apache.composer.core.CompositionException;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;
 import org.apache.composer.core.lifecycle.ReflectionLifecycleStrategy;
 import org.apache.composer.core.monitors.ConsoleComponentMonitor;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AnnotatedFieldInjectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AnnotatedFieldInjectorTestCase.java?rev=614436&r1=614435&r2=614436&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AnnotatedFieldInjectorTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/injectors/AnnotatedFieldInjectorTestCase.java Tue Jan 22 22:31:20 2008
@@ -25,9 +25,9 @@
 import java.lang.annotation.Target;
 
 import org.junit.Test;
-import org.apache.composer.core.DefaultContainer;
 import org.apache.composer.core.MutableContainer;
 import org.apache.composer.core.annotations.Inject;
+import org.apache.composer.core.containers.DefaultContainer;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;
 import org.apache.composer.core.monitors.NullComponentMonitor;
 



Mime
View raw message