incubator-composer-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject svn commit: r613949 - in /incubator/composer/trunk/core/src: java/org/apache/composer/core/ java/org/apache/composer/core/containers/ java/org/apache/composer/core/injectors/ java/org/apache/composer/core/monitors/ java/org/apache/composer/core/paramet...
Date Mon, 21 Jan 2008 17:34:51 GMT
Author: hammant
Date: Mon Jan 21 09:34:48 2008
New Revision: 613949

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

Added:
    incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerVerificationException.java
      - copied, changed from r613787, incubator/composer/trunk/core/src/java/org/apache/composer/core/ComposerVerificationException.java
Removed:
    incubator/composer/trunk/core/src/java/org/apache/composer/core/ComposerVerificationException.java
Modified:
    incubator/composer/trunk/core/src/java/org/apache/composer/core/containers/AbstractDelegatingContainer.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/containers/CommandLineArgumentsContainer.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/injectors/AbstractInjector.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/monitors/ComponentMonitorHelper.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/parameters/BasicComponentParameter.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/AbstractContainerVisitor.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/MethodCallingVisitor.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java
    incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/VerifyingVisitor.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/adapters/ComponentAdapterTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/alternatives/issues/Issue0214TestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/injectors/ConstructorInjectorTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/injectors/SetterInjectorTestCase.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractComponentAdapterTest.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractContainerTest.java
    incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractImplementationHidingContainerTest.java

Copied: incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerVerificationException.java
(from r613787, incubator/composer/trunk/core/src/java/org/apache/composer/core/ComposerVerificationException.java)
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerVerificationException.java?p2=incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerVerificationException.java&p1=incubator/composer/trunk/core/src/java/org/apache/composer/core/ComposerVerificationException.java&r1=613787&r2=613949&rev=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/ComposerVerificationException.java
(original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/ContainerVerificationException.java
Mon Jan 21 09:34:48 2008
@@ -28,7 +28,7 @@
  * hierarchy. The verification is normally done with the
  * {@link org.apache.composer.core.visitors.VerifyingVisitor}, that will throw this exception.
  */
-public class ComposerVerificationException extends ComposerException {
+public class ContainerVerificationException extends ComposerException {
     /**
 	 * Serialization UUID.
 	 */
@@ -44,7 +44,7 @@
      * 
      * @param nestedExceptions the exceptions that caused this one.
      */
-    public ComposerVerificationException(final List<? extends Throwable> nestedExceptions)
{
+    public ContainerVerificationException(final List<? extends Throwable> nestedExceptions)
{
         this.nestedExceptions.addAll(nestedExceptions);
     }
 

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/containers/AbstractDelegatingContainer.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/containers/AbstractDelegatingContainer.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/containers/AbstractDelegatingContainer.java
(original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/containers/AbstractDelegatingContainer.java
Mon Jan 21 09:34:48 2008
@@ -39,8 +39,7 @@
 
 	public AbstractDelegatingContainer(Container delegate) {
 		if (delegate == null) {
-			throw new NullPointerException(
-					"PicoContainer delegate must not be null");
+			throw new NullPointerException("Container delegate must not be null");
 		}
 		this.delegate = delegate;
 	}

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/containers/CommandLineArgumentsContainer.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/containers/CommandLineArgumentsContainer.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/containers/CommandLineArgumentsContainer.java
(original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/containers/CommandLineArgumentsContainer.java
Mon Jan 21 09:34:48 2008
@@ -28,7 +28,7 @@
 import org.apache.composer.core.Container;
 
 /**
- * CommandLineArgumentsPicoContainer configured itself from array of strings
+ * CommandLineArgumentsContainer configured itself from array of strings
  * which are most likely coming in as command line arguments
  * 
  */

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/injectors/AbstractInjector.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/injectors/AbstractInjector.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/injectors/AbstractInjector.java
(original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/injectors/AbstractInjector.java
Mon Jan 21 09:34:48 2008
@@ -39,7 +39,7 @@
 /**
  * This ComponentAdapter will instantiate a new object for each call to
  * {@link org.apache.composer.core.ComponentAdapter#getComponentInstance(org.apache.composer.core.Container)}.
- * That means that when used with a PicoContainer, getComponent will
+ * That means that when used with a Container, getComponent will
  * return a new object each time.
  *
  * @author Aslak Helles&oslash;y
@@ -308,7 +308,7 @@
     }
 
     /**
-     * Exception that is thrown as part of the introspection. Raised if a PicoContainer cannot
resolve a
+     * Exception that is thrown as part of the introspection. Raised if a Container cannot
resolve a
      * type dependency because the registered {@link org.apache.composer.core.ComponentAdapter}s
are not
      * distinct.
      *

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/monitors/ComponentMonitorHelper.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/monitors/ComponentMonitorHelper.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/monitors/ComponentMonitorHelper.java
(original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/monitors/ComponentMonitorHelper.java
Mon Jan 21 09:34:48 2008
@@ -32,14 +32,14 @@
  */
 public final class ComponentMonitorHelper  {
 
-    public final static String INSTANTIATING = "PicoContainer: instantiating {0}";
-    public final static String INSTANTIATED = "PicoContainer: instantiated {0} [{1} ms],
component {2}, injected [{3}]";
-    public final static String INSTANTIATION_FAILED = "PicoContainer: instantiation failed:
{0}, reason: {1}";
-    public final static String INVOKING = "PicoContainer: invoking {0} on {1}";
-    public final static String INVOKED = "PicoContainer: invoked {0} on {1} [{2} ms]";
-    public final static String INVOCATION_FAILED = "PicoContainer: invocation failed: {0}
on {1}, reason: {2}";
-    public final static String LIFECYCLE_INVOCATION_FAILED = "PicoContainer: lifecycle invocation
failed: {0} on {1}, reason: {2}";
-    public final static String NO_COMPONENT = "PicoContainer: No component for key: {0}";
+    public final static String INSTANTIATING = "Apache Composer: instantiating {0}";
+    public final static String INSTANTIATED = "Apache Composer: instantiated {0} [{1} ms],
component {2}, injected [{3}]";
+    public final static String INSTANTIATION_FAILED = "Apache Composer: instantiation failed:
{0}, reason: {1}";
+    public final static String INVOKING = "Apache Composer: invoking {0} on {1}";
+    public final static String INVOKED = "Apache Composer: invoked {0} on {1} [{2} ms]";
+    public final static String INVOCATION_FAILED = "Apache Composer: invocation failed: {0}
on {1}, reason: {2}";
+    public final static String LIFECYCLE_INVOCATION_FAILED = "Apache Composer: lifecycle
invocation failed: {0} on {1}, reason: {2}";
+    public final static String NO_COMPONENT = "Apache Composer: No component for key: {0}";
 
     public static String format(String template, Object... arguments) {
         return MessageFormat.format(template, arguments);

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/parameters/BasicComponentParameter.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/parameters/BasicComponentParameter.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/parameters/BasicComponentParameter.java
(original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/parameters/BasicComponentParameter.java
Mon Jan 21 09:34:48 2008
@@ -39,9 +39,9 @@
  * A BasicComponentParameter 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 Apache Composer
a hint
  * about what other component to use in the constructor. This Parameter will never resolve
- * against a collecting type, that is not directly registered in the PicoContainer itself.
+ * against a collecting type, that is not directly registered in the container itself.
  *
  * @author Jon Tirs&eacute;n
  * @author Aslak Helles&oslash;y

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/AbstractContainerVisitor.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/AbstractContainerVisitor.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/AbstractContainerVisitor.java
(original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/AbstractContainerVisitor.java
Mon Jan 21 09:34:48 2008
@@ -1,10 +1,19 @@
-/*****************************************************************************
- * Copyright (C) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *****************************************************************************/
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.composer.core.visitors;
 
 import org.apache.composer.core.ContainerVisitor;

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/MethodCallingVisitor.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/MethodCallingVisitor.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/MethodCallingVisitor.java
(original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/MethodCallingVisitor.java
Mon Jan 21 09:34:48 2008
@@ -1,10 +1,19 @@
-/*****************************************************************************
- * Copyright (C) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *****************************************************************************/
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.composer.core.visitors;
 
 import org.apache.composer.core.Container;

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java
(original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/TraversalCheckingVisitor.java
Mon Jan 21 09:34:48 2008
@@ -1,10 +1,19 @@
-/*****************************************************************************
- * Copyright (C) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *****************************************************************************/
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.composer.core.visitors;
 
 import org.apache.composer.core.ComponentAdapter;
@@ -17,11 +26,11 @@
  * Concrete implementation of Visitor which simply checks traversals.
  * This can be a useful class for other Visitor implementations to extend, 
  * as it provides a default implementation in case you one is only interested
- * in one PicoVisitor type.  Example:
+ * in one ContainerVisitor type.  Example:
  *
  *<pre>
- * PicoContainer container = new DefaultContainer();
- * PicoContainer child = container.makeChildContainer();
+ * Container container = new DefaultContainer();
+ * Container child = container.makeChildContainer();
  *
  * final List allContainers = new ArrayList();
  *

Modified: incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/VerifyingVisitor.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/VerifyingVisitor.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/VerifyingVisitor.java
(original)
+++ incubator/composer/trunk/core/src/java/org/apache/composer/core/visitors/VerifyingVisitor.java
Mon Jan 21 09:34:48 2008
@@ -1,16 +1,25 @@
-/*****************************************************************************
- * Copyright (C) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *****************************************************************************/
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.composer.core.visitors;
 
 import org.apache.composer.core.ComponentAdapter;
 import org.apache.composer.core.Parameter;
 import org.apache.composer.core.Container;
-import org.apache.composer.core.ComposerVerificationException;
+import org.apache.composer.core.ContainerVerificationException;
 import org.apache.composer.core.ContainerVisitor;
 import org.apache.composer.core.visitors.TraversalCheckingVisitor;
 
@@ -44,16 +53,16 @@
     /**
      * Traverse through all components of the {@link org.apache.composer.core.Container}
hierarchy and verify the components.
      * 
-     * @throws org.apache.composer.core.ComposerVerificationException if some components
could not be verified.
+     * @throws org.apache.composer.core.ContainerVerificationException if some components
could not be verified.
      * @see org.apache.composer.core.ContainerVisitor#traverse(java.lang.Object)
      */
-    public Object traverse(Object node) throws ComposerVerificationException {
+    public Object traverse(Object node) throws ContainerVerificationException {
         nestedVerificationExceptions.clear();
         verifiedComponentAdapters.clear();
         try {
             super.traverse(node);
             if (!nestedVerificationExceptions.isEmpty()) {
-                throw new ComposerVerificationException(new ArrayList(nestedVerificationExceptions));
+                throw new ContainerVerificationException(new ArrayList(nestedVerificationExceptions));
             }
         } finally {
             nestedVerificationExceptions.clear();

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/adapters/ComponentAdapterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/adapters/ComponentAdapterTestCase.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/adapters/ComponentAdapterTestCase.java
(original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/adapters/ComponentAdapterTestCase.java
Mon Jan 21 09:34:48 2008
@@ -28,7 +28,7 @@
 import org.apache.composer.core.Parameter;
 import org.apache.composer.core.CompositionException;
 import org.apache.composer.core.Container;
-import org.apache.composer.core.ComposerVerificationException;
+import org.apache.composer.core.ContainerVerificationException;
 import org.apache.composer.core.ContainerVisitor;
 import org.apache.composer.core.injectors.AbstractInjector;
 import org.apache.composer.core.lifecycle.NullLifecycleStrategy;
@@ -53,7 +53,7 @@
         public T getComponentInstance(Container container) throws CompositionException {
             return null;
         }
-        public void verify(Container container) throws ComposerVerificationException {
+        public void verify(Container container) throws ContainerVerificationException {
         }
 
         public String getDescriptor() {
@@ -69,7 +69,7 @@
         public T getComponentInstance(Container container) throws CompositionException {
             return null;
         }
-        public void verify(Container container) throws ComposerVerificationException {
+        public void verify(Container container) throws ContainerVerificationException {
         }
         public Object getComponentKey() {
             return null;

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/alternatives/issues/Issue0214TestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/alternatives/issues/Issue0214TestCase.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/alternatives/issues/Issue0214TestCase.java
(original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/alternatives/issues/Issue0214TestCase.java
Mon Jan 21 09:34:48 2008
@@ -32,25 +32,25 @@
 
         /* This is a workaround for the bug described further down. Normally
          * this method call should only be needed if specific requirements for
-         * parameters exist, but not if PicoContainer shall resolve the
-         * dependencies itself. However, with ImplementationHidingPicoContainer
+         * parameters exist, but not if Composer shall resolve the
+         * dependencies itself. However, with ImplementationHidingContainer
          * this is currently the only way to register a class/interface such
          * that the automatic resolution works.
          */
         pico.addComponent(I1.class, B.class);
 
         /* The following addAdapter(Object, Class) of
-         * ImplementationHidingPicoContainer is buggy, as it contains
+         * ImplementationHidingContainer is buggy, as it contains
          * "ComponentAdapter delegate = componentFactory.createComponentAdapter(componentKey,
          * componentImplementation, new Parameter[0]);". Instead of "new
          * Parameter[0]" it should be "null" to have a behaviour consistent to
-         * DefaultContainer, i.e. if PicoContainer shall resolve
+         * DefaultContainer, i.e. if Apache Container shall resolve
          * dependencies itself.
          */
         pico.addComponent(I2.class, C.class);
 
         /* The following verify() throws the exception, but is expected not to
-         * throw: "org.apache.composer.core.PicoVerificationException:
+         * 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

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java
(original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/containers/ImplementationHidingWithDefaultContainerTestCase.java
Mon Jan 21 09:34:48 2008
@@ -38,7 +38,7 @@
  */
 public class ImplementationHidingWithDefaultContainerTestCase extends AbstractImplementationHidingContainerTest
{
 
-    protected MutableContainer createImplementationHidingPicoContainer() {
+    protected MutableContainer createImplementationHidingContainer() {
         return createContainer(null);
     }
 

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/injectors/ConstructorInjectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/injectors/ConstructorInjectorTestCase.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/injectors/ConstructorInjectorTestCase.java
(original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/injectors/ConstructorInjectorTestCase.java
Mon Jan 21 09:34:48 2008
@@ -144,7 +144,7 @@
         }
     }
 
-    protected ComponentAdapter prepINS_normalExceptionIsRethrownInsidePicoInitializationException(
+    protected ComponentAdapter prepINS_normalExceptionIsRethrownInsideInitializationException(
             MutableContainer picoContainer) {
         return new ConstructorInjector(NormalExceptionThrowing.class, NormalExceptionThrowing.class,
null, new NullComponentMonitor(), new NullLifecycleStrategy(), false);
     }
@@ -213,7 +213,7 @@
         }
     }
 
-    @Test public void testPicoInitializationExceptionThrownBecauseOfFilteredConstructors()
{
+    @Test public void testInitializationExceptionThrownBecauseOfFilteredConstructors() {
         DefaultContainer picoContainer = new DefaultContainer();
         try {
             picoContainer.addComponent(AllConstructorsArePrivate.class);

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/injectors/SetterInjectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/injectors/SetterInjectorTestCase.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/injectors/SetterInjectorTestCase.java
(original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/injectors/SetterInjectorTestCase.java
Mon Jan 21 09:34:48 2008
@@ -155,7 +155,7 @@
         }
     }
 
-    protected ComponentAdapter prepINS_normalExceptionIsRethrownInsidePicoInitializationException(
+    protected ComponentAdapter prepINS_normalExceptionIsRethrownInsideInitializationException(
             MutableContainer picoContainer) {
         picoContainer.addComponent("Pico Container");
         return new SetterInjector(

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractComponentAdapterTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractComponentAdapterTest.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractComponentAdapterTest.java
(original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractComponentAdapterTest.java
Mon Jan 21 09:34:48 2008
@@ -398,7 +398,7 @@
      *         {@link org.apache.composer.core.CompositionException} at instantiation. Registration
in the pico is not
      *         necessary.
      */
-    protected ComponentAdapter prepINS_normalExceptionIsRethrownInsidePicoInitializationException(
+    protected ComponentAdapter prepINS_normalExceptionIsRethrownInsideInitializationException(
             MutableContainer picoContainer) {
         throw new AssertionFailedError("You have to overwrite this method for a useful test");
     }
@@ -406,7 +406,7 @@
     final @Test public void testINS_normalExceptionIsRethrownInsidePicoInitializationException()
{
         if ((getComponentAdapterNature() & INSTANTIATING) > 0) {
             final MutableContainer picoContainer = new DefaultContainer(createDefaultComponentFactory());
-            final ComponentAdapter componentAdapter = prepINS_normalExceptionIsRethrownInsidePicoInitializationException(picoContainer);
+            final ComponentAdapter componentAdapter = prepINS_normalExceptionIsRethrownInsideInitializationException(picoContainer);
             assertSame(getComponentAdapterType(), componentAdapter.getClass());
             try {
                 componentAdapter.getComponentInstance(picoContainer);

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractContainerTest.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractContainerTest.java
(original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractContainerTest.java
Mon Jan 21 09:34:48 2008
@@ -54,7 +54,7 @@
 import org.apache.composer.core.CompositionException;
 import org.apache.composer.core.Container;
 import org.apache.composer.core.ComposerException;
-import org.apache.composer.core.ComposerVerificationException;
+import org.apache.composer.core.ContainerVerificationException;
 import org.apache.composer.core.ContainerVisitor;
 import org.apache.composer.core.Startable;
 import org.apache.composer.core.adapters.InstanceAdapter;
@@ -450,7 +450,7 @@
         try {
             new VerifyingVisitor().traverse(pico);
             fail("we expect a PicoVerificationException");
-        } catch (ComposerVerificationException e) {
+        } catch (ContainerVerificationException e) {
             List nested = e.getNestedExceptions();
             assertEquals(2, nested.size());
             assertTrue(-1 != e.getMessage().indexOf(ComponentA.class.getName()));

Modified: incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractImplementationHidingContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractImplementationHidingContainerTest.java?rev=613949&r1=613948&r2=613949&view=diff
==============================================================================
--- incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractImplementationHidingContainerTest.java
(original)
+++ incubator/composer/trunk/core/src/test/org/apache/composer/core/tck/AbstractImplementationHidingContainerTest.java
Mon Jan 21 09:34:48 2008
@@ -41,18 +41,18 @@
 
 
     @Test public void testInstanceIsNotAutomaticallyHidden() {
-        MutableContainer pc = createImplementationHidingPicoContainer();
+        MutableContainer pc = createImplementationHidingContainer();
         pc.as(this.getProperties()).addComponent(Map.class, new HashMap());
         Map map = pc.getComponent(Map.class);
         assertNotNull(map);
         assertTrue(map instanceof HashMap);
     }
 
-    protected abstract MutableContainer createImplementationHidingPicoContainer();
+    protected abstract MutableContainer createImplementationHidingContainer();
 
 
     @Test public void testImplementaionIsAutomaticallyHidden() {
-        MutableContainer pc = createImplementationHidingPicoContainer();
+        MutableContainer pc = createImplementationHidingContainer();
         pc.addComponent(Map.class, HashMap.class);
         Map map = pc.getComponent(Map.class);
         assertNotNull(map);
@@ -60,7 +60,7 @@
     }
 
     @Test public void testNonInterfaceImplementaionIsAutomaticallyHidden() {
-        MutableContainer pc = createImplementationHidingPicoContainer();
+        MutableContainer pc = createImplementationHidingContainer();
         pc.addComponent(HashMap.class, HashMap.class);
         Map map = pc.getComponent(HashMap.class);
         assertNotNull(map);
@@ -68,7 +68,7 @@
     }
 
     @Test public void testNonInterfaceImplementaionWithParametersIsAutomaticallyHidden()
{
-        MutableContainer pc = createImplementationHidingPicoContainer();
+        MutableContainer pc = createImplementationHidingContainer();
         pc.addComponent(HashMap.class, HashMap.class);
         Map map = pc.getComponent(HashMap.class);
         assertNotNull(map);
@@ -77,7 +77,7 @@
 
 
     @Test public void testImplementaionWithParametersIsAutomaticallyHidden() {
-        MutableContainer pc = createImplementationHidingPicoContainer();
+        MutableContainer pc = createImplementationHidingContainer();
         pc.addComponent(Map.class, HashMap.class);
         Map map = pc.getComponent(Map.class);
         assertNotNull(map);
@@ -95,7 +95,7 @@
     }
 
     @Test public void testExceptionThrowingFromHiddenComponent() {
-        MutableContainer pc = createImplementationHidingPicoContainer();
+        MutableContainer pc = createImplementationHidingContainer();
         pc.addComponent(ActionListener.class, Burp.class);
         try {
             ActionListener ac = pc.getComponent(ActionListener.class);



Mime
View raw message