|
osdir.com mailing list archive |
|
Subject: [picocontainer-scm] [3511] java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer: CFs can depend on _some_ things added to builder - msg#00051List: java.picocontainer.cvsCFs can depend on _some_ things added to builderModified Paths
--- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java 2007-06-10 16:53:02 UTC (rev 3510)
+++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java 2007-06-10 17:10:30 UTC (rev 3511)
@@ -54,12 +54,13 @@
* {@link org.picocontainer.PicoRegistrationException}.
* @throws PicoIntrospectionException
*/
- ComponentAdapter createComponentAdapter(ComponentMonitor componentMonitor, LifecycleStrategy lifecycleStrategy, ComponentCharacteristic componentCharacteristic,
+ ComponentAdapter createComponentAdapter(ComponentMonitor componentMonitor,
+ LifecycleStrategy lifecycleStrategy,
+ ComponentCharacteristic componentCharacteristic,
Object componentKey,
Class componentImplementation,
Parameter... parameters) throws PicoIntrospectionException,
+ PicoRegistrationException;
- PicoRegistrationException;
-
}
Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoBuilder.java (3510 => 3511)
--- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoBuilder.java 2007-06-10 16:53:02 UTC (rev 3510)
+++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoBuilder.java 2007-06-10 17:10:30 UTC (rev 3511)
@@ -18,12 +18,14 @@
import org.picocontainer.monitors.NullComponentMonitor;
import java.util.Stack;
+import java.util.ArrayList;
public class PicoBuilder {
private PicoContainer parentContainer;
private Class mpcClass = DefaultPicoContainer.class;
private ComponentMonitor componentMonitor;
+ private ArrayList containerComps = new ArrayList();
public PicoBuilder(PicoContainer parentContainer, InjectionFactory injectionType) {
this.injectionType = injectionType;
@@ -86,10 +88,14 @@
DefaultPicoContainer temp = new TransientPicoContainer();
temp.addComponent(PicoContainer.class, parentContainer);
+ for (Object containerComp : containerComps) {
+ temp.addComponent(containerComp);
+ }
+
ComponentFactory lastCaf = injectionType;
while (!cafs.empty()) {
Object caf = cafs.pop();
- DefaultPicoContainer temp2 = new DefaultPicoContainer(new ConstructorInjectionFactory(), NullLifecycleStrategy.getInstance(), new EmptyPicoContainer());
+ DefaultPicoContainer temp2 = new TransientPicoContainer(temp);
temp2.addComponent("caf", caf);
if (lastCaf != null) {
temp2.addComponent(ComponentFactory.class, lastCaf);
@@ -183,4 +189,14 @@
componentMonitorClass = null;
return this;
}
+
+ public PicoBuilder withComponentFactory(Class componentFactoryClass) {
+ cafs.push(componentFactoryClass);
+ return this;
+ }
+
+ public PicoBuilder withCustomContainerComponent(Object containerDependency) {
+ containerComps.add(containerDependency);
+ return this;
+ }
}
Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/containers/TransientPicoContainer.java (3510 => 3511)
--- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/containers/TransientPicoContainer.java 2007-06-10 16:53:02 UTC (rev 3510)
+++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/containers/TransientPicoContainer.java 2007-06-10 17:10:30 UTC (rev 3511)
@@ -1,6 +1,7 @@
package org.picocontainer.containers;
import org.picocontainer.DefaultPicoContainer;
+import org.picocontainer.PicoContainer;
import org.picocontainer.injectors.ConstructorInjectionFactory;
import org.picocontainer.behaviors.CachingBehaviorFactory;
import org.picocontainer.lifecycle.NullLifecycleStrategy;
@@ -11,4 +12,8 @@
public TransientPicoContainer() {
super(new CachingBehaviorFactory().forThis(new ConstructorInjectionFactory()), NullLifecycleStrategy.getInstance(), null, NullComponentMonitor.getInstance());
}
+
+ public TransientPicoContainer(PicoContainer parent) {
+ super(new CachingBehaviorFactory().forThis(new ConstructorInjectionFactory()), NullLifecycleStrategy.getInstance(), parent, NullComponentMonitor.getInstance());
+ }
}
Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/PicoBuilderTestCase.java (3510 => 3511)
--- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/PicoBuilderTestCase.java 2007-06-10 16:53:02 UTC (rev 3510)
+++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/PicoBuilderTestCase.java 2007-06-10 17:10:30 UTC (rev 3511)
@@ -292,6 +292,37 @@
"PICO",foo);
}
+ public void testWithCustomComponentFactory() {
+ MutablePicoContainer mpc = new PicoBuilder().withCustomContainerComponent(new SomeContainerDependency()).withComponentFactory(CustomComponentFactory.class).build();
+ String foo = simplifyRepresentation(mpc);
+ assertEquals("PICO\n" +
+ " componentAdapterFactory=org.picocontainer.PicoBuilderTestCase_CustomComponentFactory\n" +
+ " parent=org.picocontainer.containers.EmptyPicoContainer\n" +
+ " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" +
+ " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n" +
+ "PICO",foo);
+ }
+
+ public static class SomeContainerDependency {
+ }
+ public static class CustomComponentFactory implements ComponentFactory {
+
+ public CustomComponentFactory(SomeContainerDependency someDependency) {
+ }
+
+ public ComponentAdapter createComponentAdapter(ComponentMonitor componentMonitor,
+ LifecycleStrategy lifecycleStrategy,
+ ComponentCharacteristic componentCharacteristic,
+ Object componentKey,
+ Class componentImplementation,
+ Parameter... parameters) throws PicoIntrospectionException,
+ PicoRegistrationException
+ {
+ return null;
+ }
+ }
+
+
public void testWithCustomPicoContainer() {
MutablePicoContainer mpc = new PicoBuilder().thisMutablePicoContainer(TestPicoContainer.class).build();
String foo = simplifyRepresentation(mpc);
To unsubscribe from this list please visit: Thread at a glance:
Previous Message by Date: click to view message preview[picocontainer-scm] [3510] java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer: fixup some textual errors from a previous refactoringRevision 3510 Author paul Date 2007-06-10 11:53:02 -0500 (Sun, 10 Jun 2007) Log Message fixup some textual errors from a previous refactoring Modified Paths java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoContainer.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/ComponentElementHelper.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/TestAdapter.java java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsApplicator.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsContainer.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/ComponentPointcut.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/PointcutsFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AspectsComponentAdapterFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/KeyEqualsComponentPointcut.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/NameMatchesComponentPointcut.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspect.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspectsCollection.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerLoader.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedInterceptorFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedMixinFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopPointcutsFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/MixinComponentAspect.java java/sandbox/baby-steps/nano2/container-bsh/src/java/org/nanocontainer/script/bsh/BeanShellAdapter.java java/sandbox/baby-steps/nano2/container-bsh/src/test/org/nanocontainer/script/bsh/BeanShellContainerBuilderTestCase.java java/sandbox/baby-steps/nano2/container-jruby/src/test/org/nanocontainer/script/jruby/JRubyContainerBuilderTestCase.java java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/X.java java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/Xxx.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/ActionFactory.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoActionServlet.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoRequestProcessor.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoTilesRequestProcessor.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/java/org/nanocontainer/nanowar/webwork2/PicoObjectFactory.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/test/org/nanocontainer/nanowar/webwork2/PicoObjectFactoryTestCase.java java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/ExceptionFactory.java java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/DBCPDataSource.java java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/FailoverDataSourceConnection.java java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/JNDIDataSource.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/FailoverSessionDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionComponent.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionFactoryDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/FailoverSessionDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryLifecycle.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionLifecycle.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/FailoverSessionDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionComponent.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionFactoryDelegator.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/ejb/EJBClientAdapter.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractConstructingProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractNamingConventionMBeanInfoProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentKeyConventionMBeanInfoProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentTypeConventionMBeanInfoProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanComponentProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorAdapter.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactory.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXRegistrationException.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXVisitor.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ObjectNameFactory.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/PredefinedObjectNameFactory.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/RegisteredMBeanConstructingProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/StandardMBeanFactory.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/mx4j/MX4JDynamicMBeanFactory.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/testmodel/PersonMBeanDescription.java java/sandbox/baby-steps/nanoextras2/tools/tools/src/java/org/nanocontainer/tools/ant/Component.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/BeanPropertyComponentAdapter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentAdapter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitor.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitorStrategy.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Disposable.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleManager.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleStrategy.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/MutablePicoContainer.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Parameter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoContainer.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoRegistrationException.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Startable.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/AbstractAdapter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/InstanceAdapter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/CachingBehavior.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/ImplementationHidingBehavior.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AbstractInjector.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AnnotationInjectionFactory.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/ConstructorInjector.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjectionFactory.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjector.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/ReflectionLifecycleStrategy.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/StartableLifecycleStrategy.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/monitors/AbstractComponentMonitor.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/BasicComponentParameter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/CollectionComponentParameter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/ComponentParameter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/visitors/MethodCallingVisitor.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/DefaultPicoContainerTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/adapters/SynchronizedComponentAdapterTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/behaviors/BehaviorAdapterTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/doc/advanced/CollectionsTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractImplementationHidingPicoContainerTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractPicoContainerTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTestCase.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapterFactory.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/HotSwappingComponentAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ImplementationHidingBehaviorAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/PoolingComponentAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/StaticFactoryAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactory.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Anything.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Constraint.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsExactType.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKey.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKeyType.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsType.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/monitors/ComponentDependencyMonitor.java java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/AssimilatingComponentAdapterTest.java java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/PoolingComponentAdapterTest.java Diff Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoContainer.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoContainer.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoContainer.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -21,7 +21,7 @@ * <p/> * A NanoContainer adapts a {@link MutablePicoContainer} through a similar API that * is based only on Strings. (It uses reflection to look up classes before registering them - * with the adapted PicoContainer). This addAdapter API is used primarily by the various + * with the adapted PicoContainer). This adapter API is used primarily by the various * {@link org.nanocontainer.script.ScriptedContainerBuilder} implementations in the * org.nanocontainer.script.[scripting engine] packages. * Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/ComponentElementHelper.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/ComponentElementHelper.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/ComponentElementHelper.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -32,7 +32,7 @@ key = key == null ? instance.getClass() : key; return current.addComponent(key, instance); } else { - throw new NanoContainerMarkupException("Must specify a 'class' attribute for a addComponent as a class name (string) or Class."); + throw new NanoContainerMarkupException("Must specify a 'class' attribute for a component as a class name (string) or Class."); } } Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -248,7 +248,7 @@ } } } - // handle CAF now as standard addComponent in the metaContainer + // handle CAF now as standard component in the metaContainer registerComponent(metaContainer, node); } Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -151,7 +151,7 @@ } /** - * process addAdapter node + * process adapter node * @param container * @param rootElement */ @@ -187,7 +187,7 @@ String klass = rootElement.getAttribute(CLASS); String constructor = rootElement.getAttribute(CONSTRUCTOR); if (klass == null || "".equals(klass)) { - throw new NanoContainerMarkupException("class specification is required for addComponent implementation"); + throw new NanoContainerMarkupException("class specification is required for component implementation"); } Class clazz = getClassLoader().loadClass(klass); Modified: java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/TestAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/TestAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/TestAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -14,7 +14,7 @@ import org.picocontainer.adapters.AbstractAdapter; /** - * addComponent addAdapter to test script instantiation. + * component adapter to test script instantiation. */ public final class TestAdapter extends AbstractAdapter { Modified: java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -178,9 +178,9 @@ assertNotNull("Container should have a 'foo' addComponent", fooTestComp); StringBuffer sb = pico.getComponent(StringBuffer.class); - assertTrue("Container should have instantiated a 'TestComp2' addComponent because it is Startable", sb.toString().indexOf("-TestComp2") != -1); + assertTrue("Container should have instantiated a 'TestComp2' component because it is Startable", sb.toString().indexOf("-TestComp2") != -1); // We are using the DefaultLifecycleManager, which only instantiates Startable components, and not non-Startable components. - assertTrue("Container should NOT have instantiated a 'NotStartable' addComponent because it is NOT Startable", sb.toString().indexOf("-NotStartable") == -1); + assertTrue("Container should NOT have instantiated a 'NotStartable' component because it is NOT Startable", sb.toString().indexOf("-NotStartable") == -1); } public void testUnknownclassThrowsNanoContainerMarkupException() { Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -30,7 +30,7 @@ * @param containerClass the class of the basic container to delegate to. * @param aspectsManager the aspects manager used to register and apply * aspects. - * @param componentAdapterFactory the delegate addComponent addAdapter factory + * @param componentAdapterFactory the delegate component adapter factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. @@ -42,7 +42,7 @@ * Creates a new <code>AspectablePicoContainer</code>. * * @param containerClass the class of the basic container to delegate to. - * @param componentAdapterFactory the delegate addComponent addAdapter factory + * @param componentAdapterFactory the delegate component adapter factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. @@ -55,7 +55,7 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. * - * @param componentAdapterFactory the delegate addComponent addAdapter factory + * @param componentAdapterFactory the delegate component adapter factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. @@ -67,7 +67,7 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. * - * @param componentAdapterFactory the delegate addComponent addAdapter factory + * @param componentAdapterFactory the delegate component adapter factory * used to produce components. * @return a new <code>AspectablePicoContainer</code>. */ @@ -78,7 +78,7 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. Uses * <code>org.picocontainer.injectors.AnyInjectionFactory</code> - * as the delegate addComponent addAdapter factory. + * as the delegate component adapter factory. * * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. @@ -90,7 +90,7 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. Uses * <code>org.picocontainer.injectors.AnyInjectionFactory</code> - * as the delegate addComponent addAdapter factory. + * as the delegate component adapter factory. * * @return a new <code>AspectablePicoContainer</code>. */ Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsApplicator.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsApplicator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsApplicator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,7 +12,7 @@ import org.picocontainer.PicoContainer; /** - * Applies aspects to a addComponent. Intended for use by addComponent adapters that + * Applies aspects to a addComponent. Intended for use by component adapters that * need to inject aspects into a addComponent. * * @author Stephen Molitor Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsContainer.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsContainer.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsContainer.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -37,7 +37,7 @@ void registerInterceptor(ClassPointcut classPointcut, MethodPointcut methodPointcut, MethodInterceptor interceptor); /** - * Registers addComponent scoped interceptor advice. The advice will be applied + * Registers component scoped interceptor advice. The advice will be applied * to all components in the container whose key satisfies * <code>componentPointcut</code>. The interceptor will only intercept * methods that match the <code>methodPointcut</code>. @@ -51,7 +51,7 @@ /** * Registers container supplied container scoped interceptor advice. The - * interceptor advice object itself is a addComponent in the container, + * interceptor advice object itself is a component in the container, * specified by <code>interceptorComponentKey</code>. The advice will be * applied to all components in the container whose class satisfies the * <code>classPointcut</code>. The interceptor will only intercept @@ -59,13 +59,13 @@ * * @param classPointcut classes to apply the interceptor to. * @param methodPointcut methods to apply the interceptor to. - * @param interceptorComponentKey the interceptor addComponent key. + * @param interceptorComponentKey the interceptor component key. */ void registerInterceptor(ClassPointcut classPointcut, MethodPointcut methodPointcut, Object interceptorComponentKey); /** - * Registers addComponent scoped interceptor advice. The interceptor advice - * object itself is a addComponent in the container, specified by the + * Registers component scoped interceptor advice. The interceptor advice + * object itself is a component in the container, specified by the * <code>interceptorComponentKey</code>. The advice will be applied to * all components in the container whose key satisfies * <code>componentPointcut</code>. The interceptor will only intercept @@ -73,7 +73,7 @@ * * @param componentPointcut components to apply the interceptor to. * @param methodPointcut methods to apply the interceptor to. - * @param interceptorComponentKey the interceptor addComponent key. + * @param interceptorComponentKey the interceptor component key. */ void registerInterceptor(ComponentPointcut componentPointcut, MethodPointcut methodPointcut, Object interceptorComponentKey); @@ -83,8 +83,8 @@ * components in the container whose class satisfies the * <code>classPointcut</code>. * <p/> - * If a addComponent of type <code>mixinClass</code> has been registered in - * the container, that addComponent will be used as the mixin. Otherwise a new + * If a component of type <code>mixinClass</code> has been registered in + * the container, that component will be used as the mixin. Otherwise a new * object of type <code>mixinClass</code> will be instantiated each time * the mixin is applied to a addComponent. Any dependencies the mixin has will * be supplied from components in the container, or, if there are no @@ -98,7 +98,7 @@ void registerMixin(ClassPointcut classPointcut, Class[] interfaces, Class mixinClass); /** - * Registers addComponent scoped mixin advice. The mixin will be added to all + * Registers component scoped mixin advice. The mixin will be added to all * components in the container whose key satisfies the * <code>componentPointcut</code>. * @@ -124,7 +124,7 @@ void registerMixin(ClassPointcut classPointcut, Class mixinClass); /** - * Registers addComponent scoped mixin advice. The mixin will be added to all + * Registers component scoped mixin advice. The mixin will be added to all * components in the container whose key satisfies the * <code>componentPointcut</code>. Convenience method that uses all * interfaces implemented by the mixin class. @@ -150,7 +150,7 @@ void registerInterfaces(ClassPointcut classPointcut, Class[] interfaces); /** - * Adds interfaces to components picked by the addComponent pointcut. + * Adds interfaces to components picked by the component pointcut. * * @param componentPointcut components to add interfaces to. * @param interfaces the interfaces to add. Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/ComponentPointcut.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/ComponentPointcut.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/ComponentPointcut.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -10,7 +10,7 @@ package org.nanocontainer.aop; /** - * Pointcut that picks addComponent keys. + * Pointcut that picks component keys. * * @author Stephen Molitor * @version $Revision$ @@ -18,9 +18,9 @@ public interface ComponentPointcut { /** - * Returns true if the addComponent key satisfies this pointcut. + * Returns true if the component key satisfies this pointcut. * - * @param componentKey the addComponent key. + * @param componentKey the component key. * @return true if the pointcut is satisfied, else false. */ boolean picks(Object componentKey); Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/PointcutsFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/PointcutsFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/PointcutsFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -20,22 +20,22 @@ public interface PointcutsFactory { /** - * Returns a addComponent pointcut that picks one addComponent key. + * Returns a component pointcut that picks one component key. * - * @param componentKey the addComponent key to match against. + * @param componentKey the component key to match against. * @return a <code>ComponentPointcut</code> that matches * <code>componentKey</code>. */ ComponentPointcut component(Object componentKey); /** - * Returns a addComponent pointcut that matches addComponent keys with a regular + * Returns a component pointcut that matches component keys with a regular * _expression_. The regular _expression_ must be an <a * href="" </a> Perl5 compatible * regular _expression_. * * @param regex the regular _expression_ to match against. - * @return a <code>ComponentPointcut</code> that matches the addComponent key + * @return a <code>ComponentPointcut</code> that matches the component key * against <code>regex</code>. * @throws MalformedRegularExpressionException * if the regular _expression_ is Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AspectsComponentAdapterFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AspectsComponentAdapterFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AspectsComponentAdapterFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -20,7 +20,7 @@ import org.picocontainer.behaviors.AbstractBehaviorFactory; /** - * Produces addComponent adapters that apply aspects to components. + * Produces component adapters that apply aspects to components. * * @author Stephen Molitor * @version $Revision$ Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/KeyEqualsComponentPointcut.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/KeyEqualsComponentPointcut.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/KeyEqualsComponentPointcut.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,7 +12,7 @@ import org.nanocontainer.aop.ComponentPointcut; /** - * Component pointcut that matches against a addComponent key. + * Component pointcut that matches against a component key. * * @author Stephen Molitor * @version $Revision$ @@ -25,7 +25,7 @@ * Creates a new <code>KeyEqualsComponentPointcut</code> that matches * against <code>componentKey</code>. * - * @param componentKey the addComponent key to match against. + * @param componentKey the component key to match against. */ public KeyEqualsComponentPointcut(Object componentKey) { if (componentKey == null) { @@ -35,12 +35,12 @@ } /** - * Tests to see if the <code>componentKey</code> matches the addComponent key + * Tests to see if the <code>componentKey</code> matches the component key * passed to the constructor. * - * @param componentKey the candidate addComponent key to match against. + * @param componentKey the candidate component key to match against. * @return true if <code>componentKey</code> is equivalent to the - * addComponent key passed to the constructor, else false. + * component key passed to the constructor, else false. */ public boolean picks(Object componentKey) { return this.componentKey.equals(componentKey); Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/NameMatchesComponentPointcut.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/NameMatchesComponentPointcut.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/NameMatchesComponentPointcut.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -17,7 +17,7 @@ import org.nanocontainer.aop.MalformedRegularExpressionException; /** - * Component pointcut that matches the addComponent name against a regular + * Component pointcut that matches the component name against a regular * _expression_. * * @author Stephen Molitor @@ -30,12 +30,12 @@ /** * Creates a new <code>NameMatchesComponentPointcut</code> that will match - * the addComponent key against the given regular _expression_. The regular + * the component key against the given regular _expression_. The regular * _expression_ must be an <a * href="" </a> Perl5 regular * _expression_. * - * @param regex the regular _expression_ to match against the addComponent name. + * @param regex the regular _expression_ to match against the component name. * @throws org.nanocontainer.aop.MalformedRegularExpressionException * if the regular _expression_ is * invalid. @@ -45,15 +45,15 @@ try { pattern = compiler.compile(regex); } catch (MalformedPatternException e) { - throw new MalformedRegularExpressionException("malformed addComponent name regular _expression_", e); + throw new MalformedRegularExpressionException("malformed component name regular _expression_", e); } } /** - * Tests to see if the addComponent key's toString() value matches the regular _expression_ passed + * Tests to see if the component key's toString() value matches the regular _expression_ passed * to the constructor. * - * @param componentKey the addComponent key to match against. + * @param componentKey the component key to match against. * @return true if the regular _expression_ passed to the constructor matches * against <code>componentKey</code>, else false. */ Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspect.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspect.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspect.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -27,7 +27,7 @@ * Creates a new <code>ComponentAspect</code> with the given addComponent * pointcut. * - * @param componentPointcut the addComponent pointcut. + * @param componentPointcut the component pointcut. */ ComponentAspect(ComponentPointcut componentPointcut) { this.componentPointcut = componentPointcut; @@ -37,9 +37,9 @@ * Registers this aspect with <code>aspects</code> if the addComponent * pointcut passed to the constructor picks the <code>componentKey</code>. * Template method that calls <code>doRegisterAspect</code> if the - * addComponent key matches. + * component key matches. * - * @param componentKey the addComponent key to match against. + * @param componentKey the component key to match against. * @param aspects the <code>dynaop.Aspects</code> collection. */ final void registerAspect(Object componentKey, Aspects aspects) { Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspectsCollection.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspectsCollection.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspectsCollection.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -20,7 +20,7 @@ import java.util.Iterator; /** - * Represents the collection of addComponent scoped aspects for a Pico container. + * Represents the collection of component scoped aspects for a Pico container. * Manages a collection of <code>ComponentAspect</code> objects, and knows how * to register their aspects. * @@ -32,23 +32,23 @@ private final Collection componentsAspects = new ArrayList(); /** - * Adds a addComponent aspect to this collection. + * Adds a component aspect to this collection. * - * @param componentAspect the addComponent aspect to add. + * @param componentAspect the component aspect to add. */ void add(ComponentAspect componentAspect) { componentsAspects.add(componentAspect); } /** - * Registers all aspects whose addComponent pointcut matches + * Registers all aspects whose component pointcut matches * <code>componentKey</code>. Creates and returns a new * <code>dynaop.Aspects</code> object that is the union of the addComponent * and container scoped aspects. By copying the container scoped aspects to - * a new <code>dynaop.Aspects</code> and adding the addComponent aspects to + * a new <code>dynaop.Aspects</code> and adding the component aspects to * this new object, we avoid having to create proxies on top of proxies. * - * @param componentKey the addComponent key. + * @param componentKey the component key. * @param containerAspects the container scoped aspects. * @return a new <code>dynaop.Aspects</code> object that contains * everything in <code>containerAspects</code> plus the addComponent Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerLoader.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerLoader.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerLoader.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -16,8 +16,8 @@ * Loads a <code>PicoContainer</code> 'late'. Used to create a late-loading * <code>PicoContainer</code> proxy which is passed to * <code>dynaop.MixinFactory</code> and <code>dynaop.InterceptorFactory</code> - * objects whose mixin or interceptor advice is a addComponent in the container, - * specified by addComponent key. The container object may be created after the + * objects whose mixin or interceptor advice is a component in the container, + * specified by component key. The container object may be created after the * advice factories. * * @author Stephen Molitor Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedInterceptorFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedInterceptorFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedInterceptorFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -33,11 +33,11 @@ /** * Creates a new <code>ContainerSuppliedInterceptorFactory</code> that * will manufacture interceptors by retrieving them from the - * <code>PicoContainer</code> using a given addComponent key. + * <code>PicoContainer</code> using a given component key. * * @param pico the <code>PicoContainer</code> to retrieve the interceptor * from. - * @param interceptorComponentKey the addComponent key that will be used to + * @param interceptorComponentKey the component key that will be used to * retrieve the interceptor from the pico container. */ ContainerSuppliedInterceptorFactory(PicoContainer pico, Object interceptorComponentKey) { @@ -57,7 +57,7 @@ public Interceptor create(Proxy proxy) throws NullPointerException { MethodInterceptor methodInterceptor = (MethodInterceptor) pico.getComponent(interceptorComponentKey); if (methodInterceptor == null) { - throw new NullPointerException("Interceptor with addComponent key " + interceptorComponentKey + throw new NullPointerException("Interceptor with component key " + interceptorComponentKey + " + not found in PicoContainer"); } return new MethodInterceptorAdapter(methodInterceptor); Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedMixinFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedMixinFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedMixinFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -32,7 +32,7 @@ /** * Creates a new <code>ContainerSuppliedMixinFactory</code> that will * manufacture mixins by retrieving them from the <code>PicoContainer</code> - * using a given addComponent key. + * using a given component key. * * @param pico the <code>PicoContainer</code> to retrieve the mixin from. * @param mixinClass the mixin class Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopPointcutsFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopPointcutsFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopPointcutsFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -120,10 +120,10 @@ } private static dynaop.ClassPointcut toDynaopClassCut(final ClassPointcut nanoCut) { - // The purpose of the anonymous inner class addAdapter below is to allow + // The purpose of the anonymous inner class adapter below is to allow // users to use union, intersection and not with custom pointcuts (not // instances of dynaop.ClassPointcut). Now we could just wrap nanoCut - // with the addAdapter every time, even if it is already a + // with the adapter every time, even if it is already a // dynaop.ClassPointcut. But the extra level of indirection gets a // little // confusing when debugging. Thus the instanceof check. Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/MixinComponentAspect.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/MixinComponentAspect.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/MixinComponentAspect.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -28,11 +28,11 @@ /** * Creates a new <code>MixinComponentAspect</code> from the given - * addComponent pointcut and mixin class. The aspected addComponent will implement + * component pointcut and mixin class. The aspected component will implement * the provided set of mixin interfaces. * * @param componentPointcut the components to introduce the mixin to. - * @param mixinInterfaces the mixin interfaces the aspected addComponent will + * @param mixinInterfaces the mixin interfaces the aspected component will * implement. * @param mixinFactory the mixin factory. */ Modified: java/sandbox/baby-steps/nano2/container-bsh/src/java/org/nanocontainer/script/bsh/BeanShellAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-bsh/src/java/org/nanocontainer/script/bsh/BeanShellAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-bsh/src/java/org/nanocontainer/script/bsh/BeanShellAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -25,11 +25,11 @@ import java.util.Collections; /** - * This addAdapter relies on <a href="" for instantiation - * (and possibly also initialisation) of addComponent instances. + * This adapter relies on <a href="" for instantiation + * (and possibly also initialisation) of component instances. * <p/> * When {@link org.picocontainer.ComponentAdapter#getComponentInstance} is called (by PicoContainer), - * the addAdapter instance will look for a script with the same name as the addComponent implementation + * the adapter instance will look for a script with the same name as the component implementation * class (but with the .bsh extension). This script must reside in the same folder as the class. * (It's ok to have them both in a jar). * <p/> @@ -38,10 +38,10 @@ * <p/> * The script will have access to the following variables: * <ul> - * <li>addAdapter - the addAdapter calling the script</li> + * <li>addAdapter - the adapter calling the script</li> * <li>picoContainer - the MutablePicoContainer calling the addAdapter</li> - * <li>componentKey - the addComponent key</li> - * <li>componentImplementation - the addComponent implementation</li> + * <li>componentKey - the component key</li> + * <li>componentImplementation - the component implementation</li> * <li>parameters - the ComponentParameters (as a List)</li> * </ul> * @author <a href="" at leosimons dot com">Leo Simons</a> Modified: java/sandbox/baby-steps/nano2/container-bsh/src/test/org/nanocontainer/script/bsh/BeanShellContainerBuilderTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-bsh/src/test/org/nanocontainer/script/bsh/BeanShellContainerBuilderTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-bsh/src/test/org/nanocontainer/script/bsh/BeanShellContainerBuilderTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -91,7 +91,7 @@ testComp = classLoader.loadClass("TestComp"); } catch (ClassNotFoundException ex) { ex.printStackTrace(); - fail("Unable to load test addComponent from the jar using a url classloader"); + fail("Unable to load test component from the jar using a url classloader"); } PicoContainer pico = buildContainer(new BeanShellContainerBuilder(script, classLoader), parent, "SOME_SCOPE"); Modified: java/sandbox/baby-steps/nano2/container-jruby/src/test/org/nanocontainer/script/jruby/JRubyContainerBuilderTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-jruby/src/test/org/nanocontainer/script/jruby/JRubyContainerBuilderTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-jruby/src/test/org/nanocontainer/script/jruby/JRubyContainerBuilderTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -330,7 +330,7 @@ try { buildContainer(script, null, ASSEMBLY_SCOPE); - fail("Should not have been able to instansiate addComponent tree due to visibility/parent reasons."); + fail("Should not have been able to instansiate component tree due to visibility/parent reasons."); } catch(AbstractInjector.UnsatisfiableDependenciesException expected) { } } @@ -556,7 +556,7 @@ try { testComp = classLoader.loadClass("TestComp"); } catch(ClassNotFoundException ex) { - fail("Unable to load test addComponent from the jar using a url classloader"); + fail("Unable to load test component from the jar using a url classloader"); } Reader script = new StringReader( "container(:parent => $parent) {\n" Modified: java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/X.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/X.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/X.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,7 +12,7 @@ import org.picocontainer.Startable; /** - * An abstract addComponent and three dependancies used for testing. + * An abstract component and three dependancies used for testing. */ public abstract class X implements Startable, Disposable { Modified: java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/Xxx.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/Xxx.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/Xxx.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -13,7 +13,7 @@ import org.picocontainer.Startable; /** - * An abstract addComponent and three dependancies used for testing. + * An abstract component and three dependancies used for testing. */ public abstract class Xxx implements Startable, Disposable { Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/ActionFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/ActionFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/ActionFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -43,7 +43,7 @@ * or if that container can not be found, the application container. If no * parent container can be found, a <code>PicoInitializationException</code> * will be thrown. The action path specified in the mapping is used as - * the addComponent key for the action. + * the component key for the action. * * @param request the Http servlet request. * @param mapping the Struts mapping object, whose type property tells us what Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoActionServlet.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoActionServlet.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoActionServlet.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -30,7 +30,7 @@ /** * Creates or retrieves the action instance. The action is retrieved from the actions - * Pico container, using the mapping path as the addComponent key. If no such action exists, + * Pico container, using the mapping path as the component key. If no such action exists, * a new one will be instantiated and placed in the actions container, thus injecting * its dependencies. * Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoRequestProcessor.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoRequestProcessor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoRequestProcessor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -30,7 +30,7 @@ /** * Creates or retrieves the action instance. The action is retrieved from the actions - * Pico container, using the mapping path as the addComponent key. If no such action exists, + * Pico container, using the mapping path as the component key. If no such action exists, * a new one will be instantiated and placed in the actions container, thus injecting * its dependencies. * Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoTilesRequestProcessor.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoTilesRequestProcessor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoTilesRequestProcessor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -31,7 +31,7 @@ /** * Creates or retrieves the action instance. The action is retrieved from the actions - * Pico container, using the mapping path as the addComponent key. If no such action exists, + * Pico container, using the mapping path as the component key. If no such action exists, * a new one will be instantiated and placed in the actions container, thus injecting * its dependencies. * Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/java/org/nanocontainer/nanowar/webwork2/PicoObjectFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/java/org/nanocontainer/nanowar/webwork2/PicoObjectFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/java/org/nanocontainer/nanowar/webwork2/PicoObjectFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -20,7 +20,7 @@ /** * <p> - * XWork ObjectFactory which uses a PicoContainer to create addComponent instances. + * XWork ObjectFactory which uses a PicoContainer to create component instances. * </p> * * @author Cyrille Le Clerc Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/test/org/nanocontainer/nanowar/webwork2/PicoObjectFactoryTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/test/org/nanocontainer/nanowar/webwork2/PicoObjectFactoryTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/test/org/nanocontainer/nanowar/webwork2/PicoObjectFactoryTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -95,7 +95,7 @@ } /** - * if addComponent was not registered explicitely, there shall be different instance for + * if component was not registered explicitely, there shall be different instance for * next invocation. not only actions are instantiated via factory, but also important stuff like filters, * validators, interceptors etc - they shall not be shared. * @throws Exception Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/ExceptionFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/ExceptionFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/ExceptionFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -1,7 +1,7 @@ package org.nanocontainer.persistence; /** - * Factory addComponent used by ExceptionHandler in order to create exceptions. + * Factory component used by ExceptionHandler in order to create exceptions. * * @version $Revision: $ */ Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/DBCPDataSource.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/DBCPDataSource.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/DBCPDataSource.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -20,7 +20,7 @@ import org.picocontainer.Startable; /** - * Commons-DBCP DataSource addComponent implementation. It has failover support. + * Commons-DBCP DataSource component implementation. It has failover support. * * @author Juze Peleteiro <juze -a-t- intelli -dot- biz> */ @@ -49,7 +49,7 @@ * @param connectionURL The connection url. * @param username The connection username. * @param password The connection password. - * @param jdbcExceptionHandler The ExceptionHandler addComponent instance. + * @param jdbcExceptionHandler The ExceptionHandler component instance. */ public DBCPDataSource(final String driver, final String connectionURL, final String username, final String password, final ExceptionHandler jdbcExceptionHandler) { super(jdbcExceptionHandler); @@ -69,7 +69,7 @@ /** * @param properties DBCP properties. See at @{link http://jakarta.apache.org/commons/dbcp/configuration.html} - * @param jdbcExceptionHandler The ExceptionHandler addComponent instance. + * @param jdbcExceptionHandler The ExceptionHandler component instance. */ public DBCPDataSource(final Properties properties, final ExceptionHandler jdbcExceptionHandler) { super(jdbcExceptionHandler); Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/FailoverDataSourceConnection.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/FailoverDataSourceConnection.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/FailoverDataSourceConnection.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,7 +18,7 @@ import org.picocontainer.Startable; /** - * Connection addComponent implementation which obtains a connection instance using a injected datasource. It has failover + * Connection component implementation which obtains a connection instance using a injected datasource. It has failover * support. * * @author Juze Peleteiro <juze -a-t- intelli -dot- biz> Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/JNDIDataSource.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/JNDIDataSource.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/JNDIDataSource.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -37,7 +37,7 @@ /** * @param name JNDI name where the original DataSource is. - * @param jdbcExceptionHandler The ExceptionHandler addComponent instance. + * @param jdbcExceptionHandler The ExceptionHandler component instance. */ public JNDIDataSource(final String name, final ExceptionHandler jdbcExceptionHandler) { super(jdbcExceptionHandler); @@ -57,7 +57,7 @@ /** * @param name JNDI name where the original DataSource is. * @param context JNDI context. - * @param jdbcExceptionHandler The ExceptionHandler addComponent instance. + * @param jdbcExceptionHandler The ExceptionHandler component instance. */ public JNDIDataSource(final String name, final Context context, final ExceptionHandler jdbcExceptionHandler) { super(jdbcExceptionHandler); Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/FailoverSessionDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/FailoverSessionDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/FailoverSessionDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -40,7 +40,7 @@ /** * @param sessionFactory session factory to obtain session from - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, ExceptionHandler exceptionHandler) { super(exceptionHandler); @@ -59,7 +59,7 @@ /** * @param sessionFactory sessionf actory to obtain session from * @param interceptor interceptor to use with created session - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, Interceptor interceptor, ExceptionHandler exceptionHandler) { this(sessionFactory, exceptionHandler); Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionComponent.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionComponent.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionComponent.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -31,7 +31,7 @@ import org.picocontainer.Startable; /** - * Session addComponent with failover behaviour in case of hibernate exception. Old session is disposed + * Session component with failover behaviour in case of hibernate exception. Old session is disposed * and new one is obtained transparently. Session creation is done lazily. * * @author Jose Peleteiro <juzepeleteiro-lziC5CizQUOpwFb5G8XvHQ@xxxxxxxxxxxxxxxx> Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionFactoryDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionFactoryDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionFactoryDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -32,7 +32,7 @@ /** * Delegates everything to session factory obtained from confiuration. this class is necessary - * because addComponent adapters are really ugly when it comes to scripting. + * because component adapters are really ugly when it comes to scripting. * * @version $Id: SessionFactoryDelegator.java 2158 2005-07-08 02:13:36Z juze $ */ Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/FailoverSessionDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/FailoverSessionDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/FailoverSessionDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -39,7 +39,7 @@ /** * @param sessionFactory session factory to obtain session from - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, HibernateExceptionHandler exceptionHandler) { super(exceptionHandler); @@ -58,7 +58,7 @@ /** * @param sessionFactory sessionf actory to obtain session from * @param interceptor interceptor to use with created session - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, Interceptor interceptor, HibernateExceptionHandler exceptionHandler) { this(sessionFactory, exceptionHandler); Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -47,7 +47,7 @@ } /** - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public SessionDelegator(HibernateExceptionHandler exceptionHandler) { this.exceptionHandler = exceptionHandler; Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -26,7 +26,7 @@ import org.picocontainer.PicoInitializationException; /** * delegates everything to session factory obtained from confiuration. - * this class is necessary because addComponent adapters are really ugly when + * this class is necessary because component adapters are really ugly when * it comes to scripting * * Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryLifecycle.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryLifecycle.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryLifecycle.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -15,7 +15,7 @@ import org.picocontainer.Startable; /** - * addComponent organising lifecycle for session factory + * component organising lifecycle for session factory * @author Konstanti Pribluda * @version $Revision: 2043 $ */ Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionLifecycle.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionLifecycle.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionLifecycle.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -15,7 +15,7 @@ import org.picocontainer.Startable; /** - * addComponent providing session lifecycle to be registered in container containing session + * component providing session lifecycle to be registered in container containing session * in question * @author Konstantin Pribluda * @version $Revision: 2043 $ Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/FailoverSessionDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/FailoverSessionDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/FailoverSessionDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -40,7 +40,7 @@ /** * @param sessionFactory session factory to obtain session from - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, ExceptionHandler exceptionHandler) { super(exceptionHandler); @@ -59,7 +59,7 @@ /** * @param sessionFactory sessionf actory to obtain session from * @param interceptor interceptor to use with created session - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, Interceptor interceptor, ExceptionHandler exceptionHandler) { this(sessionFactory, exceptionHandler); Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionComponent.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionComponent.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionComponent.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -31,7 +31,7 @@ import org.picocontainer.Startable; /** - * Session addComponent with failover behaviour in case of hibernate exception. Old session is disposed + * Session component with failover behaviour in case of hibernate exception. Old session is disposed * and new one is obtained transparently. Session creation is done lazily. * * @author Jose Peleteiro <juzepeleteiro-lziC5CizQUOpwFb5G8XvHQ@xxxxxxxxxxxxxxxx> Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionFactoryDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionFactoryDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionFactoryDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -29,7 +29,7 @@ /** * Delegates everything to session factory obtained from confiuration. this class is necessary - * because addComponent adapters are really ugly when it comes to scripting. + * because component adapters are really ugly when it comes to scripting. * * @version $Id: SessionFactoryDelegator.java 2158 2005-07-08 02:13:36Z juze $ */ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/ejb/EJBClientAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/ejb/EJBClientAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/ejb/EJBClientAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -36,14 +36,14 @@ /** * {@link ComponentAdapter}, that is able to lookup and instantiate an EJB as client. * <p> - * The default mode for this addAdapter is late binding i.e. the addAdapter returns a proxy object for the requested type as + * The default mode for this adapter is late binding i.e. the adapter returns a proxy object for the requested type as * instance. The lookup for the EJB is started with the first call of the proxy and the stub is created. Any further * call will do the same, if the last call was aborted by a remote exception. With early binding the stub wiill be - * created in the constructor and the initialization of the addAdapter may fail. + * created in the constructor and the initialization of the adapter may fail. * </p> * <p> - * The addAdapter is using internally an own proxy for the stub object. This enables a failover in case of a temporary - * unavailability of the application server providing the EJB. With every call to a methof of the EJB, the addAdapter is + * The adapter is using internally an own proxy for the stub object. This enables a failover in case of a temporary + * unavailability of the application server providing the EJB. With every call to a methof of the EJB, the adapter is * able to reestablish the connection, if the last call had been failed. In this case you might try a call at some * minutes later again, but you should give up after some trials. * </p> @@ -61,7 +61,7 @@ /** * Construct a {@link ComponentAdapter} for an EJB. This constructor implies the home interface follows normal - * naming conventions. The addAdapter will use the default {@link InitialContext} and will also do late binding. + * naming conventions. The adapter will use the default {@link InitialContext} and will also do late binding. * @param name the EJB's JNDI name * @param type the implemented interface of the EJB * @throws ClassNotFoundException if the home interface could not be found Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractConstructingProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractConstructingProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractConstructingProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -28,11 +28,11 @@ public abstract class AbstractConstructingProvider implements DynamicMBeanProvider { /** - * Create a StandardMBean from the addComponent provided by the ComponentAdapter. One of the registered - * {@link MBeanInfoProvider} instances must provide a {@link MBeanInfo} for the addComponent and the registered + * Create a StandardMBean from the component provided by the ComponentAdapter. One of the registered + * {@link MBeanInfoProvider} instances must provide a {@link MBeanInfo} for the component and the registered * {@link ObjectNameFactory} has to provide a proper {@link ObjectName}. * <p> - * Note: An instance of the addComponent is only created, if a management interface is available. + * Note: An instance of the component is only created, if a management interface is available. * </p> * @see org.nanocontainer.remoting.jmx.DynamicMBeanProvider#provide(org.picocontainer.PicoContainer, * org.picocontainer.ComponentAdapter) @@ -64,7 +64,7 @@ return new JMXRegistrationInfo(objectName, mBean); } } catch (final MalformedObjectNameException e) { - throw new JMXRegistrationException("Cannot create ObjectName for addComponent '" + throw new JMXRegistrationException("Cannot create ObjectName for component '" + componentAdapter.getComponentKey() + "'", e); } @@ -91,7 +91,7 @@ protected abstract MBeanInfoProvider[] getMBeanInfoProviders(); /** - * Determin the management interface from the addComponent implementation type and an optional MBeanInfo instance. + * Determin the management interface from the component implementation type and an optional MBeanInfo instance. * @param implementation The type of the addComponent's implementation. * @param mBeanInfo The {@link MBeanInfo} to expose the addComponent. May be <code>null</code>. * @return Returns the management interface. Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractNamingConventionMBeanInfoProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractNamingConventionMBeanInfoProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractNamingConventionMBeanInfoProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,7 +24,7 @@ public abstract class AbstractNamingConventionMBeanInfoProvider implements MBeanInfoProvider { /** - * Locate a MBeanInfo as addComponent in a PicoContainer. If no addComponent is registered using the name of the MBeanInfo + * Locate a MBeanInfo as component in a PicoContainer. If no component is registered using the name of the MBeanInfo * as key, the method turns the name into a type and searches again. * @param mBeanInfoName The name of the {@link MBeanInfo} used as key. * @param picoContainer The {@link PicoContainer} used for the lookup. Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentKeyConventionMBeanInfoProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentKeyConventionMBeanInfoProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentKeyConventionMBeanInfoProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -25,7 +25,7 @@ public class ComponentKeyConventionMBeanInfoProvider extends AbstractNamingConventionMBeanInfoProvider { /** - * Use the key of the addComponent to search for a MBeanInfo in the PicoContainer. The matching MBeanInfo must be + * Use the key of the component to search for a MBeanInfo in the PicoContainer. The matching MBeanInfo must be * stored in the PicoContainer. The key of the MBeanInfo follows the naming scheme * "<ComponentKey>MBeanInfo". The the addComponent's key is a type, the class name is used as prefix * otherwise the string representation of the key. The key part may already end with "MBean" as it would Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentTypeConventionMBeanInfoProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentTypeConventionMBeanInfoProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentTypeConventionMBeanInfoProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,14 +18,14 @@ /** * A MBeanInfoProvider that searches for a MBeanInfo instance in the PicoContainer. The key of the MBeanInfo is - * calculated from the addComponent type following naming conventions. + * calculated from the component type following naming conventions. * @author Jörg Schaible * @since 1.0 */ public class ComponentTypeConventionMBeanInfoProvider extends AbstractNamingConventionMBeanInfoProvider { /** - * Use the key of the addComponent to search for a MBeanInfo in the PicoContainer. The matching MBeanInfo must be + * Use the key of the component to search for a MBeanInfo in the PicoContainer. The matching MBeanInfo must be * stored in the PicoContainer. The key of the MBeanInfo follows the naming scheme * "<ComponentKey>MBeanInfo". The the addComponent's key is a type, the class name is used as prefix * otherwise the string representation of the key. The key part may already end with "MBean" as it would Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanComponentProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanComponentProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanComponentProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -19,7 +19,7 @@ /** - * DynamicMBeanProvider, that will provide a addComponent directly if it is already a {@link DynamicMBean}. + * DynamicMBeanProvider, that will provide a component directly if it is already a {@link DynamicMBean}. * @author Jörg Schaible * @since 1.0 */ @@ -47,7 +47,7 @@ } /** - * Provide the addComponent itself as {@link DynamicMBean} if it is one and if an {@link ObjectName} can be created. + * Provide the component itself as {@link DynamicMBean} if it is one and if an {@link ObjectName} can be created. * @see org.nanocontainer.remoting.jmx.DynamicMBeanProvider#provide(org.picocontainer.PicoContainer, * org.picocontainer.ComponentAdapter) */ @@ -60,7 +60,7 @@ return new JMXRegistrationInfo(objectName, mBean); } } catch (final MalformedObjectNameException e) { - throw new JMXRegistrationException("Cannot create ObjectName for addComponent '" + throw new JMXRegistrationException("Cannot create ObjectName for component '" + componentAdapter.getComponentKey() + "'", e); } Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,7 +24,7 @@ public interface DynamicMBeanProvider { /** - * Provide a {@link DynamicMBean} from the addComponent delivered by the ComponentAdapter. + * Provide a {@link DynamicMBean} from the component delivered by the ComponentAdapter. * @param picoContainer The {@link PicoContainer} to resolve dependencies. * @param componentAdapter The {@link ComponentAdapter} referring the addComponent. * @return Returns the registration information. Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -28,7 +28,7 @@ /** - * {@link ComponentAdapter} that is exposing a addComponent as MBean in a MBeanServer. + * {@link ComponentAdapter} that is exposing a component as MBean in a MBeanServer. * @author Jörg Schaible * @since 1.0 */ @@ -42,7 +42,7 @@ * Construct a JMXExposingComponentAdapter. * @param delegate The delegated {@link ComponentAdapter}. * @param mBeanServer The {@link MBeanServer} used for registering the MBean. - * @param providers An array with providers for converting the addComponent instance into a + * @param providers An array with providers for converting the component instance into a * {@link javax.management.DynamicMBean}. * @throws NullPointerException Thrown if the {@link MBeanServer} or the array with the {@link DynamicMBeanProvider} * instances is null. @@ -61,7 +61,7 @@ /** * Construct a JMXExposingComponentAdapter. This instance uses a {@link DynamicMBeanComponentProvider} as default to - * register any addComponent instance in the {@link MBeanServer}, that is already a + * register any component instance in the {@link MBeanServer}, that is already a * {@link javax.management.DynamicMBean}. * @param delegate The delegated {@link ComponentAdapter}. * @param mBeanServer The {@link MBeanServer} used for registering the MBean. @@ -75,11 +75,11 @@ } /** - * Retrieve the addComponent instance. The implementation will automatically register it in the {@link MBeanServer}, + * Retrieve the component instance. The implementation will automatically register it in the {@link MBeanServer}, * if a provider can return a {@link javax.management.DynamicMBean} for it. * <p> * Note, that you will have to wrap this {@link ComponentAdapter} with a {@link CachingBehavior} to avoid - * the registration of the same addComponent again. + * the registration of the same component again. * </p> * @throws PicoInitializationException Thrown by the delegate or if the registering of the * {@link javax.management.DynamicMBean} in the {@link MBeanServer } fails. Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -36,7 +36,7 @@ /** * Construct a JMXExposingComponentAdapterFactory. * @param mBeanServer The {@link MBeanServer} used for registering the MBean. - * @param providers An array with providers for converting the addComponent instance into a + * @param providers An array with providers for converting the component instance into a * {@link javax.management.DynamicMBean}. * @throws NullPointerException Thrown if the {@link MBeanServer} or the array with the {@link DynamicMBeanProvider} * instances is null. @@ -54,7 +54,7 @@ /** * Construct a JMXExposingComponentAdapterFactory. This instance uses a {@link DynamicMBeanComponentProvider} as - * default to register any addComponent instance in the {@link MBeanServer}, that is already a + * default to register any component instance in the {@link MBeanServer}, that is already a * {@link javax.management.DynamicMBean}. * @param mBeanServer The {@link MBeanServer} used for registering the MBean. * @throws NullPointerException Thrown if the {@link MBeanServer} or the array with the {@link DynamicMBeanProvider} Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXRegistrationException.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXRegistrationException.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXRegistrationException.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -14,7 +14,7 @@ /** - * A registration exception caused trying to register the addComponent with JMX. + * A registration exception caused trying to register the component with JMX. * @author Michael Ward * @version $Revision$ */ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXVisitor.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXVisitor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXVisitor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -40,7 +40,7 @@ private PicoContainer picoContainer; /** - * Construct a JMXVisitor. This instance will register by default any addComponent in the {@link MBeanServer}, that is + * Construct a JMXVisitor. This instance will register by default any component in the {@link MBeanServer}, that is * already a {@link DynamicMBean}. The {@link ObjectName} will use the default domain of the MBeanServer and has a * <em>type</em> key with the class name (without package name) as value. * @param server The {@link MBeanServer}to use for registering the MBeans. @@ -95,7 +95,7 @@ } /** - * Register the addComponent as MBean. The implementation uses the known DynamicMBeanProvider instances to get the + * Register the component as MBean. The implementation uses the known DynamicMBeanProvider instances to get the * MBean from the addComponent. * @see org.picocontainer.PicoVisitor#visitComponentAdapter(org.picocontainer.ComponentAdapter) */ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ObjectNameFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ObjectNameFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ObjectNameFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,7 +24,7 @@ /** * Create an ObjectName. - * @param key The key of the addComponent within PicoContainer. + * @param key The key of the component within PicoContainer. * @param mBean The instance of the DynamicMBean. * @return Returns the Object Name for the DynamicMBean. * @throws MalformedObjectNameException Thrown for an invalid part in the {@link ObjectName}. Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/PredefinedObjectNameFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/PredefinedObjectNameFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/PredefinedObjectNameFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -15,7 +15,7 @@ /** - * An ObjectNameFactory, that uses the key of the Pico addComponent as {@link ObjectName}, if the key is of this type. + * An ObjectNameFactory, that uses the key of the Pico component as {@link ObjectName}, if the key is of this type. * @author Jörg Schaible * @since 1.0 */ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/RegisteredMBeanConstructingProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/RegisteredMBeanConstructingProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/RegisteredMBeanConstructingProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -51,7 +51,7 @@ /** * Provide a DynamicMBean for the given Pico addComponent. The implementation will lookup the addComponent's key in the * internal registry. Only components that were registered with additional information will be considered and a - * {@link DynamicMBean} will be created for them using the {@link DynamicMBeanFactory}. If the addComponent key is of + * {@link DynamicMBean} will be created for them using the {@link DynamicMBeanFactory}. If the component key is of * type class, it is used as management interface. * @see org.nanocontainer.remoting.jmx.DynamicMBeanProvider#provide(PicoContainer, ComponentAdapter) */ @@ -73,7 +73,7 @@ } /** - * Register a specific Pico addComponent by key with an MBeanInfo and an ObjectName. + * Register a specific Pico component by key with an MBeanInfo and an ObjectName. * @param componentKey The key of the Pico addComponent. * @param objectName The {@link ObjectName} of the MBean. * @param management The management interface. @@ -85,7 +85,7 @@ } /** - * Register a specific Pico addComponent by key with an MBeanInfo and an ObjectName. + * Register a specific Pico component by key with an MBeanInfo and an ObjectName. * @param componentKey The key of the Pico addComponent. * @param objectName The {@link ObjectName} of the MBean. * @param mBeanInfo The {@link MBeanInfo} of the MBean. @@ -95,7 +95,7 @@ } /** - * Register a specific Pico addComponent with an MBeanInfo and an ObjectName. The implementation class of the + * Register a specific Pico component with an MBeanInfo and an ObjectName. The implementation class of the * {@link DynamicMBean} must be the key of the Pico addComponent. * @param objectName The {@link ObjectName} of the MBean. * @param mBeanInfo The {@link MBeanInfo} of the MBean. @@ -109,7 +109,7 @@ } /** - * Register a specific Pico addComponent by key with an ObjectName. + * Register a specific Pico component by key with an ObjectName. * @param componentKey The key of the Pico addComponent. * @param objectName The {@link ObjectName} of the MBean. */ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/StandardMBeanFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/StandardMBeanFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/StandardMBeanFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -26,7 +26,7 @@ /** * A factory for DynamicMBeans, that creates MBean instances using the classes {@link StandardMBean} and * {@link ModelMBean} provided by the JMX specification. The implementation offers special support for StandardMBeans - * following the naming convention for their management interface using the class name of the addComponent with an appended + * following the naming convention for their management interface using the class name of the component with an appended * <em>MBean</em>. * @author Michael Ward * @author Jörg Schaible Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/mx4j/MX4JDynamicMBeanFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/mx4j/MX4JDynamicMBeanFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/mx4j/MX4JDynamicMBeanFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -19,7 +19,7 @@ /** * This is the a factory for creating DynamicMBean instances. However it is tied specifically to MX4J. Those not * interested in being dependent on MX4J should implement another Factory and register it to the container. The single - * difference to the StandardMBeanFactory is, that it does not need a special management interface for a addComponent to + * difference to the StandardMBeanFactory is, that it does not need a special management interface for a component to * expose. * @author Michael Ward * @version $Revision$ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/testmodel/PersonMBeanDescription.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/testmodel/PersonMBeanDescription.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/testmodel/PersonMBeanDescription.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -19,7 +19,7 @@ /** * MBean description used automatically for StandardMBeans by MX4J. Note: This will only work if MX4J provides * javax.management.StandardMBean. With J2SE 5 you will always use the classes from the JDK and therefore the mechanism - * fails. The addComponent will still be exposed as bean, but no description for the exposed parts will be available. + * fails. The component will still be exposed as bean, but no description for the exposed parts will be available. * @author Jörg Schaible */ public final class PersonMBeanDescription extends MBeanDescriptionAdapter { Modified: java/sandbox/baby-steps/nanoextras2/tools/tools/src/java/org/nanocontainer/tools/ant/Component.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/tools/tools/src/java/org/nanocontainer/tools/ant/Component.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/tools/tools/src/java/org/nanocontainer/tools/ant/Component.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -17,7 +17,7 @@ /** * Instantiated by ant when the PicoContainer task element has a <addComponent> - * element. Holds class name of the addComponent and additional properties. + * element. Holds class name of the component and additional properties. * * @author Aslak Hellesøy * @version $Revision$ Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/BeanPropertyComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/BeanPropertyComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/BeanPropertyComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,13 +24,13 @@ import org.picocontainer.behaviors.CachingBehavior; /** - * Decorating addComponent addAdapter that can be used to set additional properties - * on a addComponent in a bean style. These properties must be managed manually + * Decorating component adapter that can be used to set additional properties + * on a component in a bean style. These properties must be managed manually * by the user of the API, and will not be managed by PicoContainer. This class * is therefore <em>not</em> the same as {@link SetterInjector}, * which is a true Setter Injection addAdapter. * <p/> - * This addAdapter is mostly handy for setting various primitive properties via setters; + * This adapter is mostly handy for setting various primitive properties via setters; * it is also able to set javabean properties by discovering an appropriate * {@link PropertyEditor} and using its <code>setAsText</code> method. * <p/> @@ -58,9 +58,9 @@ } /** - * Get a addComponent instance and set given property values. + * Get a component instance and set given property values. * - * @return the addComponent instance with any properties of the properties map set. + * @return the component instance with any properties of the properties map set. * @throws PicoInitializationException {@inheritDoc} * @throws PicoIntrospectionException {@inheritDoc} * @throws org.picocontainer.PicoRegistrationException @@ -149,8 +149,8 @@ if (result == null) { - // check if the propertyValue is a key of a addComponent in the container - // if so, the typeName of the addComponent and the setters parameter typeName + // check if the propertyValue is a key of a component in the container + // if so, the typeName of the component and the setters parameter typeName // have to be compatible // TODO: null check only because of test-case, otherwise null is impossible @@ -235,12 +235,12 @@ /** * Converts and validates the given property value to an appropriate object * for calling the bean's setter. - * @param propertyName String the property name on the addComponent that + * @param propertyName String the property name on the component that * we will be setting the value to. * @param propertyValue Object the property value that we've been given. It * may need conversion to be formed into the value we need for the - * addComponent instance setter. - * @param componentInstance the addComponent that we're looking to provide + * component instance setter. + * @param componentInstance the component that we're looking to provide * the setter to. * @return Object: the final converted object that can * be used in the setter. Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -10,8 +10,8 @@ import org.picocontainer.behaviors.CachingBehavior; /** - * A addComponent addAdapter is responsible for providing a specific addComponent instance. An instance of an implementation of - * this interface is used inside a {@link PicoContainer} for every registered addComponent or instance. Each + * A component adapter is responsible for providing a specific component instance. An instance of an implementation of + * this interface is used inside a {@link PicoContainer} for every registered component or instance. Each * <code>ComponentAdapter</code> instance has to have a key which is unique within that container. The key itself is * either a class type (normally an interface) or an identifier. * @@ -41,21 +41,21 @@ Class<T> getComponentImplementation(); /** - * Retrieve the addComponent instance. This method will usually create a new instance each time it is called, but that + * Retrieve the component instance. This method will usually create a new instance each time it is called, but that * is not required. For example, {@link CachingBehavior} will always return the * same instance. * * @param container the {@link PicoContainer}, that is used to resolve any possible dependencies of the instance. - * @return the addComponent instance. - * @throws PicoInitializationException if the addComponent could not be instantiated. - * @throws PicoIntrospectionException if the addComponent has dependencies which could not be resolved, or - * instantiation of the addComponent lead to an ambigous situation within the + * @return the component instance. + * @throws PicoInitializationException if the component could not be instantiated. + * @throws PicoIntrospectionException if the component has dependencies which could not be resolved, or + * instantiation of the component lead to an ambigous situation within the * container. */ T getComponentInstance(PicoContainer container) throws PicoInitializationException, PicoIntrospectionException; /** - * Verify that all dependencies for this addAdapter can be satisifed. Normally, the addAdapter should verify this by + * Verify that all dependencies for this adapter can be satisifed. Normally, the adapter should verify this by * checking that the associated PicoContainer contains all the needed dependnecies. * * @param container the {@link PicoContainer}, that is used to resolve any possible dependencies of the instance. Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,7 +18,7 @@ /** * <p/> - * A addComponent addAdapter factory is responsible for creating + * A component adapter factory is responsible for creating * {@link ComponentAdapter} component adapters. The main use of the component adapter factory is * inside {@link DefaultPicoContainer#DefaultPicoContainer(ComponentFactory)}, where it can * be used to customize the default component adapter that is used when none is specified @@ -32,7 +32,7 @@ public interface ComponentFactory { /** - * Create a new addComponent addAdapter based on the specified arguments. + * Create a new component adapter based on the specified arguments. * * @param componentMonitor * @param lifecycleStrategy @@ -43,10 +43,10 @@ * This value should be returned from a call to * {@link org.picocontainer.ComponentAdapter#getComponentImplementation()} on the created addAdapter. Should not * be null. - * @param parameters additional parameters to use by the addComponent addAdapter in constructing - * addComponent instances. These may be used, for example, to make decisions about the - * arguments passed into the addComponent constructor. These should be considered hints; they - * may be ignored by some implementations. May be null, and may be of zero length. @return a new addComponent addAdapter based on the specified arguments. Should not return null. @throws PicoIntrospectionException if the creation of the addComponent addAdapter results in a + * @param parameters additional parameters to use by the component adapter in constructing + * component instances. These may be used, for example, to make decisions about the + * arguments passed into the component constructor. These should be considered hints; they + * may be ignored by some implementations. May be null, and may be of zero length. @return a new component adapter based on the specified arguments. Should not return null. @throws PicoIntrospectionException if the creation of the component adapter results in a * {@link PicoIntrospectionException}. * @return The component adapter * @throws org.picocontainer.PicoRegistrationException Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitor.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -14,7 +14,7 @@ import java.lang.reflect.Method; /** - * A addComponent monitor is responsible for monitoring the addComponent instantiation + * A component monitor is responsible for monitoring the component instantiation * and method invocation. * * @author Paul Hammant @@ -27,18 +27,18 @@ public interface ComponentMonitor { /** - * Event thrown as the addComponent is being instantiated using the given constructor + * Event thrown as the component is being instantiated using the given constructor * * @param constructor the Constructor used to instantiate the addComponent */ void instantiating(Constructor constructor); /** - * Event thrown after the addComponent has been instantiated using the given constructor. + * Event thrown after the component has been instantiated using the given constructor. * This should be called for both Constructor and Setter DI. * * @param constructor the Constructor used to instantiate the addComponent - * @param instantiated the addComponent that was instantiated by PicoContainer + * @param instantiated the component that was instantiated by PicoContainer * @param injected the components during instantiation. * @param duration the duration in millis of the instantiation * @since 1.3 @@ -47,7 +47,7 @@ void instantiated(Constructor constructor, Object instantiated, Object[] injected, long duration); /** - * Event thrown if the addComponent instantiation failed using the given constructor + * Event thrown if the component instantiation failed using the given constructor * * @param constructor the Constructor used to instantiate the addComponent * @param cause the Exception detailing the cause of the failure @@ -55,27 +55,27 @@ void instantiationFailed(Constructor constructor, Exception cause); /** - * Event thrown as the addComponent method is being invoked on the given instance + * Event thrown as the component method is being invoked on the given instance * - * @param method the Method invoked on the addComponent instance - * @param instance the addComponent instance + * @param method the Method invoked on the component instance + * @param instance the component instance */ void invoking(Method method, Object instance); /** - * Event thrown after the addComponent method has been invoked on the given instance + * Event thrown after the component method has been invoked on the given instance * - * @param method the Method invoked on the addComponent instance - * @param instance the addComponent instance + * @param method the Method invoked on the component instance + * @param instance the component instance * @param duration the duration in millis of the invocation */ void invoked(Method method, Object instance, long duration); /** - * Event thrown if the addComponent method invocation failed on the given instance + * Event thrown if the component method invocation failed on the given instance * - * @param method the Method invoked on the addComponent instance - * @param instance the addComponent instance + * @param method the Method invoked on the component instance + * @param instance the component instance * @param cause the Exception detailing the cause of the failure */ void invocationFailed(Method method, Object instance, Exception cause); @@ -84,8 +84,8 @@ * Event thrown if a lifecycle method invocation - start, stop or dispose - * failed on the given instance * - * @param method the lifecycle Method invoked on the addComponent instance - * @param instance the addComponent instance + * @param method the lifecycle Method invoked on the component instance + * @param instance the component instance * @param cause the RuntimeException detailing the cause of the failure */ void lifecycleInvocationFailed(Method method, Object instance, RuntimeException cause); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitorStrategy.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitorStrategy.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitorStrategy.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -14,7 +14,7 @@ * <p> * Interface responsible for changing monitoring strategy. * It may be implemented by {@link org.picocontainer.PicoContainer containers} and - * single {@link org.picocontainer.ComponentAdapter addComponent adapters}. + * single {@link org.picocontainer.ComponentAdapter component adapters}. * The choice of supporting the monitor strategy is left to the * implementers of the container and adapters. * </p> @@ -28,7 +28,7 @@ public interface ComponentMonitorStrategy { /** - * Changes the addComponent monitor used + * Changes the component monitor used * @param monitor the new ComponentMonitor to use */ void changeMonitor(ComponentMonitor monitor); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -102,7 +102,7 @@ * </em> * * @param componentAdapterFactory the factory to use for creation of ComponentAdapters. - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(ComponentFactory componentAdapterFactory, PicoContainer parent) { this(componentAdapterFactory, new StartableLifecycleStrategy(NullComponentMonitor.getInstance()), parent, NullComponentMonitor.getInstance()); @@ -123,7 +123,7 @@ * @param lifecycleStrategy * the lifecylce strategy chosen for regiered * instance (not implementations!) - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(ComponentFactory componentAdapterFactory, LifecycleStrategy lifecycleStrategy, @@ -153,7 +153,7 @@ * custom ComponentMonitor * * @param monitor the ComponentMonitor to use - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(ComponentMonitor monitor, PicoContainer parent) { this(new CachingBehaviorFactory().forThis(new AnyInjectionFactory()), new StartableLifecycleStrategy(monitor), parent, monitor); @@ -165,7 +165,7 @@ * * @param monitor the ComponentMonitor to use * @param lifecycleStrategy the lifecycle strategy to use. - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(ComponentMonitor monitor, LifecycleStrategy lifecycleStrategy, PicoContainer parent) { this(new CachingBehaviorFactory().forThis(new AnyInjectionFactory()), lifecycleStrategy, parent, monitor); @@ -176,7 +176,7 @@ * custom lifecycle strategy * * @param lifecycleStrategy the lifecycle strategy to use. - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(LifecycleStrategy lifecycleStrategy, PicoContainer parent) { this(NullComponentMonitor.getInstance(), lifecycleStrategy, parent); @@ -206,7 +206,7 @@ * Creates a new container with a (caching) {@link AnyInjectionFactory} * and a parent container. * - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(PicoContainer parent) { this(new CachingBehaviorFactory().forThis(new AnyInjectionFactory()), parent); @@ -466,7 +466,7 @@ * The starting of the child container is only attempted if the parent * container start successfully. The child container for which start is attempted * is tracked so that upon stop, only those need to be stopped. - * The lifecycle operation is delegated to the addComponent addAdapter, + * The lifecycle operation is delegated to the component addAdapter, * if it is an instance of {@link LifecycleManager lifecycle manager}. * The actual {@link LifecycleStrategy lifecycle strategy} supported * depends on the concrete implementation of the addAdapter. @@ -495,7 +495,7 @@ * Stop the components of this PicoContainer and all its logical child containers. * The stopping of the child containers is only attempted for those that have been * started, possibly not successfully. - * The lifecycle operation is delegated to the addComponent addAdapter, + * The lifecycle operation is delegated to the component addAdapter, * if it is an instance of {@link LifecycleManager lifecycle manager}. * The actual {@link LifecycleStrategy lifecycle strategy} supported * depends on the concrete implementation of the addAdapter. @@ -534,7 +534,7 @@ /** * Dispose the components of this PicoContainer and all its logical child containers. - * The lifecycle operation is delegated to the addComponent addAdapter, + * The lifecycle operation is delegated to the component addAdapter, * if it is an instance of {@link LifecycleManager lifecycle manager}. * The actual {@link LifecycleStrategy lifecycle strategy} supported * depends on the concrete implementation of the addAdapter. @@ -606,7 +606,7 @@ } /** - * Changes monitor in the ComponentAdapterFactory, the addComponent adapters + * Changes monitor in the ComponentAdapterFactory, the component adapters * and the child containers, if these support a ComponentMonitorStrategy. * {@inheritDoc} */ @@ -628,11 +628,11 @@ } /** - * Returns the first current monitor found in the ComponentAdapterFactory, the addComponent adapters + * Returns the first current monitor found in the ComponentAdapterFactory, the component adapters * and the child containers, if these support a ComponentMonitorStrategy. * {@inheritDoc} * - * @throws PicoIntrospectionException if no addComponent monitor is found in container or its children + * @throws PicoIntrospectionException if no component monitor is found in container or its children */ public ComponentMonitor currentMonitor() { return componentMonitor; @@ -640,9 +640,9 @@ /** * <p> - * Implementation of lifecycle manager which delegates to the container's addComponent adapters. - * The addComponent adapters will be ordered by dependency as registered in the container. - * This LifecycleManager will delegate calls on the lifecycle methods to the addComponent adapters + * Implementation of lifecycle manager which delegates to the container's component adapters. + * The component adapters will be ordered by dependency as registered in the container. + * This LifecycleManager will delegate calls on the lifecycle methods to the component adapters * if these are themselves LifecycleManagers. * </p> * @@ -656,7 +656,7 @@ /** * {@inheritDoc} - * Loops over all addComponent adapters and invokes + * Loops over all component adapters and invokes * start(PicoContainer) method on the ones which are LifecycleManagers */ public void start(PicoContainer node) { @@ -685,7 +685,7 @@ /** * {@inheritDoc} - * Loops over started addComponent adapters (in inverse order) and invokes + * Loops over started component adapters (in inverse order) and invokes * stop(PicoContainer) method on the ones which are LifecycleManagers */ public void stop(PicoContainer node) { @@ -701,7 +701,7 @@ /** * {@inheritDoc} - * Loops over all addComponent adapters (in inverse order) and invokes + * Loops over all component adapters (in inverse order) and invokes * dispose(PicoContainer) method on the ones which are LifecycleManagers */ public void dispose(PicoContainer node) { Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Disposable.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Disposable.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Disposable.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,7 +12,7 @@ /** * An interface which is implemented by components that need to dispose of resources during the shutdown of that * addComponent. The {@link Disposable#dispose()} must be called once during shutdown, directly after {@link - * Startable#stop()} (if the addComponent implements the {@link Startable} interface). + * Startable#stop()} (if the component implements the {@link Startable} interface). * @version $Revision$ * @see org.picocontainer.Startable the Startable interface if you need to <code>start()</code> and * <code>stop()</code> semantics. @@ -22,7 +22,7 @@ */ public interface Disposable { /** - * Dispose this addComponent. The addComponent should deallocate all resources. The contract for this method defines a + * Dispose this addComponent. The component should deallocate all resources. The contract for this method defines a * single call at the end of this addComponent's life. */ void dispose(); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleManager.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleManager.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleManager.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,8 +12,8 @@ /** * A manager for the lifecycle of a container's components. - * The lifecycle manager is implemented by the addComponent adapters - * which will resolve the dependencies of the addComponent instance and + * The lifecycle manager is implemented by the component adapters + * which will resolve the dependencies of the component instance and * delegate the implementation of the lifecycle control to the * {@link LifecycleStrategy lifecycle strategy}. * @@ -45,8 +45,8 @@ void dispose(PicoContainer container); /** - * Test if a container's addComponent has a lifecycle. - * @return <code>true</code> if the addComponent has a lifecycle + * Test if a container's component has a lifecycle. + * @return <code>true</code> if the component has a lifecycle */ boolean hasLifecycle(); } Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleStrategy.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleStrategy.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleStrategy.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -8,9 +8,9 @@ package org.picocontainer; /** - * An interface which specifies the lifecyle strategy on the addComponent instance. - * Lifecycle strategies are used by addComponent adapters to delegate the lifecyle - * operations on the addComponent instances. + * An interface which specifies the lifecyle strategy on the component instance. + * Lifecycle strategies are used by component adapters to delegate the lifecyle + * operations on the component instances. * * @author Paul Hammant * @author Peter Royal @@ -22,34 +22,34 @@ public interface LifecycleStrategy { /** - * Invoke the "start" method on the addComponent instance if this is startable. + * Invoke the "start" method on the component instance if this is startable. * It is up to the implementation of the strategy what "start" and "startable" means. * - * @param component the instance of the addComponent to start + * @param component the instance of the component to start */ void start(Object component); /** - * Invoke the "stop" method on the addComponent instance if this is stoppable. + * Invoke the "stop" method on the component instance if this is stoppable. * It is up to the implementation of the strategy what "stop" and "stoppable" means. * - * @param component the instance of the addComponent to stop + * @param component the instance of the component to stop */ void stop(Object component); /** - * Invoke the "dispose" method on the addComponent instance if this is disposable. + * Invoke the "dispose" method on the component instance if this is disposable. * It is up to the implementation of the strategy what "dispose" and "disposable" means. * - * @param component the instance of the addComponent to dispose + * @param component the instance of the component to dispose */ void dispose(Object component); /** - * Test if a addComponent instance has a lifecycle. + * Test if a component instance has a lifecycle. * @param type the addComponent's type * - * @return <code>true</code> if the addComponent has a lifecycle + * @return <code>true</code> if the component has a lifecycle */ boolean hasLifecycle(Class type); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/MutablePicoContainer.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/MutablePicoContainer.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/MutablePicoContainer.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -23,7 +23,7 @@ public interface MutablePicoContainer extends PicoContainer, Startable, Disposable { /** - * Register a addComponent and creates specific instructions on which constructor to use, along with + * Register a component and creates specific instructions on which constructor to use, along with * which components and/or constants to provide as constructor arguments. These "directives" are * provided through an array of <tt>Parameter</tt> objects. Parameter[0] correspondes to the first constructor * argument, Parameter[N] corresponds to the N+1th constructor argument. @@ -32,10 +32,10 @@ * <li><strong>Partial Autowiring: </strong>If you have two constructor args to match and you only wish to specify one of the constructors and * let PicoContainer wire the other one, you can use as parameters: * <code><strong>new ComponentParameter()</strong>, new ComponentParameter("someService")</code> - * The default constructor for the addComponent parameter indicates auto-wiring should take place for + * The default constructor for the component parameter indicates auto-wiring should take place for * that parameter. * </li> - * <li><strong>Force No-Arg constructor usage:</strong> If you wish to force a addComponent to be constructed with + * <li><strong>Force No-Arg constructor usage:</strong> If you wish to force a component to be constructed with * the no-arg constructor, use a zero length Parameter array. Ex: <code>new Parameter[0]</code> * <ul> * @@ -51,9 +51,9 @@ * * @return the ComponentAdapter that has been associated with this addComponent. In the majority of cases, this return * value can be safely ignored, as one of the <code>getXXX()</code> methods of the - * {@link PicoContainer} interface can be used to retrieve a reference to the addComponent later on. + * {@link PicoContainer} interface can be used to retrieve a reference to the component later on. * - * @throws PicoRegistrationException if registration of the addComponent fails. + * @throws PicoRegistrationException if registration of the component fails. * @see org.picocontainer.Parameter * @see org.picocontainer.parameters.ConstantParameter * @see org.picocontainer.parameters.ComponentParameter @@ -70,37 +70,37 @@ * * @return the ComponentAdapter that has been associated with this addComponent. In the majority of cases, this return * value can be safely ignored, as one of the <code>getXXX()</code> methods of the - * {@link PicoContainer} interface can be used to retrieve a reference to the addComponent later on. + * {@link PicoContainer} interface can be used to retrieve a reference to the component later on. * * @throws PicoRegistrationException if registration fails. */ MutablePicoContainer addComponent(Object implOrInstance); /** - * Register a addComponent via a ComponentAdapter. Use this if you need fine grained control over what + * Register a component via a ComponentAdapter. Use this if you need fine grained control over what * ComponentAdapter to use for a specific addComponent. * * @param componentAdapter the addAdapter * - * @return the same addAdapter that was passed as an argument. + * @return the same adapter that was passed as an argument. * * @throws PicoRegistrationException if registration fails. */ MutablePicoContainer addAdapter(ComponentAdapter componentAdapter); /** - * Unregister a addComponent by key. + * Unregister a component by key. * - * @param componentKey key of the addComponent to unregister. + * @param componentKey key of the component to unregister. * * @return the ComponentAdapter that was associated with this addComponent. */ ComponentAdapter removeComponent(Object componentKey); /** - * Unregister a addComponent by instance. + * Unregister a component by instance. * - * @param componentInstance the addComponent instance to unregister. + * @param componentInstance the component instance to unregister. * * @return the ComponentAdapter that was associated with this addComponent. */ @@ -145,7 +145,7 @@ boolean removeChildContainer(PicoContainer child); /** - * Following an addAdapter or addComponent, pico holds onto the last ComponentAdapter and return it if this + * Following an adapter or addComponent, pico holds onto the last ComponentAdapter and return it if this * method is immediately after the add operation. It will be null at all other times. * * @return the last ComponentAdapter to be made Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Parameter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Parameter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Parameter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -42,7 +42,7 @@ * * @return the instance or <code>null</code> if no suitable instance can be found. * - * @throws PicoInitializationException if a referenced addComponent could not be instantiated. + * @throws PicoInitializationException if a referenced component could not be instantiated. * @since 1.1 */ Object resolveInstance(PicoContainer container, @@ -58,7 +58,7 @@ * @param expectedType the required type * @param expectedParameterName Expected parameter name * - * @return <code>true</code> if the addComponent parameter can be resolved. + * @return <code>true</code> if the component parameter can be resolved. * * @since 1.1 */ Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoContainer.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoContainer.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoContainer.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -14,7 +14,7 @@ /** - * This is the core interface for PicoContainer. It is used to retrieve addComponent instances from the container; it only + * This is the core interface for PicoContainer. It is used to retrieve component instances from the container; it only * has accessor methods (in addition to the {@link #accept(PicoVisitor)} method). In order to register components in a * PicoContainer, use a {@link MutablePicoContainer}, such as {@link DefaultPicoContainer}. * @@ -29,11 +29,11 @@ public interface PicoContainer { /** - * Retrieve a addComponent instance registered with a specific key or type. If a addComponent cannot be found in this container, + * Retrieve a component instance registered with a specific key or type. If a component cannot be found in this container, * the parent container (if one exists) will be searched. * - * @param componentKeyOrType the key or Type that the addComponent was registered with. - * @return an instantiated addComponent, or <code>null</code> if no addComponent has been registered for the specified + * @param componentKeyOrType the key or Type that the component was registered with. + * @return an instantiated addComponent, or <code>null</code> if no component has been registered for the specified * key. */ Object getComponent(Object componentKeyOrType); @@ -42,11 +42,11 @@ /** - * Retrieve all the registered addComponent instances in the container, (not including those in the parent container). + * Retrieve all the registered component instances in the container, (not including those in the parent container). * The components are returned in their order of instantiation, which depends on the dependency order between them. * * @return all the components. - * @throws PicoException if the instantiation of the addComponent fails + * @throws PicoException if the instantiation of the component fails */ List getComponents(); @@ -58,38 +58,38 @@ PicoContainer getParent(); /** - * Find a addComponent addAdapter associated with the specified key. If a addComponent addAdapter cannot be found in this + * Find a component adapter associated with the specified key. If a component adapter cannot be found in this * container, the parent container (if one exists) will be searched. * - * @param componentKey the key that the addComponent was registered with. - * @return the addComponent addAdapter associated with this key, or <code>null</code> if no addComponent has been + * @param componentKey the key that the component was registered with. + * @return the component adapter associated with this key, or <code>null</code> if no component has been * registered for the specified key. */ ComponentAdapter<?> getComponentAdapter(Object componentKey); /** - * Find a addComponent addAdapter associated with the specified type. If a addComponent addAdapter cannot be found in this + * Find a component adapter associated with the specified type. If a component adapter cannot be found in this * container, the parent container (if one exists) will be searched. * * @param componentType the type of the addComponent. - * @return the addComponent addAdapter associated with this class, or <code>null</code> if no addComponent has been + * @return the component adapter associated with this class, or <code>null</code> if no component has been * registered for the specified key. */ <T> ComponentAdapter<T> getComponentAdapter(Class<T> componentType); /** - * Retrieve all the addComponent adapters inside this container. The addComponent adapters from the parent container are + * Retrieve all the component adapters inside this container. The component adapters from the parent container are * not returned. * * @return a collection containing all the {@link ComponentAdapter}s inside this container. The collection will not * be modifiable. - * @see #getComponentAdapters(Class) a variant of this method which returns the addComponent adapters inside this + * @see #getComponentAdapters(Class) a variant of this method which returns the component adapters inside this * container that are associated with the specified type. */ Collection<ComponentAdapter<?>> getComponentAdapters(); /** - * Retrieve all addComponent adapters inside this container that are associated with the specified type. The addComponent + * Retrieve all component adapters inside this container that are associated with the specified type. The addComponent * adapters from the parent container are not returned. * * @param componentType the type of the components. @@ -104,13 +104,13 @@ * * @param componentType the searched type. * @return a List of components. - * @throws PicoException if the instantiation of a addComponent fails + * @throws PicoException if the instantiation of a component fails * @since 1.1 */ <T> List<T> getComponents(Class<T> componentType); /** - * Accepts a visitor that should visit the child containers, addComponent adapters and addComponent instances. + * Accepts a visitor that should visit the child containers, component adapters and component instances. * * @param visitor the visitor * @since 1.1 Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoRegistrationException.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoRegistrationException.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoRegistrationException.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,8 +11,8 @@ package org.picocontainer; /** - * Subclass of {@link PicoException} that is thrown when there is a problem registering a addComponent with the container - * or another part of the PicoContainer API, for example, when a request for a addComponent is ambiguous. + * Subclass of {@link PicoException} that is thrown when there is a problem registering a component with the container + * or another part of the PicoContainer API, for example, when a request for a component is ambiguous. * * @version $Revision$ * @since 1.0 Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Startable.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Startable.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Startable.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,9 +12,9 @@ /** * <p>An interface which is implemented by components that can be started and stopped. The {@link Startable#start()} - * must be called at the begin of the addComponent lifecycle. It can be called again only after a call to - * {@link Startable#stop()}. The {@link Startable#stop()} method must be called at the end of the addComponent lifecycle, - * and can further be called after every {@link Startable#start()}. If a addComponent implements the {@link Disposable} + * must be called at the begin of the component lifecycle. It can be called again only after a call to + * {@link Startable#stop()}. The {@link Startable#stop()} method must be called at the end of the component lifecycle, + * and can further be called after every {@link Startable#start()}. If a component implements the {@link Disposable} * interface as well, {@link Startable#stop()} should be called before {@link Disposable#dispose()}.</p> * <p/> * <p>For more advanced and pluggable lifecycle support, see the functionality offered by picocontainer-gems Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/AbstractAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/AbstractAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/AbstractAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -21,7 +21,7 @@ /** * Base class for a ComponentAdapter with general functionality. * This implementation provides basic checks for a healthy implementation of a ComponentAdapter. - * It does not allow to use <code>null</code> for the addComponent key or the implementation, + * It does not allow to use <code>null</code> for the component key or the implementation, * ensures that the implementation is a concrete class and that the key is assignable from the * implementation if the key represents a type. * Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/InstanceAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/InstanceAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/InstanceAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,13 +18,13 @@ /** * <p> - * Component addAdapter which wraps a addComponent instance. + * Component adapter which wraps a component instance. * </p> * <p> - * This addComponent addAdapter supports both a {@link LifecycleManager LifecycleManager} and a + * This component adapter supports both a {@link LifecycleManager LifecycleManager} and a * {@link org.picocontainer.LifecycleStrategy LifecycleStrategy} to control the lifecycle of the addComponent. * The lifecycle manager methods simply delegate to the lifecycle strategy methods - * on the addComponent instance. + * on the component instance. * </p> * * @author Aslak Hellesøy Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,15 +24,15 @@ /** * <p> - * Component addAdapter which decorates another addAdapter. + * Component adapter which decorates another addAdapter. * </p> * <p> - * This addAdapter supports a {@link org.picocontainer.ComponentMonitorStrategy addComponent monitor strategy} + * This adapter supports a {@link org.picocontainer.ComponentMonitorStrategy component monitor strategy} * and will propagate change of monitor to the delegate if the delegate itself * support the monitor strategy. * </p> * <p> - * This addAdapter also supports a {@link LifecycleManager lifecycle manager} and a + * This adapter also supports a {@link LifecycleManager lifecycle manager} and a * {@link org.picocontainer.LifecycleStrategy lifecycle strategy} if the delegate does. * </p> * @@ -77,7 +77,7 @@ /** * Delegates change of monitor if the delegate supports - * a addComponent monitor strategy. + * a component monitor strategy. * {@inheritDoc} */ public void changeMonitor(ComponentMonitor monitor) { @@ -88,15 +88,15 @@ /** * Returns delegate's current monitor if the delegate supports - * a addComponent monitor strategy. + * a component monitor strategy. * {@inheritDoc} - * @throws PicoIntrospectionException if no addComponent monitor is found in delegate + * @throws PicoIntrospectionException if no component monitor is found in delegate */ public ComponentMonitor currentMonitor() { if ( delegate instanceof ComponentMonitorStrategy ){ return ((ComponentMonitorStrategy)delegate).currentMonitor(); } - throw new PicoIntrospectionException("No addComponent monitor found in delegate"); + throw new PicoIntrospectionException("No component monitor found in delegate"); } // ~~~~~~~~ LifecylceManager ~~~~~~~~ Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/CachingBehavior.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/CachingBehavior.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/CachingBehavior.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,11 +24,11 @@ /** * <p> - * {@link ComponentAdapter} implementation that caches the addComponent instance. + * {@link ComponentAdapter} implementation that caches the component instance. * </p> * <p> * This adapter supports components with a lifecycle, as it is a {@link LifecycleManager lifecycle manager} - * which will apply the delegate's {@link org.picocontainer.LifecycleStrategy lifecycle strategy} to the cached addComponent instance. + * which will apply the delegate's {@link org.picocontainer.LifecycleStrategy lifecycle strategy} to the cached component instance. * The lifecycle state is maintained so that the component instance behaves in the expected way: * it can't be started if already started, it can't be started or stopped if disposed, it can't * be stopped if not started, it can't be disposed if already disposed. @@ -69,7 +69,7 @@ /** * Flushes the cache. - * If the addComponent instance is started is will stop and dispose it before + * If the component instance is started is will stop and dispose it before * flushing the cache. */ public void flush() { @@ -82,7 +82,7 @@ } /** - * Starts the cached addComponent instance + * Starts the cached component instance * {@inheritDoc} */ public void start(PicoContainer container) { @@ -95,7 +95,7 @@ } /** - * Stops the cached addComponent instance + * Stops the cached component instance * {@inheritDoc} */ public void stop(PicoContainer container) { @@ -108,7 +108,7 @@ } /** - * Disposes the cached addComponent instance + * Disposes the cached component instance * {@inheritDoc} */ public void dispose(PicoContainer container) { Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/ImplementationHidingBehavior.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/ImplementationHidingBehavior.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/ImplementationHidingBehavior.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -23,7 +23,7 @@ import org.picocontainer.behaviors.AbstractBehavior; /** - * This addComponent addAdapter makes it possible to hide the implementation + * This component adapter makes it possible to hide the implementation * of a real subject (behind a proxy) provided the key is an interface. * <p/> * This class exists here, because a) it has no deps on external jars, b) dynamic proxy is quite easy. @@ -38,7 +38,7 @@ /** * Creates an ImplementationHidingComponentAdapter with a delegate - * @param delegate the addComponent addAdapter to which this addAdapter delegates + * @param delegate the component adapter to which this adapter delegates */ public ImplementationHidingBehavior(ComponentAdapter delegate) { super(delegate); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AbstractInjector.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AbstractInjector.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AbstractInjector.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -59,7 +59,7 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this ComponentAdapter + * @param monitor the component monitor used by this ComponentAdapter * @param lifecycleStrategy the lifecycle strategy used by this ComponentAdapter * @throws org.picocontainer.injectors.AbstractInjector.NotConcreteRegistrationException if the implementation is not a concrete class * @throws NullPointerException if one of the parameters is <code>null</code> @@ -84,7 +84,7 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this ComponentAdapter + * @param monitor the component monitor used by this ComponentAdapter * @throws org.picocontainer.injectors.AbstractInjector.NotConcreteRegistrationException if the implementation is not a concrete class * @throws NullPointerException if one of the parameters is <code>null</code> */ @@ -107,7 +107,7 @@ } private void checkConcrete() throws NotConcreteRegistrationException { - // Assert that the addComponent class is concrete. + // Assert that the component class is concrete. boolean isAbstract = (getComponentImplementation().getModifiers() & Modifier.ABSTRACT) == Modifier.ABSTRACT; if (getComponentImplementation().isInterface() || isAbstract) { throw new NotConcreteRegistrationException(getComponentImplementation()); @@ -286,7 +286,7 @@ /** - * Construct a new exception with the ambigous class type and the ambiguous addComponent keys. + * Construct a new exception with the ambigous class type and the ambiguous component keys. * * @param ambiguousDependency the unresolved dependency type * @param componentKeys the ambiguous keys. @@ -313,7 +313,7 @@ } /** - * @return Returns the ambiguous addComponent keys as array. + * @return Returns the ambiguous component keys as array. */ public Object[] getAmbiguousComponentKeys() { return ambiguousComponentKeys; Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AnnotationInjectionFactory.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AnnotationInjectionFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AnnotationInjectionFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -39,7 +39,7 @@ * @param componentCharacteristic * @param componentKey The addComponent's key * @param componentImplementation The class of the bean. - * @param parameters Any parameters for the setters. If null the addAdapter solves the + * @param parameters Any parameters for the setters. If null the adapter solves the * dependencies for all setters internally. Otherwise the number parameters must match * the number of the setter. @return Returns a new {@link SetterInjector}. @throws org.picocontainer.PicoIntrospectionException if dependencies cannot be solved * @throws org.picocontainer.PicoRegistrationException Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/ConstructorInjector.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/ConstructorInjector.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/ConstructorInjector.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -62,8 +62,8 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this addAdapter - * @param lifecycleStrategy the addComponent lifecycle strategy used by this addAdapter + * @param monitor the component monitor used by this addAdapter + * @param lifecycleStrategy the component lifecycle strategy used by this addAdapter * @throws org.picocontainer.injectors.AbstractInjector.NotConcreteRegistrationException * if the implementation is not a concrete class. * @throws NullPointerException if one of the parameters is <code>null</code> @@ -78,7 +78,7 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this addAdapter + * @param monitor the component monitor used by this addAdapter * @throws NotConcreteRegistrationException * if the implementation is not a concrete class. * @throws NullPointerException if one of the parameters is <code>null</code> Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjectionFactory.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjectionFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjectionFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -39,7 +39,7 @@ * @param componentCharacteristic * @param componentKey The addComponent's key * @param componentImplementation The class of the bean. - * @param parameters Any parameters for the setters. If null the addAdapter solves the + * @param parameters Any parameters for the setters. If null the adapter solves the * dependencies for all setters internally. Otherwise the number parameters must match * the number of the setter. @return Returns a new {@link SetterInjector}. @throws PicoIntrospectionException if dependencies cannot be solved * @throws org.picocontainer.PicoRegistrationException Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjector.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjector.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjector.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -60,8 +60,8 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this addAdapter - * @param lifecycleStrategy the addComponent lifecycle strategy used by this addAdapter + * @param monitor the component monitor used by this addAdapter + * @param lifecycleStrategy the component lifecycle strategy used by this addAdapter * @throws org.picocontainer.injectors.AbstractInjector.NotConcreteRegistrationException * if the implementation is not a concrete class. * @throws NullPointerException if one of the parameters is <code>null</code> @@ -77,7 +77,7 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this addAdapter + * @param monitor the component monitor used by this addAdapter * @throws NotConcreteRegistrationException * if the implementation is not a concrete class. * @throws NullPointerException if one of the parameters is <code>null</code> Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/ReflectionLifecycleStrategy.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/ReflectionLifecycleStrategy.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/ReflectionLifecycleStrategy.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,8 +18,8 @@ /** - * Reflection lifecycle strategy. Starts, stops, disposes of addComponent if appropriate methods are - * present. The addComponent may implement only one of the three methods. + * Reflection lifecycle strategy. Starts, stops, disposes of component if appropriate methods are + * present. The component may implement only one of the three methods. * * @author Paul Hammant * @author Mauro Talevi @@ -99,7 +99,7 @@ } /** - * {@inheritDoc} The addComponent has a lifecylce if at least one of the three methods is present. + * {@inheritDoc} The component has a lifecylce if at least one of the three methods is present. */ public boolean hasLifecycle(Class type) { Method[] methods = init(type); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/StartableLifecycleStrategy.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/StartableLifecycleStrategy.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/StartableLifecycleStrategy.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -15,7 +15,7 @@ import java.lang.reflect.Method; /** - * Startable lifecycle strategy. Starts and stops addComponent if Startable, + * Startable lifecycle strategy. Starts and stops component if Startable, * and disposes it if Disposable. * * @author Mauro Talevi Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/monitors/AbstractComponentMonitor.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/monitors/AbstractComponentMonitor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/monitors/AbstractComponentMonitor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -26,7 +26,7 @@ public final static String INSTANTIATING = "PicoContainer: instantiating {0}"; public final static String INSTANTIATED = "PicoContainer: instantiated {0} [{1} ms]"; - public final static String INSTANTIATED2 = "PicoContainer: instantiated {0} [{1} ms], addComponent {2}, injected [{3}]"; + public final static String INSTANTIATED2 = "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]"; Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/BasicComponentParameter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/BasicComponentParameter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/BasicComponentParameter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -23,11 +23,11 @@ import java.util.Set; /** - * A BasicComponentParameter should be used to pass in a particular addComponent as argument to a + * A BasicComponentParameter should be used to pass in a particular component as argument to a * different addComponent'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 addComponent will give PicoContainer a hint - * about what other addComponent to use in the constructor. This Parameter will never resolve + * ComponentParameter as a parameter when registering a component will give PicoContainer 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. * * @author Jon Tirsén @@ -46,7 +46,7 @@ private Object componentKey; /** - * Expect a parameter matching a addComponent of a specific key. + * Expect a parameter matching a component of a specific key. * * @param componentKey the key of the desired addComponent */ Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/CollectionComponentParameter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/CollectionComponentParameter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/CollectionComponentParameter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -37,7 +37,7 @@ * A CollectionComponentParameter should be used to support inject an {@link Array}, a * {@link Collection}or {@link Map}of components automatically. The collection will contain * all components of a special type and additionally the type of the key may be specified. In - * case of a map, the map's keys are the one of the addComponent addAdapter. + * case of a map, the map's keys are the one of the component addAdapter. * * @author Aslak Hellesøy * @author Jörg Schaible @@ -60,8 +60,8 @@ private final Class componentValueType; /** - * Expect an {@link Array}of an appropriate type as parameter. At least one addComponent of - * the array's addComponent type must exist. + * Expect an {@link Array}of an appropriate type as parameter. At least one component of + * the array's component type must exist. */ public CollectionComponentParameter() { this(false); @@ -222,11 +222,11 @@ } /** - * Evaluate whether the given addComponent addAdapter will be part of the collective type. + * Evaluate whether the given component adapter will be part of the collective type. * * @param adapter a <code>ComponentAdapter</code> value * - * @return <code>true</code> if the addAdapter takes part + * @return <code>true</code> if the adapter takes part */ protected boolean evaluate(final ComponentAdapter adapter) { return adapter != null; // use parameter, prevent compiler warning @@ -240,7 +240,7 @@ * @param keyType the compatible type of the key * @param valueType the compatible type of the addComponent * - * @return a {@link Map} with the ComponentAdapter instances and their addComponent keys as map key. + * @return a {@link Map} with the ComponentAdapter instances and their component keys as map key. */ @SuppressWarnings({ "unchecked" }) protected Map<Object, ComponentAdapter<?>> getMatchingComponentAdapters(PicoContainer container, Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/ComponentParameter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/ComponentParameter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/ComponentParameter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,11 +18,11 @@ /** - * A ComponentParameter should be used to pass in a particular addComponent as argument to a + * A ComponentParameter should be used to pass in a particular component as argument to a * different addComponent'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 addComponent will give PicoContainer a hint - * about what other addComponent to use in the constructor. Collecting parameter types are + * ComponentParameter as a parameter when registering a component will give PicoContainer a hint + * about what other component to use in the constructor. Collecting parameter types are * supported for {@link java.lang.reflect.Array},{@link java.util.Collection}and * {@link java.util.Map}. * @@ -52,7 +52,7 @@ private final Parameter collectionParameter; /** - * Expect a parameter matching a addComponent of a specific key. + * Expect a parameter matching a component of a specific key. * * @param componentKey the key of the desired addComponent */ @@ -69,7 +69,7 @@ /** * Expect any scalar paramter of the appropriate type or an {@link java.lang.reflect.Array}. - * Resolve the parameter even if no compoennt is of the array's addComponent type. + * Resolve the parameter even if no compoennt is of the array's component type. * * @param emptyCollection <code>true</code> allows an Array to be empty * @since 1.1 @@ -97,7 +97,7 @@ * The components in the collection will be of the specified type and their addAdapter's key * must have a particular type. * - * @param componentKeyType the addComponent addAdapter's key type + * @param componentKeyType the component addAdapter's key type * @param componentValueType the addComponent's type (ignored for an Array) * @param emptyCollection <code>true</code> allows the collection to be empty * @since 1.1 Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/visitors/MethodCallingVisitor.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/visitors/MethodCallingVisitor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/visitors/MethodCallingVisitor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -56,7 +56,7 @@ } /** - * Construct a MethodCallingVisitor for standard methods visiting the addComponent in instantiation order. + * Construct a MethodCallingVisitor for standard methods visiting the component in instantiation order. * * @param method the method to invoke * @param ofType the type of the components, that will be invoked Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/DefaultPicoContainerTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/DefaultPicoContainerTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/DefaultPicoContainerTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -222,7 +222,7 @@ }); dpc.addComponent(DefaultPicoContainer.class); dpc.start(); - assertEquals("ComponentMonitor should have been notified that the addComponent had been started", + assertEquals("ComponentMonitor should have been notified that the component had been started", "public abstract void org.picocontainer.Startable.start()", sb.toString()); } Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/adapters/SynchronizedComponentAdapterTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/adapters/SynchronizedComponentAdapterTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/adapters/SynchronizedComponentAdapterTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -135,7 +135,7 @@ runConcurrencyTest(pico); } - // This is overkill - an outer sync addAdapter is enough + // This is overkill - an outer sync adapter is enough public void testSingletonCreationWithSynchronizedAdapterAndDoubleLocking() throws InterruptedException { DefaultPicoContainer pico = new DefaultPicoContainer(); pico.addAdapter(new SynchronizedBehavior(new CachingBehavior(new SynchronizedBehavior(new ConstructorInjector("slow", SlowCtor.class))))); Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/behaviors/BehaviorAdapterTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/behaviors/BehaviorAdapterTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/behaviors/BehaviorAdapterTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -33,7 +33,7 @@ adapter.currentMonitor(); fail("PicoIntrospectionException expected"); } catch (PicoIntrospectionException e) { - assertEquals("No addComponent monitor found in delegate", e.getMessage()); + assertEquals("No component monitor found in delegate", e.getMessage()); } } Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -222,7 +222,7 @@ parent.start(); fail("Thrown " + AbstractInjector.UnsatisfiableDependenciesException.class.getName() + " expected"); } catch ( AbstractInjector.UnsatisfiableDependenciesException e) { - // FiveTriesToBeMalicious can't get instantiated as there is no PicoContainer in any addComponent set + // FiveTriesToBeMalicious can't get instantiated as there is no PicoContainer in any component set } String recording = parent.getComponent("recording").toString(); assertEquals("<One<Two<Three", recording); @@ -230,7 +230,7 @@ child.getComponent(FiveTriesToBeMalicious.class); fail("Thrown " + AbstractInjector.UnsatisfiableDependenciesException.class.getName() + " expected"); } catch (final AbstractInjector.UnsatisfiableDependenciesException e) { - // can't get instantiated as there is no PicoContainer in any addComponent set + // can't get instantiated as there is no PicoContainer in any component set } recording = parent.getComponent("recording").toString(); assertEquals("<One<Two<Three", recording); // still the same Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/doc/advanced/CollectionsTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/doc/advanced/CollectionsTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/doc/advanced/CollectionsTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -111,7 +111,7 @@ pico.addComponent(Cod.class); pico.addComponent(Bowl.class, Bowl.class, new CollectionComponentParameter(Fish.class, false), new CollectionComponentParameter(Cod.class, false)); - // This addComponent will match both arguments of Bowl's constructor + // This component will match both arguments of Bowl's constructor pico.addComponent(new LinkedList()); Bowl bowl = pico.getComponent(Bowl.class); Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -82,7 +82,7 @@ * Prepare the test <em>verifyWithoutDependencyWorks</em>. * * @param picoContainer container, may probably not be used. - * @return a ComponentAdapter of the type to test for a addComponent without dependencies. Registration in the pico is + * @return a ComponentAdapter of the type to test for a component without dependencies. Registration in the pico is * not necessary. */ protected abstract ComponentAdapter prepDEF_verifyWithoutDependencyWorks(MutablePicoContainer picoContainer); @@ -98,7 +98,7 @@ * Prepare the test <em>verifyDoesNotInstantiate</em>. * * @param picoContainer container, may probably not be used. - * @return a ComponentAdapter of the type to test for a addComponent that may throw on instantiation. Registration in + * @return a ComponentAdapter of the type to test for a component that may throw on instantiation. Registration in * the pico is not necessary. */ protected abstract ComponentAdapter prepDEF_verifyDoesNotInstantiate(MutablePicoContainer picoContainer); @@ -332,7 +332,7 @@ * Prepare the test <em>errorIsRethrown</em>. Overload this function, if the ComponentAdapter is instantiating. * * @param picoContainer container, may probably not be used. - * @return a ComponentAdapter of the type to test with a addComponent that fails with an {@link Error} at + * @return a ComponentAdapter of the type to test with a component that fails with an {@link Error} at * instantiation. Registration in the pico is not necessary. */ protected ComponentAdapter prepINS_errorIsRethrown(MutablePicoContainer picoContainer) { @@ -358,7 +358,7 @@ * instantiating. * * @param picoContainer container, may probably not be used. - * @return a ComponentAdapter of the type to test with a addComponent that fails with a {@link RuntimeException} at + * @return a ComponentAdapter of the type to test with a component that fails with a {@link RuntimeException} at * instantiation. Registration in the pico is not necessary. */ protected ComponentAdapter prepINS_runtimeExceptionIsRethrown(MutablePicoContainer picoContainer) { @@ -384,7 +384,7 @@ * this function, if the ComponentAdapter is instantiating. * * @param picoContainer container, may probably not be used. - * @return a ComponentAdapter of the type to test with a addComponent that fails with a + * @return a ComponentAdapter of the type to test with a component that fails with a * {@link PicoInitializationException} at instantiation. Registration in the pico is not * necessary. */ @@ -417,7 +417,7 @@ * dependencies. * * @param picoContainer container, used to register dependencies. - * @return a ComponentAdapter of the type to test with a addComponent that has dependencies. Registration in the pico + * @return a ComponentAdapter of the type to test with a component that has dependencies. Registration in the pico * is not necessary. */ protected ComponentAdapter prepRES_dependenciesAreResolved(MutablePicoContainer picoContainer) { @@ -445,8 +445,8 @@ * ComponentAdapter is resolves dependencies. * * @param picoContainer container, used to register dependencies. - * @return a ComponentAdapter of the type to test with a addComponent that has cyclic dependencies. You have to - * register the addComponent itself in the pico. + * @return a ComponentAdapter of the type to test with a component that has cyclic dependencies. You have to + * register the component itself in the pico. */ protected ComponentAdapter prepRES_failingVerificationWithCyclicDependencyException( MutablePicoContainer picoContainer) { @@ -479,8 +479,8 @@ * ComponentAdapter is resolves dependencies. * * @param picoContainer container, used to register dependencies. - * @return a ComponentAdapter of the type to test with a addComponent that has cyclic dependencies. You have to - * register the addComponent itself in the pico. + * @return a ComponentAdapter of the type to test with a component that has cyclic dependencies. You have to + * register the component itself in the pico. */ protected ComponentAdapter prepRES_failingInstantiationWithCyclicDependencyException( MutablePicoContainer picoContainer) { Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractImplementationHidingPicoContainerTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractImplementationHidingPicoContainerTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractImplementationHidingPicoContainerTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -66,7 +66,7 @@ IOException, ClassNotFoundException { try { super.testSerializedContainerCanRetrieveImplementation(); - fail("The ImplementationHidingPicoContainer should not be able to retrieve the addComponent impl"); + fail("The ImplementationHidingPicoContainer should not be able to retrieve the component impl"); } catch (ClassCastException cce) { // expected. } Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractPicoContainerTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractPicoContainerTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractPicoContainerTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -445,7 +445,7 @@ } } - // An addAdapter has no longer a hosting container. + // An adapter has no longer a hosting container. // public void testRegistrationOfAdapterSetsHostingContainerAsSelf() { // final InstanceAdapter componentAdapter = new InstanceAdapter("", new Object()); Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -77,7 +77,7 @@ for (ComponentAdapter allAdapter : allAdapters) { boolean knownAdapter = knownAdapters.remove(allAdapter); - assertTrue("Encountered unknown addAdapter in collection: " + allAdapters.toString(), knownAdapter); + assertTrue("Encountered unknown adapter in collection: " + allAdapters.toString(), knownAdapter); } assertTrue("All adapters should match known adapters.", knownAdapters.size() == 0); Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,10 +24,10 @@ /** - * ComponentAdapter, that assimilates a addComponent for a specific type. + * ComponentAdapter, that assimilates a component for a specific type. * <p> * Allows the instance of another {@link ComponentAdapter} to be converted into interfacte <code>type</code>, that the - * instance is not assignable from. In other words the instance of the delegated addAdapter does NOT necessarily implement the + * instance is not assignable from. In other words the instance of the delegated adapter does NOT necessarily implement the * <code>type</code> interface. * </p> * <p> @@ -61,8 +61,8 @@ private final boolean isCompatible; /** - * Construct an AssimilatingComponentAdapter. The <code>type</code> may not implement the type of the addComponent instance. - * If the addComponent instance <b>does</b> implement the interface, no proxy is used though. + * Construct an AssimilatingComponentAdapter. The <code>type</code> may not implement the type of the component instance. + * If the component instance <b>does</b> implement the interface, no proxy is used though. * * @param type The class type used as key. * @param delegate The delegated {@link ComponentAdapter}. @@ -95,8 +95,8 @@ } /** - * Construct an AssimilatingComponentAdapter. The <code>type</code> may not implement the type of the addComponent instance. - * The implementation will use JDK {@link java.lang.reflect.Proxy} instances. If the addComponent instant <b>does </b> + * Construct an AssimilatingComponentAdapter. The <code>type</code> may not implement the type of the component instance. + * The implementation will use JDK {@link java.lang.reflect.Proxy} instances. If the component instant <b>does </b> * implement the interface, no proxy is used anyway. * * @param type The class type used as key. @@ -107,7 +107,7 @@ } /** - * Create and return a addComponent instance. If the addComponent instance and the type to assimilate is not compatible, a proxy + * Create and return a component instance. If the component instance and the type to assimilate is not compatible, a proxy * for the instance is generated, that implements the assimilated type. * * @see AbstractBehavior#getComponentInstance(org.picocontainer.PicoContainer) @@ -119,7 +119,7 @@ } /** - * Return the type of the addComponent. If the addComponent type is not compatible with the type to assimilate, the assimilated + * Return the type of the addComponent. If the component type is not compatible with the type to assimilate, the assimilated * type is returned. * * @see AbstractBehavior#getComponentImplementation() @@ -129,7 +129,7 @@ } /** - * Return the key of the addComponent. If the key of the delegated addComponent is a type, that is not compatible with the type to + * Return the key of the addComponent. If the key of the delegated component is a type, that is not compatible with the type to * assimilate, then the assimilated type replaces the original type. * * @see AbstractBehavior#getComponentKey() Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapterFactory.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapterFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapterFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -26,7 +26,7 @@ /** * Factory for the AssimilatingComponentAdapter. This factory will create {@link AssimilatingComponentAdapter} instances for all - * {@link ComponentAdapter} instances created by the delegate. This will assimilate every addComponent for a specific type. + * {@link ComponentAdapter} instances created by the delegate. This will assimilate every component for a specific type. * * @author Jörg Schaible * @since 1.2 @@ -58,7 +58,7 @@ } /** - * Create a {@link AssimilatingComponentAdapter}. This addAdapter will wrap the returned {@link ComponentAdapter} of the + * Create a {@link AssimilatingComponentAdapter}. This adapter will wrap the returned {@link ComponentAdapter} of the * deleated {@link ComponentFactory}. * * @see org.picocontainer.ComponentFactory#createComponentAdapter(org.picocontainer.ComponentMonitor,org.picocontainer.LifecycleStrategy,org.picocontainer.ComponentCharacteristic,Object,Class,org.picocontainer.Parameter...) Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/HotSwappingComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/HotSwappingComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/HotSwappingComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -15,8 +15,8 @@ /** - * This addComponent addAdapter makes it possible to hide the implementation of a real subject (behind a proxy). If the key of the - * addComponent is of type {@link Class} and that class represents an interface, the proxy will only implement the interface + * This component adapter makes it possible to hide the implementation of a real subject (behind a proxy). If the key of the + * component is of type {@link Class} and that class represents an interface, the proxy will only implement the interface * represented by that Class. Otherwise (if the key is something else), the proxy will implement all the interfaces of the * underlying subject. In any case, the proxy will also implement {@link com.thoughtworks.proxy.toys.hotswap.Swappable}, making * it possible to swap out the underlying subject at runtime. <p/> <em> Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ImplementationHidingBehaviorAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ImplementationHidingBehaviorAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ImplementationHidingBehaviorAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -28,7 +28,7 @@ /** - * This addComponent addAdapter makes it possible to hide the implementation of a real subject (behind a proxy). + * This component adapter makes it possible to hide the implementation of a real subject (behind a proxy). * The proxy will implement all the interfaces of the * underlying subject. If you want caching, * use a {@link CachingBehavior} around this one. Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/PoolingComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/PoolingComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/PoolingComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -36,7 +36,7 @@ * {@link ComponentAdapter} implementation that pools components. * <p> * The implementation utilizes a delegated ComponentAdapter to create the instances of the pool. The - * pool can be configured to grow unlimited or to a maximum size. If a addComponent is requested from + * pool can be configured to grow unlimited or to a maximum size. If a component is requested from * this addAdapter, the implementation returns an availailabe instance from the pool or will create a * new one, if the maximum pool size is not reached yet. If none is available, the implementation * can wait a defined time for a returned object before it throws a {@link PoolException}. @@ -45,7 +45,7 @@ * This implementation uses the {@link Pool} toy from the <a * href="" project. This ensures, that any addComponent, * that is out of scope will be automatically returned to the pool by the garbage collector. - * Additionally will every addComponent instance also implement + * Additionally will every component instance also implement * {@link com.thoughtworks.proxy.toys.pool.Poolable}, that can be used to return the instance * manually. After returning an instance it should not be used in client code anymore. * </p> @@ -57,8 +57,8 @@ * </p> * <p> * The pool supports components with a lifecylce. If the delegated {@link ComponentAdapter} - * implements a {@link LifecycleStrategy}, any addComponent retrieved form the pool will be started - * before and stopped again, when it returns back into the pool. Also if a addComponent cannot be + * implements a {@link LifecycleStrategy}, any component retrieved form the pool will be started + * before and stopped again, when it returns back into the pool. Also if a component cannot be * resetted it will automatically be disposed. If the container of the pool is disposed, that any * returning object is also disposed and will not return to the pool anymore. Note, that current * implementation cannot dispose pooled objects. @@ -234,9 +234,9 @@ /** * Construct a PoolingComponentAdapter. Remember, that the implementation will request new - * components from the delegate as long as no addComponent instance is available in the pool and + * components from the delegate as long as no component instance is available in the pool and * the maximum pool size is not reached. Therefore the delegate may not return the same - * addComponent instance twice. Ensure, that the used {@link ComponentAdapter} does not cache. + * component instance twice. Ensure, that the used {@link ComponentAdapter} does not cache. * * @param delegate the delegated ComponentAdapter * @param context the {@link Context} of the pool @@ -375,7 +375,7 @@ } /** - * Start of the container ensures that at least one pooled addComponent has been started. Applies + * Start of the container ensures that at least one pooled component has been started. Applies * only if the delegated {@link ComponentAdapter} supports a lifecylce by implementing * {@link LifecycleStrategy}. * Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/StaticFactoryAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/StaticFactoryAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/StaticFactoryAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -17,7 +17,7 @@ /** - * Component addAdapter that wrapps a static factory with the help of {@link StaticFactory}. + * Component adapter that wrapps a static factory with the help of {@link StaticFactory}. * * @author Jörg Schaible * @author Leo Simmons @@ -38,7 +38,7 @@ } /** - * Construct a ComponentAdapter accessing a static factory creating the addComponent using a special key for addComponent + * Construct a ComponentAdapter accessing a static factory creating the component using a special key for addComponent * registration. * * @param componentKey The key of the created addComponent. @@ -51,7 +51,7 @@ } /** - * @return Returns the addComponent created by the static factory. + * @return Returns the component created by the static factory. * @see org.picocontainer.ComponentAdapter#getComponentInstance(org.picocontainer.PicoContainer) */ public Object getComponentInstance(PicoContainer container) throws PicoInitializationException, PicoIntrospectionException { Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -29,9 +29,9 @@ /** - * A {@link ComponentAdapter} that realizes a {@link ThreadLocal} addComponent instance. + * A {@link ComponentAdapter} that realizes a {@link ThreadLocal} component instance. * <p> - * The addAdapter creates proxy instances, that will create the necessary instances on-the-fly invoking the methods of the + * The adapter creates proxy instances, that will create the necessary instances on-the-fly invoking the methods of the * instance. Use this addAdapter, if you are instantiating your components in a single thread, but should be different when * accessed from different threads. See {@link ThreadLocalComponentAdapterFactory} for details. * </p> @@ -52,7 +52,7 @@ * * @param delegate The {@link ComponentAdapter} to delegate. * @param proxyFactory The {@link ProxyFactory} to use. - * @throws PicoIntrospectionException Thrown if the addComponent does not implement any interface. + * @throws PicoIntrospectionException Thrown if the component does not implement any interface. */ public ThreadLocalComponentAdapter(final ComponentAdapter delegate, final ProxyFactory proxyFactory) throws PicoIntrospectionException { @@ -65,7 +65,7 @@ * Construct a ThreadLocalComponentAdapter using {@link Proxy} instances. * * @param delegate The {@link ComponentAdapter} to delegate. - * @throws PicoIntrospectionException Thrown if the addComponent does not implement any interface. + * @throws PicoIntrospectionException Thrown if the component does not implement any interface. */ public ThreadLocalComponentAdapter(final ComponentAdapter delegate) throws PicoIntrospectionException { this(new CachingBehavior(delegate, new ThreadLocalReference()), new StandardProxyFactory()); Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactory.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -28,9 +28,9 @@ /** * A {@link ComponentFactory} for components kept in {@link ThreadLocal} instances. * <p> - * This factory has two operating modes. By default it ensures, that every thread uses its own addComponent at any time. + * This factory has two operating modes. By default it ensures, that every thread uses its own component at any time. * This mode ({@link #ENSURE_THREAD_LOCALITY}) makes internal usage of a {@link ThreadLocalComponentAdapter}. If the - * application architecture ensures, that the thread that creates the addComponent is always also the thread that is th + * application architecture ensures, that the thread that creates the component is always also the thread that is th * only user, you can set the mode {@link #THREAD_ENSURES_LOCALITY}. In this mode the factory uses a simple * {@link CachingBehavior} that uses a {@link ThreadLocalReference} to cache the addComponent. * </p> @@ -40,16 +40,16 @@ * <p> * <code>THREAD_ENSURES_LOCALITY</code> is applicable, if the pico container is requested for a thread local addComponent * from the working thread e.g. in a web application for a request. In this environment it is ensured, that the request - * is processed from the same thread and the thread local addComponent is reused, if a previous request was handled in the - * same thread. Note that thi scenario fails badly, if the thread local addComponent is created because of another cached - * addComponent indirectly by a dependecy. In this case the cached addComponent already have an instance of the thread local - * addComponent, that may have been created in another thread, since only the addComponent addAdapter for the thread local - * addComponent can ensure a unique addComponent for each thread. + * is processed from the same thread and the thread local component is reused, if a previous request was handled in the + * same thread. Note that thi scenario fails badly, if the thread local component is created because of another cached + * component indirectly by a dependecy. In this case the cached component already have an instance of the thread local + * addComponent, that may have been created in another thread, since only the component adapter for the thread local + * component can ensure a unique component for each thread. * </p> * <p> - * <code>ENSURES_THREAD_LOCALITY</code> solves this problem. In this case the returned addComponent is just a proxy for - * the thread local addComponent and this proxy ensures, that a new addComponent is created for each thread. Even if another - * cached addComponent has an indirect dependency on the thread local addComponent, the proxy ensures unique instances. This + * <code>ENSURES_THREAD_LOCALITY</code> solves this problem. In this case the returned component is just a proxy for + * the thread local component and this proxy ensures, that a new component is created for each thread. Even if another + * cached component has an indirect dependency on the thread local addComponent, the proxy ensures unique instances. This * is vital for a multithreaded application that uses EJBs. * </p> * @author Jörg Schaible Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Anything.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Anything.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Anything.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,7 +11,7 @@ import org.picocontainer.ComponentAdapter; /** - * A constraint that matches any addComponent addAdapter. + * A constraint that matches any component addAdapter. * * @author Nick Sieger * @version 1.1 Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Constraint.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Constraint.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Constraint.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -13,17 +13,17 @@ /** * Extension to {@link org.picocontainer.Parameter} that allows for - * constraint-based configuration of addComponent parameters. + * constraint-based configuration of component parameters. * * @author Nick Sieger * @version 1.0 */ public interface Constraint extends Parameter { /** - * Evaluate whether the given addComponent addAdapter matches this constraint. + * Evaluate whether the given component adapter matches this constraint. * * @param adapter a <code>ComponentAdapter</code> value - * @return true if the addAdapter matches the constraint + * @return true if the adapter matches the constraint */ boolean evaluate(ComponentAdapter adapter); } Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsExactType.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsExactType.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsExactType.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,7 +11,7 @@ import org.picocontainer.ComponentAdapter; /** - * Constraint that only accepts an addAdapter whose implementation is the same + * Constraint that only accepts an adapter whose implementation is the same * class instance as the type represented by this object. * * @author Nick Sieger Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKey.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKey.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKey.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,7 +11,7 @@ import org.picocontainer.ComponentAdapter; /** - * Constraint that accepts an addAdapter of a specific key. + * Constraint that accepts an adapter of a specific key. * * @author Nick Sieger * @version 1.1 Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKeyType.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKeyType.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKeyType.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,7 +11,7 @@ import org.picocontainer.ComponentAdapter; /** - * Constraint that accepts an addAdapter whose key type is either the + * Constraint that accepts an adapter whose key type is either the * same type or a subtype of the type(s) represented by this object. * * @author Nick Sieger Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsType.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsType.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsType.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,7 +11,7 @@ import org.picocontainer.ComponentAdapter; /** - * Constraint that accepts an addAdapter whose implementation is either the + * Constraint that accepts an adapter whose implementation is either the * same type or a subtype of the type(s) represented by this object. * * @author Nick Sieger Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/monitors/ComponentDependencyMonitor.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/monitors/ComponentDependencyMonitor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/monitors/ComponentDependencyMonitor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -6,7 +6,7 @@ import org.picocontainer.gems.monitors.prefuse.ComponentDependencyListener; /** - * Understands how to capture addComponent dependency information from + * Understands how to capture component dependency information from * picocontainer. * * @author Peter Barry Modified: java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/AssimilatingComponentAdapterTest.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/AssimilatingComponentAdapterTest.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/AssimilatingComponentAdapterTest.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -54,7 +54,7 @@ } /** - * Test if the addComponent key is preserved if it is not a class type. + * Test if the component key is preserved if it is not a class type. */ public void testComponentKeyIsPreserved() { final MutablePicoContainer mpc = new DefaultPicoContainer(); @@ -82,7 +82,7 @@ } /** - * Test if proxy generation is omitted, if types are compatible and that the addComponent key is not changed. + * Test if proxy generation is omitted, if types are compatible and that the component key is not changed. */ public void testAvoidedProxyDoesNotChangeComponentKey() { final MutablePicoContainer mpc = new DefaultPicoContainer(); Modified: java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/PoolingComponentAdapterTest.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/PoolingComponentAdapterTest.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/PoolingComponentAdapterTest.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -262,7 +262,7 @@ * The recorded String in the buffer must result in <strong>&qout;<OneOne>!One&qout;</strong>. The addAdapter * top test should be registered in the container and delivered as return value. * @param picoContainer the container - * @return the addAdapter to test + * @return the adapter to test */ private ComponentAdapter prepDEF_lifecycleManagerSupport(MutablePicoContainer picoContainer) { picoContainer.addComponent(RecordingLifecycle.One.class); @@ -295,10 +295,10 @@ * Prepare the test <em>lifecycleManagerHonorsInstantiationSequence</em>. Prepare the delivered PicoContainer * with addAdapter(s), that have dependend components, have a lifecycle and use a StringBuffer registered in the * container to record the lifecycle method invocations. The recorded String in the buffer must result in - * <strong>&qout;<One<TwoTwo>One>!Two!One&qout;</strong>. The addAdapter top test should be registered in + * <strong>&qout;<One<TwoTwo>One>!Two!One&qout;</strong>. The adapter top test should be registered in * the container and delivered as return value. * @param picoContainer the container - * @return the addAdapter to test + * @return the adapter to test */ private ComponentAdapter prepRES_lifecycleManagerHonorsInstantiationSequence(MutablePicoContainer picoContainer) { picoContainer.addComponent(RecordingLifecycle.One.class); To unsubscribe from this list please visit: http://xircles.codehaus.org/manage_email Next Message by Date: click to view message preview[picocontainer-scm] [3512] java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems: fixup var names + text for CFRevision 3512 Author paul Date 2007-06-10 12:15:13 -0500 (Sun, 10 Jun 2007) Log Message fixup var names + text for CF Modified Paths java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/DefaultNanoContainer.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoBuilder.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NodeBuilderDecorationDelegate.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NullNodeBuilderDecorationDelegate.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/NanoBuilderTestCase.java java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AopNodeBuilderDecorationDelegate.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopAspectablePicoContainerFactory.java java/sandbox/baby-steps/nano2/container-groovy/src/java/org/nanocontainer/script/groovy/buildernodes/ChildContainerNode.java java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderAopTestCase.java java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderScriptedTestCase.groovy java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderTestCase.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactoryTestCase.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/PicoBuilderTestCase.java java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/PicoGemsBuilderTestCase.java java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactoryTest.java Diff Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/DefaultNanoContainer.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/DefaultNanoContainer.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/DefaultNanoContainer.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -123,17 +123,17 @@ * Constructor that provides the same control over the nanocontainer lifecycle strategies * as {@link DefaultPicoContainer ( org.picocontainer.ComponentFactory , org.picocontainer.LifecycleStrategy , PicoContainer)}. * - * @param componentAdapterFactory ComponentAdapterFactory + * @param componentFactory ComponentAdapterFactory * @param lifecycleStrategy LifecycleStrategy * @param parent PicoContainer may be null if there is no parent. * @param cl the Classloader to use. May be null, in which case DefaultNanoPicoContainer.class.getClassLoader() * will be called instead. */ - public DefaultNanoContainer(ComponentFactory componentAdapterFactory, + public DefaultNanoContainer(ComponentFactory componentFactory, LifecycleStrategy lifecycleStrategy, PicoContainer parent, ClassLoader cl) { - super(new DefaultPicoContainer(componentAdapterFactory, lifecycleStrategy, parent)); + super(new DefaultPicoContainer(componentFactory, lifecycleStrategy, parent)); parentClassLoader = (cl != null) ? cl : DefaultNanoContainer.class.getClassLoader(); } Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoBuilder.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoBuilder.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoBuilder.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -64,8 +64,8 @@ return this; } - public NanoBuilder withComponentAdapterFactory(ComponentFactory componentAdapterFactory) { - picoBuilder.withComponentAdapterFactory(componentAdapterFactory); + public NanoBuilder withComponentAdapterFactory(ComponentFactory componentFactory) { + picoBuilder.withComponentAdapterFactory(componentFactory); return this; } Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NodeBuilderDecorationDelegate.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NodeBuilderDecorationDelegate.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NodeBuilderDecorationDelegate.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -29,7 +29,7 @@ */ public interface NodeBuilderDecorationDelegate { - ComponentFactory decorate(ComponentFactory componentAdapterFactory, Map attributes); + ComponentFactory decorate(ComponentFactory componentFactory, Map attributes); MutablePicoContainer decorate(MutablePicoContainer picoContainer); Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NullNodeBuilderDecorationDelegate.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NullNodeBuilderDecorationDelegate.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NullNodeBuilderDecorationDelegate.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -11,8 +11,8 @@ * @version $Revision$ */ public class NullNodeBuilderDecorationDelegate implements NodeBuilderDecorationDelegate { - public ComponentFactory decorate(ComponentFactory componentAdapterFactory, Map attributes) { - return componentAdapterFactory; + public ComponentFactory decorate(ComponentFactory componentFactory, Map attributes) { + return componentFactory; } public MutablePicoContainer decorate(MutablePicoContainer picoContainer) { Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -508,9 +508,9 @@ } } Parameter[] parameters = createChildParameters(container, element); - ComponentFactory componentAdapterFactory = createComponentAdapterFactory(element.getAttribute(FACTORY), metaContainer); + ComponentFactory componentFactory = createComponentAdapterFactory(element.getAttribute(FACTORY), metaContainer); - container.addAdapter(componentAdapterFactory.createComponentAdapter(new NullComponentMonitor(), new NullLifecycleStrategy(), new ComponentCharacteristic(), key, implementationClass, parameters)); + container.addAdapter(componentFactory.createComponentAdapter(new NullComponentMonitor(), new NullLifecycleStrategy(), new ComponentCharacteristic(), key, implementationClass, parameters)); } private ComponentFactory createComponentAdapterFactory(String factoryName, NanoContainer metaContainer) throws PicoCompositionException { Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -301,8 +301,8 @@ cafName = CachingBehaviorFactory.class.getName(); } Class cafClass = getClassLoader().loadClass(cafName); - ComponentFactory componentAdapterFactory = (ComponentFactory) cafClass.newInstance(); - MutablePicoContainer picoContainer = new DefaultPicoContainer(componentAdapterFactory); + ComponentFactory componentFactory = (ComponentFactory) cafClass.newInstance(); + MutablePicoContainer picoContainer = new DefaultPicoContainer(componentFactory); DefaultNanoContainer nano = new DefaultNanoContainer(getClassLoader(), picoContainer); populateContainer(nano); return nano; Modified: java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/NanoBuilderTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/NanoBuilderTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/NanoBuilderTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -54,7 +54,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -68,7 +68,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -84,7 +84,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -105,7 +105,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -120,7 +120,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -144,7 +144,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -159,7 +159,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -174,7 +174,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + " delegate=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -191,7 +191,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.nanocontainer.NanoBuilderTestCase_CustomParentcontainer\n" + @@ -214,7 +214,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.SetterInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n", @@ -226,7 +226,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnnotationInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnnotationInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n", @@ -238,7 +238,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.ConstructorInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.ConstructorInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n",foo); @@ -249,7 +249,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + @@ -262,7 +262,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + " delegate=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -276,7 +276,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.SynchronizedBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.SynchronizedBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -291,7 +291,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.NanoBuilderTestCase_-TestNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -313,7 +313,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.NanoBuilderTestCase_-TestNanoContainer\n" + " delegate=org.nanocontainer.NanoBuilderTestCase_TestPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -354,7 +354,7 @@ foo = foo.replaceAll("\n componentKeyToAdapterCache",""); foo = foo.replaceAll("\n startedComponentAdapters",""); foo = foo.replaceAll("\"class=","\"\nclass="); - foo = foo.replaceAll("\n componentAdapterFactory\n","\n"); + foo = foo.replaceAll("\n componentFactory\n","\n"); foo = foo.replaceAll("\n componentMonitor\n","\n"); foo = foo.replaceAll("\n lifecycleManager",""); foo = foo.replaceAll("class=\"org.picocontainer.DefaultPicoContainer_1\"",""); Modified: java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -704,12 +704,12 @@ " <namedChildContainers/>\n" + " <delegate class='org.picocontainer.DefaultPicoContainer'>\n" + " <componentKeyToAdapterCache/>\n" + - " <componentAdapterFactory class='"+MyCAF3.class.getName()+"'>\n" + + " <componentFactory class='"+MyCAF3.class.getName()+"'>\n" + " <delegate class='"+MyCAF2.class.getName()+"'>\n" + " <delegate class='"+MyCAF.class.getName()+"'>\n" + " </delegate>\n" + " </delegate>\n" + - " </componentAdapterFactory>\n" + + " </componentFactory>\n" + " <children/>\n" + " <componentAdapters/>\n" + " <orderedComponentAdapters/>\n" + Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -30,24 +30,24 @@ * @param containerClass the class of the basic container to delegate to. * @param aspectsManager the aspects manager used to register and apply * aspects. - * @param componentAdapterFactory the delegate component adapter factory + * @param componentFactory the delegate component factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. */ public AspectablePicoContainer createContainer(Class containerClass, AspectsManager aspectsManager, - ComponentFactory componentAdapterFactory, PicoContainer parent); + ComponentFactory componentFactory, PicoContainer parent); /** * Creates a new <code>AspectablePicoContainer</code>. * * @param containerClass the class of the basic container to delegate to. - * @param componentAdapterFactory the delegate component adapter factory + * @param componentFactory the delegate component factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. */ - AspectablePicoContainer createContainer(Class containerClass, ComponentFactory componentAdapterFactory, + AspectablePicoContainer createContainer(Class containerClass, ComponentFactory componentFactory, PicoContainer parent); /** @@ -55,30 +55,30 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. * - * @param componentAdapterFactory the delegate component adapter factory + * @param componentFactory the delegate component factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. */ - AspectablePicoContainer createContainer(ComponentFactory componentAdapterFactory, PicoContainer parent); + AspectablePicoContainer createContainer(ComponentFactory componentFactory, PicoContainer parent); /** * Creates a new <code>AspectablePicoContainer</code>. Uses * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. * - * @param componentAdapterFactory the delegate component adapter factory + * @param componentFactory the delegate component factory * used to produce components. * @return a new <code>AspectablePicoContainer</code>. */ - AspectablePicoContainer createContainer(ComponentFactory componentAdapterFactory); + AspectablePicoContainer createContainer(ComponentFactory componentFactory); /** * Creates a new <code>AspectablePicoContainer</code>. Uses * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. Uses * <code>org.picocontainer.injectors.AnyInjectionFactory</code> - * as the delegate component adapter factory. + * as the delegate component factory. * * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. @@ -90,7 +90,7 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. Uses * <code>org.picocontainer.injectors.AnyInjectionFactory</code> - * as the delegate component adapter factory. + * as the delegate component factory. * * @return a new <code>AspectablePicoContainer</code>. */ Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AopNodeBuilderDecorationDelegate.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AopNodeBuilderDecorationDelegate.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AopNodeBuilderDecorationDelegate.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -47,8 +47,8 @@ this.aspectsManager = aspectsManager; } - public ComponentFactory decorate(ComponentFactory componentAdapterFactory, Map attributes) { - return createAdapterFactory(aspectsManager, componentAdapterFactory); + public ComponentFactory decorate(ComponentFactory componentFactory, Map attributes) { + return createAdapterFactory(aspectsManager, componentFactory); } public MutablePicoContainer decorate(MutablePicoContainer picoContainer) { Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopAspectablePicoContainerFactory.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopAspectablePicoContainerFactory.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopAspectablePicoContainerFactory.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -33,24 +33,24 @@ public class DynaopAspectablePicoContainerFactory implements AspectablePicoContainerFactory { public AspectablePicoContainer createContainer(Class containerClass, AspectsManager aspectsManager, - ComponentFactory componentAdapterFactory, PicoContainer parent) { + ComponentFactory componentFactory, PicoContainer parent) { - ComponentFactory aspectsComponentAdapterFactory = new AspectsComponentAdapterFactory(aspectsManager).forThis(componentAdapterFactory); + ComponentFactory aspectsComponentAdapterFactory = new AspectsComponentAdapterFactory(aspectsManager).forThis(componentFactory); MutablePicoContainer pico = createMutablePicoContainer(containerClass, aspectsComponentAdapterFactory, parent); return mixinAspectablePicoContainer(aspectsManager, pico); } public AspectablePicoContainer createContainer(Class containerClass, - ComponentFactory componentAdapterFactory, PicoContainer parent) { - return createContainer(containerClass, new DynaopAspectsManager(), componentAdapterFactory, parent); + ComponentFactory componentFactory, PicoContainer parent) { + return createContainer(containerClass, new DynaopAspectsManager(), componentFactory, parent); } - public AspectablePicoContainer createContainer(ComponentFactory componentAdapterFactory, PicoContainer parent) { - return createContainer(DefaultPicoContainer.class, componentAdapterFactory, parent); + public AspectablePicoContainer createContainer(ComponentFactory componentFactory, PicoContainer parent) { + return createContainer(DefaultPicoContainer.class, componentFactory, parent); } - public AspectablePicoContainer createContainer(ComponentFactory componentAdapterFactory) { - return createContainer(componentAdapterFactory, null); + public AspectablePicoContainer createContainer(ComponentFactory componentFactory) { + return createContainer(componentFactory, null); } public AspectablePicoContainer createContainer(PicoContainer parent) { Modified: java/sandbox/baby-steps/nano2/container-groovy/src/java/org/nanocontainer/script/groovy/buildernodes/ChildContainerNode.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-groovy/src/java/org/nanocontainer/script/groovy/buildernodes/ChildContainerNode.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-groovy/src/java/org/nanocontainer/script/groovy/buildernodes/ChildContainerNode.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -56,10 +56,10 @@ private final NodeBuilderDecorationDelegate decorationDelegate; /** - * Attribute: 'componentAdapterFactory' a reference to an instance of a - * component adapter factory. + * Attribute: 'componentFactory' a reference to an instance of a + * component factory. */ - private static final String COMPONENT_ADAPTER_FACTORY = "componentAdapterFactory"; + private static final String COMPONENT_ADAPTER_FACTORY = "componentFactory"; /** * Attribute: 'componentMonitor' a reference to an instance of a component monitor. @@ -127,7 +127,7 @@ * Creates a new container. There may or may not be a parent to this container. * Supported attributes are: * <ul> - * <li><tt>componentAdapterFactory</tt>: The ComponentAdapterFactory used for new container</li> + * <li><tt>componentFactory</tt>: The ComponentAdapterFactory used for new container</li> * <li><tt>componentMonitor</tt>: The ComponentMonitor used for new container</li> * </ul> * @param attributes Map Attributes defined by the builder in the script. @@ -141,16 +141,16 @@ if (parent != null) { parentClassLoader = parent.getComponentClassLoader(); if ( isAttribute(attributes, COMPONENT_ADAPTER_FACTORY) ) { - ComponentFactory componentAdapterFactory = createComponentAdapterFactory(attributes); + ComponentFactory componentFactory = createComponentAdapterFactory(attributes); childContainer = new DefaultPicoContainer( - getDecorationDelegate().decorate(componentAdapterFactory, attributes), parent); + getDecorationDelegate().decorate(componentFactory, attributes), parent); if ( isAttribute(attributes, COMPONENT_MONITOR) ) { changeComponentMonitor(childContainer, createComponentMonitor(attributes)); } parent.addChildContainer(childContainer); } else if ( isAttribute(attributes, COMPONENT_MONITOR) ) { - ComponentFactory componentAdapterFactory = new CachingBehaviorFactory().forThis(new AnyInjectionFactory()); - childContainer = new DefaultPicoContainer(getDecorationDelegate().decorate(componentAdapterFactory, attributes), parent); + ComponentFactory componentFactory = new CachingBehaviorFactory().forThis(new AnyInjectionFactory()); + childContainer = new DefaultPicoContainer(getDecorationDelegate().decorate(componentFactory, attributes), parent); changeComponentMonitor(childContainer, createComponentMonitor(attributes)); } else { childContainer = parent.makeChildContainer(); @@ -161,9 +161,9 @@ return PicoContainer.class.getClassLoader(); } }); - ComponentFactory componentAdapterFactory = createComponentAdapterFactory(attributes); + ComponentFactory componentFactory = createComponentAdapterFactory(attributes); childContainer = new DefaultPicoContainer( - getDecorationDelegate().decorate(componentAdapterFactory, attributes)); + getDecorationDelegate().decorate(componentFactory, attributes)); if ( isAttribute(attributes, COMPONENT_MONITOR) ) { changeComponentMonitor(childContainer, createComponentMonitor(attributes)); } Modified: java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderAopTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderAopTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderAopTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -169,7 +169,7 @@ "caf = new TestComponentAdapterFactory(cafLog)\n" + "cuts = new DynaopPointcutsFactory()\n" + "builder = new DynaopGroovyNodeBuilder()\n" + - "nano = builder.container(componentAdapterFactory:caf) {\n" + + "nano = builder.container(componentFactory:caf) {\n" + " aspect(classCut:cuts.instancesOf(Dao.class), methodCut:cuts.allMethods(), interceptor:logger)\n" + " component(key:Dao, class:DaoImpl)\n" + " component(key:'intLog', instance:intLog)\n" + Modified: java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderScriptedTestCase.groovy (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderScriptedTestCase.groovy 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderScriptedTestCase.groovy 2007-06-10 17:15:13 UTC (rev 3512) @@ -71,7 +71,7 @@ def builder = new GroovyNodeBuilder() def caf = new TestComponentAdapterFactory(sb) - def nano = builder.container(componentAdapterFactory:caf) { + def nano = builder.container(componentFactory:caf) { component(key:WebServerConfig, class:DefaultWebServerConfig) component(key:WebServer, class:WebServerImpl) } Modified: java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -268,7 +268,7 @@ Reader script = new StringReader("" + "package org.nanocontainer.script.groovy\n" + "import org.nanocontainer.testmodel.*\n" + - "nano = builder.container(componentAdapterFactory:assemblyScope) {\n" + + "nano = builder.container(componentFactory:assemblyScope) {\n" + " component(A)\n" + "}"); @@ -276,8 +276,8 @@ Mock cafMock = mock(ComponentFactory.class); cafMock.expects(once()).method("createComponentAdapter").with(new Constraint[] { isA(ComponentMonitor.class), isA(LifecycleStrategy.class), isA(ComponentCharacteristic.class), same(A.class), same(A.class), eq(null)}).will(returnValue(new InstanceAdapter(A.class, a, NullLifecycleStrategy.getInstance(), NullComponentMonitor.getInstance()))); - ComponentFactory componentAdapterFactory = (ComponentFactory) cafMock.proxy(); - PicoContainer pico = buildContainer(script, null, componentAdapterFactory); + ComponentFactory componentFactory = (ComponentFactory) cafMock.proxy(); + PicoContainer pico = buildContainer(script, null, componentFactory); assertSame(a, pico.getComponent(A.class)); } @@ -311,7 +311,7 @@ "import org.nanocontainer.testmodel.*\n" + "writer = new StringWriter()\n" + "monitor = new WriterComponentMonitor(writer) \n"+ - "nano = builder.container(componentAdapterFactory: new CachingBehaviorFactory(), componentMonitor: monitor) {\n" + + "nano = builder.container(componentFactory: new CachingBehaviorFactory(), componentMonitor: monitor) {\n" + " component(A)\n" + " component(key:StringWriter, instance:writer)\n" + "}"); @@ -352,7 +352,7 @@ "import org.nanocontainer.testmodel.*\n" + "writer = new StringWriter()\n" + "monitor = new WriterComponentMonitor(writer) \n"+ - "nano = builder.container(parent:parent, componentAdapterFactory: new CachingBehaviorFactory(), componentMonitor: monitor) {\n" + + "nano = builder.container(parent:parent, componentFactory: new CachingBehaviorFactory(), componentMonitor: monitor) {\n" + " component(A)\n" + " component(key:StringWriter, instance:writer)\n" + "}"); Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactoryTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactoryTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactoryTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -39,30 +39,30 @@ } public void testWillRegisterByDefaultComponentsThatAreMBeans() throws NotCompliantMBeanException { - final JMXExposingBehaviorFactory componentAdapterFactory = new JMXExposingBehaviorFactory( + final JMXExposingBehaviorFactory componentFactory = new JMXExposingBehaviorFactory( (MBeanServer)mockMBeanServer.proxy()); - componentAdapterFactory.forThis(new ConstructorInjectionFactory()); + componentFactory.forThis(new ConstructorInjectionFactory()); mockMBeanServer.expects(once()).method("registerMBean").with( isA(DynamicMBeanPerson.class), isA(ObjectName.class)); - final ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter( + final ComponentAdapter componentAdapter = componentFactory.createComponentAdapter( new NullComponentMonitor(), new NullLifecycleStrategy(), ComponentCharacteristics.CDI, PersonMBean.class, DynamicMBeanPerson.class, null); assertNotNull(componentAdapter); assertNotNull(componentAdapter.getComponentInstance(null)); } public void testWillRegisterByDefaultComponentsThatAreMBeansUnlessNOJMX() throws NotCompliantMBeanException { - final JMXExposingBehaviorFactory componentAdapterFactory = new JMXExposingBehaviorFactory( + final JMXExposingBehaviorFactory componentFactory = new JMXExposingBehaviorFactory( (MBeanServer)mockMBeanServer.proxy()); - componentAdapterFactory.forThis(new ConstructorInjectionFactory()); + componentFactory.forThis(new ConstructorInjectionFactory()); final ComponentCharacteristic rc = new ComponentCharacteristic() { }; ComponentCharacteristics.NOJMX.mergeInto(rc); - final ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter( + final ComponentAdapter componentAdapter = componentFactory.createComponentAdapter( new NullComponentMonitor(), new NullLifecycleStrategy(), rc, PersonMBean.class, DynamicMBeanPerson.class, null); assertNotNull(componentAdapter); assertNotNull(componentAdapter.getComponentInstance(null)); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java (3511 => 3512) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -18,8 +18,8 @@ /** * <p/> - * A component adapter factory is responsible for creating - * {@link ComponentAdapter} component adapters. The main use of the component adapter factory is + * A component factory is responsible for creating + * {@link ComponentAdapter} component adapters. The main use of the component factory is * inside {@link DefaultPicoContainer#DefaultPicoContainer(ComponentFactory)}, where it can * be used to customize the default component adapter that is used when none is specified * explicitly. Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java (3511 => 3512) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -64,7 +64,7 @@ */ public class DefaultPicoContainer implements MutablePicoContainer, ComponentMonitorStrategy, Serializable { private final Map<Object, ComponentAdapter> componentKeyToAdapterCache = new HashMap<Object, ComponentAdapter>(); - private ComponentFactory componentAdapterFactory; + private ComponentFactory componentFactory; private PicoContainer parent; private final Set<PicoContainer> children = new HashSet<PicoContainer>(); @@ -101,11 +101,11 @@ * other ComponentAdapterFactories. * </em> * - * @param componentAdapterFactory the factory to use for creation of ComponentAdapters. + * @param componentFactory the factory to use for creation of ComponentAdapters. * @param parent the parent container (used for component dependency lookups). */ - public DefaultPicoContainer(ComponentFactory componentAdapterFactory, PicoContainer parent) { - this(componentAdapterFactory, new StartableLifecycleStrategy(NullComponentMonitor.getInstance()), parent, NullComponentMonitor.getInstance()); + public DefaultPicoContainer(ComponentFactory componentFactory, PicoContainer parent) { + this(componentFactory, new StartableLifecycleStrategy(NullComponentMonitor.getInstance()), parent, NullComponentMonitor.getInstance()); } /** @@ -119,26 +119,26 @@ * other ComponentAdapterFactories. * </em> * - * @param componentAdapterFactory the factory to use for creation of ComponentAdapters. + * @param componentFactory the factory to use for creation of ComponentAdapters. * @param lifecycleStrategy * the lifecylce strategy chosen for regiered * instance (not implementations!) * @param parent the parent container (used for component dependency lookups). */ - public DefaultPicoContainer(ComponentFactory componentAdapterFactory, + public DefaultPicoContainer(ComponentFactory componentFactory, LifecycleStrategy lifecycleStrategy, PicoContainer parent) { - this(componentAdapterFactory, lifecycleStrategy, parent, NullComponentMonitor.getInstance() ); + this(componentFactory, lifecycleStrategy, parent, NullComponentMonitor.getInstance() ); } - public DefaultPicoContainer(ComponentFactory componentAdapterFactory, + public DefaultPicoContainer(ComponentFactory componentFactory, LifecycleStrategy lifecycleStrategy, PicoContainer parent, ComponentMonitor componentMonitor) { - if (componentAdapterFactory == null) throw new NullPointerException("componentAdapterFactory"); + if (componentFactory == null) throw new NullPointerException("componentFactory"); if (lifecycleStrategy == null) throw new NullPointerException("lifecycleStrategy"); - this.componentAdapterFactory = componentAdapterFactory; + this.componentFactory = componentFactory; this.lifecycleStrategy = lifecycleStrategy; this.parent = parent; if (parent != null && !(parent instanceof EmptyPicoContainer)) { @@ -186,10 +186,10 @@ /** * Creates a new container with a custom ComponentAdapterFactory and no parent container. * - * @param componentAdapterFactory the ComponentAdapterFactory to use. + * @param componentFactory the ComponentAdapterFactory to use. */ - public DefaultPicoContainer(ComponentFactory componentAdapterFactory) { - this(componentAdapterFactory, null); + public DefaultPicoContainer(ComponentFactory componentFactory) { + this(componentFactory, null); } /** @@ -331,7 +331,7 @@ parameters = null; // backwards compatibility! solve this better later - Paul } if (componentImplementationOrInstance instanceof Class) { - ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter(componentMonitor, + ComponentAdapter componentAdapter = componentFactory.createComponentAdapter(componentMonitor, lifecycleStrategy, characteristic, componentKey, @@ -557,7 +557,7 @@ } public MutablePicoContainer makeChildContainer() { - DefaultPicoContainer pc = new DefaultPicoContainer(componentAdapterFactory, lifecycleStrategy, this); + DefaultPicoContainer pc = new DefaultPicoContainer(componentFactory, lifecycleStrategy, this); addChildContainer(pc); return pc; } Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/PicoBuilderTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/PicoBuilderTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/PicoBuilderTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -53,7 +53,7 @@ MutablePicoContainer mpc = new PicoBuilder().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -69,7 +69,7 @@ MutablePicoContainer mpc = new PicoBuilder().withLifecycle().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -83,7 +83,7 @@ MutablePicoContainer mpc = new PicoBuilder().withReflectionLifecycle().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -103,7 +103,7 @@ MutablePicoContainer mpc = new PicoBuilder().withConsoleMonitor().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -117,7 +117,7 @@ MutablePicoContainer mpc = new PicoBuilder().withLifecycle().withConsoleMonitor().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -133,7 +133,7 @@ MutablePicoContainer mpc = new PicoBuilder().withMonitor(ConsoleComponentMonitor.class).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -156,7 +156,7 @@ MutablePicoContainer mpc = new PicoBuilder().withHiddenImplementations().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -170,7 +170,7 @@ MutablePicoContainer mpc = new PicoBuilder().withComponentAdapterFactory(new ImplementationHidingBehaviorFactory()).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -184,7 +184,7 @@ MutablePicoContainer mpc = new PicoBuilder(SDI()).withBehaviors(caching(), threadSafe(), implHiding()).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + " delegate=org.picocontainer.behaviors.SynchronizedBehaviorFactory\n" + " delegate=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + @@ -201,7 +201,7 @@ MutablePicoContainer mpc = new PicoBuilder(new CustomParentcontainer()).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.PicoBuilderTestCase_CustomParentcontainer\n" + @@ -224,7 +224,7 @@ MutablePicoContainer mpc = new PicoBuilder().withSetterInjection().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.SetterInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n" + @@ -235,7 +235,7 @@ MutablePicoContainer mpc = new PicoBuilder().withAnnotationInjection().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnnotationInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnnotationInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n" + @@ -246,7 +246,7 @@ MutablePicoContainer mpc = new PicoBuilder().withConstructorInjection().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.ConstructorInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.ConstructorInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n" + @@ -257,7 +257,7 @@ MutablePicoContainer mpc = new PicoBuilder().withHiddenImplementations().withSetterInjection().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + @@ -269,7 +269,7 @@ MutablePicoContainer mpc = new PicoBuilder().withCaching().withHiddenImplementations().withSetterInjection().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + " delegate=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -282,7 +282,7 @@ MutablePicoContainer mpc = new PicoBuilder().withThreadSafety().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.SynchronizedBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.SynchronizedBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -296,7 +296,7 @@ MutablePicoContainer mpc = new PicoBuilder().withCustomContainerComponent(new SomeContainerDependency()).withComponentFactory(CustomComponentFactory.class).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.PicoBuilderTestCase_CustomComponentFactory\n" + + " componentFactory=org.picocontainer.PicoBuilderTestCase_CustomComponentFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n" + @@ -327,7 +327,7 @@ MutablePicoContainer mpc = new PicoBuilder().thisMutablePicoContainer(TestPicoContainer.class).build(); String foo = simplifyRepresentation(mpc); assertEquals("org.picocontainer.PicoBuilderTestCase_-TestPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -369,7 +369,7 @@ foo = foo.replaceAll("\n componentKeyToAdapterCache",""); foo = foo.replaceAll("\n startedComponentAdapters",""); foo = foo.replaceAll("\"class=","\"\nclass="); - foo = foo.replaceAll("\n componentAdapterFactory\n","\n"); + foo = foo.replaceAll("\n componentFactory\n","\n"); foo = foo.replaceAll("\n lifecycleManager",""); foo = foo.replaceAll("class=\"org.picocontainer.DefaultPicoContainer_1\"",""); foo = foo.replaceAll("class=\"org.picocontainer.DefaultPicoContainer_OrderedComponentAdapterLifecycleManager\"",""); Modified: java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/PicoGemsBuilderTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/PicoGemsBuilderTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/PicoGemsBuilderTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -25,7 +25,7 @@ MutablePicoContainer mpc = new PicoBuilder().withBehaviors(IMPL_HIDING()).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.gems.adapters.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.gems.adapters.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -39,7 +39,7 @@ MutablePicoContainer mpc = new PicoBuilder().withMonitor(Log4JComponentMonitor.class).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -53,7 +53,7 @@ MutablePicoContainer mpc = new PicoBuilder().withMonitor(LOG4J()).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -67,7 +67,7 @@ MutablePicoContainer mpc = new PicoBuilder().withMonitor(CommonsLoggingComponentMonitor.class).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -100,7 +100,7 @@ foo = foo.replaceAll("\n startedComponentAdapters",""); foo = foo.replaceAll("\n props",""); foo = foo.replaceAll("\"class=","\"\nclass="); - foo = foo.replaceAll("\n componentAdapterFactory\n","\n"); + foo = foo.replaceAll("\n componentFactory\n","\n"); foo = foo.replaceAll("\n componentMonitor\n","\n"); foo = foo.replaceAll("\n lifecycleManager",""); foo = foo.replaceAll("class=\"org.picocontainer.DefaultPicoContainer_1\"",""); Modified: java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactoryTest.java (3511 => 3512) --- java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactoryTest.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactoryTest.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -35,8 +35,8 @@ * @throws InterruptedException */ public final void testCreateComponentAdapterEnsuringThreadLocal() throws InterruptedException { - final ComponentFactory componentAdapterFactory = new ThreadLocalComponentAdapterFactory().forThis(new ConstructorInjectionFactory()); - final ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter( + final ComponentFactory componentFactory = new ThreadLocalComponentAdapterFactory().forThis(new ConstructorInjectionFactory()); + final ComponentAdapter componentAdapter = componentFactory.createComponentAdapter( new NullComponentMonitor(), new NullLifecycleStrategy(), null, List.class, ArrayList.class); final List list = (List)componentAdapter.getComponentInstance(null); list.add(this); @@ -62,8 +62,8 @@ * @throws InterruptedException */ public final void testCreateComponentAdapterFailingThreadLocal() throws InterruptedException { - final ComponentFactory componentAdapterFactory = new ThreadLocalComponentAdapterFactory(ThreadLocalComponentAdapterFactory.THREAD_ENSURES_LOCALITY).forThis(new ConstructorInjectionFactory()); - final ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter( + final ComponentFactory componentFactory = new ThreadLocalComponentAdapterFactory(ThreadLocalComponentAdapterFactory.THREAD_ENSURES_LOCALITY).forThis(new ConstructorInjectionFactory()); + final ComponentAdapter componentAdapter = componentFactory.createComponentAdapter( new NullComponentMonitor(), new NullLifecycleStrategy(), null, List.class, ArrayList.class); final List list = (List)componentAdapter.getComponentInstance(null); list.add(this); @@ -90,8 +90,8 @@ * @throws InterruptedException */ public final void testCreateComponentAdapterWorksForDifferentThreads() throws InterruptedException { - final ComponentFactory componentAdapterFactory = new ThreadLocalComponentAdapterFactory(ThreadLocalComponentAdapterFactory.THREAD_ENSURES_LOCALITY).forThis(new ConstructorInjectionFactory()); - final ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter( + final ComponentFactory componentFactory = new ThreadLocalComponentAdapterFactory(ThreadLocalComponentAdapterFactory.THREAD_ENSURES_LOCALITY).forThis(new ConstructorInjectionFactory()); + final ComponentAdapter componentAdapter = componentFactory.createComponentAdapter( new NullComponentMonitor(), new NullLifecycleStrategy(), null, List.class, ArrayList.class); final List list = (List)componentAdapter.getComponentInstance(null); list.add(this); To unsubscribe from this list please visit: http://xircles.codehaus.org/manage_email Previous Message by Thread: click to view message preview[picocontainer-scm] [3510] java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer: fixup some textual errors from a previous refactoringRevision 3510 Author paul Date 2007-06-10 11:53:02 -0500 (Sun, 10 Jun 2007) Log Message fixup some textual errors from a previous refactoring Modified Paths java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoContainer.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/ComponentElementHelper.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/TestAdapter.java java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsApplicator.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsContainer.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/ComponentPointcut.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/PointcutsFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AspectsComponentAdapterFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/KeyEqualsComponentPointcut.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/NameMatchesComponentPointcut.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspect.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspectsCollection.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerLoader.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedInterceptorFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedMixinFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopPointcutsFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/MixinComponentAspect.java java/sandbox/baby-steps/nano2/container-bsh/src/java/org/nanocontainer/script/bsh/BeanShellAdapter.java java/sandbox/baby-steps/nano2/container-bsh/src/test/org/nanocontainer/script/bsh/BeanShellContainerBuilderTestCase.java java/sandbox/baby-steps/nano2/container-jruby/src/test/org/nanocontainer/script/jruby/JRubyContainerBuilderTestCase.java java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/X.java java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/Xxx.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/ActionFactory.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoActionServlet.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoRequestProcessor.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoTilesRequestProcessor.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/java/org/nanocontainer/nanowar/webwork2/PicoObjectFactory.java java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/test/org/nanocontainer/nanowar/webwork2/PicoObjectFactoryTestCase.java java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/ExceptionFactory.java java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/DBCPDataSource.java java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/FailoverDataSourceConnection.java java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/JNDIDataSource.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/FailoverSessionDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionComponent.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionFactoryDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/FailoverSessionDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryLifecycle.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionLifecycle.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/FailoverSessionDelegator.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionComponent.java java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionFactoryDelegator.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/ejb/EJBClientAdapter.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractConstructingProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractNamingConventionMBeanInfoProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentKeyConventionMBeanInfoProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentTypeConventionMBeanInfoProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanComponentProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorAdapter.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactory.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXRegistrationException.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXVisitor.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ObjectNameFactory.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/PredefinedObjectNameFactory.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/RegisteredMBeanConstructingProvider.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/StandardMBeanFactory.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/mx4j/MX4JDynamicMBeanFactory.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/testmodel/PersonMBeanDescription.java java/sandbox/baby-steps/nanoextras2/tools/tools/src/java/org/nanocontainer/tools/ant/Component.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/BeanPropertyComponentAdapter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentAdapter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitor.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitorStrategy.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Disposable.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleManager.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleStrategy.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/MutablePicoContainer.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Parameter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoContainer.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoRegistrationException.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Startable.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/AbstractAdapter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/InstanceAdapter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/CachingBehavior.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/ImplementationHidingBehavior.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AbstractInjector.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AnnotationInjectionFactory.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/ConstructorInjector.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjectionFactory.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjector.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/ReflectionLifecycleStrategy.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/StartableLifecycleStrategy.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/monitors/AbstractComponentMonitor.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/BasicComponentParameter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/CollectionComponentParameter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/ComponentParameter.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/visitors/MethodCallingVisitor.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/DefaultPicoContainerTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/adapters/SynchronizedComponentAdapterTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/behaviors/BehaviorAdapterTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/doc/advanced/CollectionsTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractImplementationHidingPicoContainerTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractPicoContainerTestCase.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTestCase.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapterFactory.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/HotSwappingComponentAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ImplementationHidingBehaviorAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/PoolingComponentAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/StaticFactoryAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapter.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactory.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Anything.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Constraint.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsExactType.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKey.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKeyType.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsType.java java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/monitors/ComponentDependencyMonitor.java java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/AssimilatingComponentAdapterTest.java java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/PoolingComponentAdapterTest.java Diff Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoContainer.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoContainer.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoContainer.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -21,7 +21,7 @@ * <p/> * A NanoContainer adapts a {@link MutablePicoContainer} through a similar API that * is based only on Strings. (It uses reflection to look up classes before registering them - * with the adapted PicoContainer). This addAdapter API is used primarily by the various + * with the adapted PicoContainer). This adapter API is used primarily by the various * {@link org.nanocontainer.script.ScriptedContainerBuilder} implementations in the * org.nanocontainer.script.[scripting engine] packages. * Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/ComponentElementHelper.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/ComponentElementHelper.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/ComponentElementHelper.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -32,7 +32,7 @@ key = key == null ? instance.getClass() : key; return current.addComponent(key, instance); } else { - throw new NanoContainerMarkupException("Must specify a 'class' attribute for a addComponent as a class name (string) or Class."); + throw new NanoContainerMarkupException("Must specify a 'class' attribute for a component as a class name (string) or Class."); } } Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -248,7 +248,7 @@ } } } - // handle CAF now as standard addComponent in the metaContainer + // handle CAF now as standard component in the metaContainer registerComponent(metaContainer, node); } Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -151,7 +151,7 @@ } /** - * process addAdapter node + * process adapter node * @param container * @param rootElement */ @@ -187,7 +187,7 @@ String klass = rootElement.getAttribute(CLASS); String constructor = rootElement.getAttribute(CONSTRUCTOR); if (klass == null || "".equals(klass)) { - throw new NanoContainerMarkupException("class specification is required for addComponent implementation"); + throw new NanoContainerMarkupException("class specification is required for component implementation"); } Class clazz = getClassLoader().loadClass(klass); Modified: java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/TestAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/TestAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/TestAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -14,7 +14,7 @@ import org.picocontainer.adapters.AbstractAdapter; /** - * addComponent addAdapter to test script instantiation. + * component adapter to test script instantiation. */ public final class TestAdapter extends AbstractAdapter { Modified: java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -178,9 +178,9 @@ assertNotNull("Container should have a 'foo' addComponent", fooTestComp); StringBuffer sb = pico.getComponent(StringBuffer.class); - assertTrue("Container should have instantiated a 'TestComp2' addComponent because it is Startable", sb.toString().indexOf("-TestComp2") != -1); + assertTrue("Container should have instantiated a 'TestComp2' component because it is Startable", sb.toString().indexOf("-TestComp2") != -1); // We are using the DefaultLifecycleManager, which only instantiates Startable components, and not non-Startable components. - assertTrue("Container should NOT have instantiated a 'NotStartable' addComponent because it is NOT Startable", sb.toString().indexOf("-NotStartable") == -1); + assertTrue("Container should NOT have instantiated a 'NotStartable' component because it is NOT Startable", sb.toString().indexOf("-NotStartable") == -1); } public void testUnknownclassThrowsNanoContainerMarkupException() { Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -30,7 +30,7 @@ * @param containerClass the class of the basic container to delegate to. * @param aspectsManager the aspects manager used to register and apply * aspects. - * @param componentAdapterFactory the delegate addComponent addAdapter factory + * @param componentAdapterFactory the delegate component adapter factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. @@ -42,7 +42,7 @@ * Creates a new <code>AspectablePicoContainer</code>. * * @param containerClass the class of the basic container to delegate to. - * @param componentAdapterFactory the delegate addComponent addAdapter factory + * @param componentAdapterFactory the delegate component adapter factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. @@ -55,7 +55,7 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. * - * @param componentAdapterFactory the delegate addComponent addAdapter factory + * @param componentAdapterFactory the delegate component adapter factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. @@ -67,7 +67,7 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. * - * @param componentAdapterFactory the delegate addComponent addAdapter factory + * @param componentAdapterFactory the delegate component adapter factory * used to produce components. * @return a new <code>AspectablePicoContainer</code>. */ @@ -78,7 +78,7 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. Uses * <code>org.picocontainer.injectors.AnyInjectionFactory</code> - * as the delegate addComponent addAdapter factory. + * as the delegate component adapter factory. * * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. @@ -90,7 +90,7 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. Uses * <code>org.picocontainer.injectors.AnyInjectionFactory</code> - * as the delegate addComponent addAdapter factory. + * as the delegate component adapter factory. * * @return a new <code>AspectablePicoContainer</code>. */ Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsApplicator.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsApplicator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsApplicator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,7 +12,7 @@ import org.picocontainer.PicoContainer; /** - * Applies aspects to a addComponent. Intended for use by addComponent adapters that + * Applies aspects to a addComponent. Intended for use by component adapters that * need to inject aspects into a addComponent. * * @author Stephen Molitor Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsContainer.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsContainer.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectsContainer.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -37,7 +37,7 @@ void registerInterceptor(ClassPointcut classPointcut, MethodPointcut methodPointcut, MethodInterceptor interceptor); /** - * Registers addComponent scoped interceptor advice. The advice will be applied + * Registers component scoped interceptor advice. The advice will be applied * to all components in the container whose key satisfies * <code>componentPointcut</code>. The interceptor will only intercept * methods that match the <code>methodPointcut</code>. @@ -51,7 +51,7 @@ /** * Registers container supplied container scoped interceptor advice. The - * interceptor advice object itself is a addComponent in the container, + * interceptor advice object itself is a component in the container, * specified by <code>interceptorComponentKey</code>. The advice will be * applied to all components in the container whose class satisfies the * <code>classPointcut</code>. The interceptor will only intercept @@ -59,13 +59,13 @@ * * @param classPointcut classes to apply the interceptor to. * @param methodPointcut methods to apply the interceptor to. - * @param interceptorComponentKey the interceptor addComponent key. + * @param interceptorComponentKey the interceptor component key. */ void registerInterceptor(ClassPointcut classPointcut, MethodPointcut methodPointcut, Object interceptorComponentKey); /** - * Registers addComponent scoped interceptor advice. The interceptor advice - * object itself is a addComponent in the container, specified by the + * Registers component scoped interceptor advice. The interceptor advice + * object itself is a component in the container, specified by the * <code>interceptorComponentKey</code>. The advice will be applied to * all components in the container whose key satisfies * <code>componentPointcut</code>. The interceptor will only intercept @@ -73,7 +73,7 @@ * * @param componentPointcut components to apply the interceptor to. * @param methodPointcut methods to apply the interceptor to. - * @param interceptorComponentKey the interceptor addComponent key. + * @param interceptorComponentKey the interceptor component key. */ void registerInterceptor(ComponentPointcut componentPointcut, MethodPointcut methodPointcut, Object interceptorComponentKey); @@ -83,8 +83,8 @@ * components in the container whose class satisfies the * <code>classPointcut</code>. * <p/> - * If a addComponent of type <code>mixinClass</code> has been registered in - * the container, that addComponent will be used as the mixin. Otherwise a new + * If a component of type <code>mixinClass</code> has been registered in + * the container, that component will be used as the mixin. Otherwise a new * object of type <code>mixinClass</code> will be instantiated each time * the mixin is applied to a addComponent. Any dependencies the mixin has will * be supplied from components in the container, or, if there are no @@ -98,7 +98,7 @@ void registerMixin(ClassPointcut classPointcut, Class[] interfaces, Class mixinClass); /** - * Registers addComponent scoped mixin advice. The mixin will be added to all + * Registers component scoped mixin advice. The mixin will be added to all * components in the container whose key satisfies the * <code>componentPointcut</code>. * @@ -124,7 +124,7 @@ void registerMixin(ClassPointcut classPointcut, Class mixinClass); /** - * Registers addComponent scoped mixin advice. The mixin will be added to all + * Registers component scoped mixin advice. The mixin will be added to all * components in the container whose key satisfies the * <code>componentPointcut</code>. Convenience method that uses all * interfaces implemented by the mixin class. @@ -150,7 +150,7 @@ void registerInterfaces(ClassPointcut classPointcut, Class[] interfaces); /** - * Adds interfaces to components picked by the addComponent pointcut. + * Adds interfaces to components picked by the component pointcut. * * @param componentPointcut components to add interfaces to. * @param interfaces the interfaces to add. Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/ComponentPointcut.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/ComponentPointcut.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/ComponentPointcut.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -10,7 +10,7 @@ package org.nanocontainer.aop; /** - * Pointcut that picks addComponent keys. + * Pointcut that picks component keys. * * @author Stephen Molitor * @version $Revision$ @@ -18,9 +18,9 @@ public interface ComponentPointcut { /** - * Returns true if the addComponent key satisfies this pointcut. + * Returns true if the component key satisfies this pointcut. * - * @param componentKey the addComponent key. + * @param componentKey the component key. * @return true if the pointcut is satisfied, else false. */ boolean picks(Object componentKey); Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/PointcutsFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/PointcutsFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/PointcutsFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -20,22 +20,22 @@ public interface PointcutsFactory { /** - * Returns a addComponent pointcut that picks one addComponent key. + * Returns a component pointcut that picks one component key. * - * @param componentKey the addComponent key to match against. + * @param componentKey the component key to match against. * @return a <code>ComponentPointcut</code> that matches * <code>componentKey</code>. */ ComponentPointcut component(Object componentKey); /** - * Returns a addComponent pointcut that matches addComponent keys with a regular + * Returns a component pointcut that matches component keys with a regular * _expression_. The regular _expression_ must be an <a * href="" </a> Perl5 compatible * regular _expression_. * * @param regex the regular _expression_ to match against. - * @return a <code>ComponentPointcut</code> that matches the addComponent key + * @return a <code>ComponentPointcut</code> that matches the component key * against <code>regex</code>. * @throws MalformedRegularExpressionException * if the regular _expression_ is Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AspectsComponentAdapterFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AspectsComponentAdapterFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AspectsComponentAdapterFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -20,7 +20,7 @@ import org.picocontainer.behaviors.AbstractBehaviorFactory; /** - * Produces addComponent adapters that apply aspects to components. + * Produces component adapters that apply aspects to components. * * @author Stephen Molitor * @version $Revision$ Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/KeyEqualsComponentPointcut.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/KeyEqualsComponentPointcut.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/KeyEqualsComponentPointcut.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,7 +12,7 @@ import org.nanocontainer.aop.ComponentPointcut; /** - * Component pointcut that matches against a addComponent key. + * Component pointcut that matches against a component key. * * @author Stephen Molitor * @version $Revision$ @@ -25,7 +25,7 @@ * Creates a new <code>KeyEqualsComponentPointcut</code> that matches * against <code>componentKey</code>. * - * @param componentKey the addComponent key to match against. + * @param componentKey the component key to match against. */ public KeyEqualsComponentPointcut(Object componentKey) { if (componentKey == null) { @@ -35,12 +35,12 @@ } /** - * Tests to see if the <code>componentKey</code> matches the addComponent key + * Tests to see if the <code>componentKey</code> matches the component key * passed to the constructor. * - * @param componentKey the candidate addComponent key to match against. + * @param componentKey the candidate component key to match against. * @return true if <code>componentKey</code> is equivalent to the - * addComponent key passed to the constructor, else false. + * component key passed to the constructor, else false. */ public boolean picks(Object componentKey) { return this.componentKey.equals(componentKey); Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/NameMatchesComponentPointcut.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/NameMatchesComponentPointcut.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/NameMatchesComponentPointcut.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -17,7 +17,7 @@ import org.nanocontainer.aop.MalformedRegularExpressionException; /** - * Component pointcut that matches the addComponent name against a regular + * Component pointcut that matches the component name against a regular * _expression_. * * @author Stephen Molitor @@ -30,12 +30,12 @@ /** * Creates a new <code>NameMatchesComponentPointcut</code> that will match - * the addComponent key against the given regular _expression_. The regular + * the component key against the given regular _expression_. The regular * _expression_ must be an <a * href="" </a> Perl5 regular * _expression_. * - * @param regex the regular _expression_ to match against the addComponent name. + * @param regex the regular _expression_ to match against the component name. * @throws org.nanocontainer.aop.MalformedRegularExpressionException * if the regular _expression_ is * invalid. @@ -45,15 +45,15 @@ try { pattern = compiler.compile(regex); } catch (MalformedPatternException e) { - throw new MalformedRegularExpressionException("malformed addComponent name regular _expression_", e); + throw new MalformedRegularExpressionException("malformed component name regular _expression_", e); } } /** - * Tests to see if the addComponent key's toString() value matches the regular _expression_ passed + * Tests to see if the component key's toString() value matches the regular _expression_ passed * to the constructor. * - * @param componentKey the addComponent key to match against. + * @param componentKey the component key to match against. * @return true if the regular _expression_ passed to the constructor matches * against <code>componentKey</code>, else false. */ Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspect.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspect.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspect.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -27,7 +27,7 @@ * Creates a new <code>ComponentAspect</code> with the given addComponent * pointcut. * - * @param componentPointcut the addComponent pointcut. + * @param componentPointcut the component pointcut. */ ComponentAspect(ComponentPointcut componentPointcut) { this.componentPointcut = componentPointcut; @@ -37,9 +37,9 @@ * Registers this aspect with <code>aspects</code> if the addComponent * pointcut passed to the constructor picks the <code>componentKey</code>. * Template method that calls <code>doRegisterAspect</code> if the - * addComponent key matches. + * component key matches. * - * @param componentKey the addComponent key to match against. + * @param componentKey the component key to match against. * @param aspects the <code>dynaop.Aspects</code> collection. */ final void registerAspect(Object componentKey, Aspects aspects) { Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspectsCollection.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspectsCollection.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ComponentAspectsCollection.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -20,7 +20,7 @@ import java.util.Iterator; /** - * Represents the collection of addComponent scoped aspects for a Pico container. + * Represents the collection of component scoped aspects for a Pico container. * Manages a collection of <code>ComponentAspect</code> objects, and knows how * to register their aspects. * @@ -32,23 +32,23 @@ private final Collection componentsAspects = new ArrayList(); /** - * Adds a addComponent aspect to this collection. + * Adds a component aspect to this collection. * - * @param componentAspect the addComponent aspect to add. + * @param componentAspect the component aspect to add. */ void add(ComponentAspect componentAspect) { componentsAspects.add(componentAspect); } /** - * Registers all aspects whose addComponent pointcut matches + * Registers all aspects whose component pointcut matches * <code>componentKey</code>. Creates and returns a new * <code>dynaop.Aspects</code> object that is the union of the addComponent * and container scoped aspects. By copying the container scoped aspects to - * a new <code>dynaop.Aspects</code> and adding the addComponent aspects to + * a new <code>dynaop.Aspects</code> and adding the component aspects to * this new object, we avoid having to create proxies on top of proxies. * - * @param componentKey the addComponent key. + * @param componentKey the component key. * @param containerAspects the container scoped aspects. * @return a new <code>dynaop.Aspects</code> object that contains * everything in <code>containerAspects</code> plus the addComponent Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerLoader.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerLoader.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerLoader.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -16,8 +16,8 @@ * Loads a <code>PicoContainer</code> 'late'. Used to create a late-loading * <code>PicoContainer</code> proxy which is passed to * <code>dynaop.MixinFactory</code> and <code>dynaop.InterceptorFactory</code> - * objects whose mixin or interceptor advice is a addComponent in the container, - * specified by addComponent key. The container object may be created after the + * objects whose mixin or interceptor advice is a component in the container, + * specified by component key. The container object may be created after the * advice factories. * * @author Stephen Molitor Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedInterceptorFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedInterceptorFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedInterceptorFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -33,11 +33,11 @@ /** * Creates a new <code>ContainerSuppliedInterceptorFactory</code> that * will manufacture interceptors by retrieving them from the - * <code>PicoContainer</code> using a given addComponent key. + * <code>PicoContainer</code> using a given component key. * * @param pico the <code>PicoContainer</code> to retrieve the interceptor * from. - * @param interceptorComponentKey the addComponent key that will be used to + * @param interceptorComponentKey the component key that will be used to * retrieve the interceptor from the pico container. */ ContainerSuppliedInterceptorFactory(PicoContainer pico, Object interceptorComponentKey) { @@ -57,7 +57,7 @@ public Interceptor create(Proxy proxy) throws NullPointerException { MethodInterceptor methodInterceptor = (MethodInterceptor) pico.getComponent(interceptorComponentKey); if (methodInterceptor == null) { - throw new NullPointerException("Interceptor with addComponent key " + interceptorComponentKey + throw new NullPointerException("Interceptor with component key " + interceptorComponentKey + " + not found in PicoContainer"); } return new MethodInterceptorAdapter(methodInterceptor); Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedMixinFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedMixinFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/ContainerSuppliedMixinFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -32,7 +32,7 @@ /** * Creates a new <code>ContainerSuppliedMixinFactory</code> that will * manufacture mixins by retrieving them from the <code>PicoContainer</code> - * using a given addComponent key. + * using a given component key. * * @param pico the <code>PicoContainer</code> to retrieve the mixin from. * @param mixinClass the mixin class Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopPointcutsFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopPointcutsFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopPointcutsFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -120,10 +120,10 @@ } private static dynaop.ClassPointcut toDynaopClassCut(final ClassPointcut nanoCut) { - // The purpose of the anonymous inner class addAdapter below is to allow + // The purpose of the anonymous inner class adapter below is to allow // users to use union, intersection and not with custom pointcuts (not // instances of dynaop.ClassPointcut). Now we could just wrap nanoCut - // with the addAdapter every time, even if it is already a + // with the adapter every time, even if it is already a // dynaop.ClassPointcut. But the extra level of indirection gets a // little // confusing when debugging. Thus the instanceof check. Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/MixinComponentAspect.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/MixinComponentAspect.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/MixinComponentAspect.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -28,11 +28,11 @@ /** * Creates a new <code>MixinComponentAspect</code> from the given - * addComponent pointcut and mixin class. The aspected addComponent will implement + * component pointcut and mixin class. The aspected component will implement * the provided set of mixin interfaces. * * @param componentPointcut the components to introduce the mixin to. - * @param mixinInterfaces the mixin interfaces the aspected addComponent will + * @param mixinInterfaces the mixin interfaces the aspected component will * implement. * @param mixinFactory the mixin factory. */ Modified: java/sandbox/baby-steps/nano2/container-bsh/src/java/org/nanocontainer/script/bsh/BeanShellAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-bsh/src/java/org/nanocontainer/script/bsh/BeanShellAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-bsh/src/java/org/nanocontainer/script/bsh/BeanShellAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -25,11 +25,11 @@ import java.util.Collections; /** - * This addAdapter relies on <a href="" for instantiation - * (and possibly also initialisation) of addComponent instances. + * This adapter relies on <a href="" for instantiation + * (and possibly also initialisation) of component instances. * <p/> * When {@link org.picocontainer.ComponentAdapter#getComponentInstance} is called (by PicoContainer), - * the addAdapter instance will look for a script with the same name as the addComponent implementation + * the adapter instance will look for a script with the same name as the component implementation * class (but with the .bsh extension). This script must reside in the same folder as the class. * (It's ok to have them both in a jar). * <p/> @@ -38,10 +38,10 @@ * <p/> * The script will have access to the following variables: * <ul> - * <li>addAdapter - the addAdapter calling the script</li> + * <li>addAdapter - the adapter calling the script</li> * <li>picoContainer - the MutablePicoContainer calling the addAdapter</li> - * <li>componentKey - the addComponent key</li> - * <li>componentImplementation - the addComponent implementation</li> + * <li>componentKey - the component key</li> + * <li>componentImplementation - the component implementation</li> * <li>parameters - the ComponentParameters (as a List)</li> * </ul> * @author <a href="" at leosimons dot com">Leo Simons</a> Modified: java/sandbox/baby-steps/nano2/container-bsh/src/test/org/nanocontainer/script/bsh/BeanShellContainerBuilderTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-bsh/src/test/org/nanocontainer/script/bsh/BeanShellContainerBuilderTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-bsh/src/test/org/nanocontainer/script/bsh/BeanShellContainerBuilderTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -91,7 +91,7 @@ testComp = classLoader.loadClass("TestComp"); } catch (ClassNotFoundException ex) { ex.printStackTrace(); - fail("Unable to load test addComponent from the jar using a url classloader"); + fail("Unable to load test component from the jar using a url classloader"); } PicoContainer pico = buildContainer(new BeanShellContainerBuilder(script, classLoader), parent, "SOME_SCOPE"); Modified: java/sandbox/baby-steps/nano2/container-jruby/src/test/org/nanocontainer/script/jruby/JRubyContainerBuilderTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/container-jruby/src/test/org/nanocontainer/script/jruby/JRubyContainerBuilderTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/container-jruby/src/test/org/nanocontainer/script/jruby/JRubyContainerBuilderTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -330,7 +330,7 @@ try { buildContainer(script, null, ASSEMBLY_SCOPE); - fail("Should not have been able to instansiate addComponent tree due to visibility/parent reasons."); + fail("Should not have been able to instansiate component tree due to visibility/parent reasons."); } catch(AbstractInjector.UnsatisfiableDependenciesException expected) { } } @@ -556,7 +556,7 @@ try { testComp = classLoader.loadClass("TestComp"); } catch(ClassNotFoundException ex) { - fail("Unable to load test addComponent from the jar using a url classloader"); + fail("Unable to load test component from the jar using a url classloader"); } Reader script = new StringReader( "container(:parent => $parent) {\n" Modified: java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/X.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/X.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/X.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,7 +12,7 @@ import org.picocontainer.Startable; /** - * An abstract addComponent and three dependancies used for testing. + * An abstract component and three dependancies used for testing. */ public abstract class X implements Startable, Disposable { Modified: java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/Xxx.java (3509 => 3510) --- java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/Xxx.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nano2/testmodel/src/java/org/nanocontainer/testmodel/Xxx.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -13,7 +13,7 @@ import org.picocontainer.Startable; /** - * An abstract addComponent and three dependancies used for testing. + * An abstract component and three dependancies used for testing. */ public abstract class Xxx implements Startable, Disposable { Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/ActionFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/ActionFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/ActionFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -43,7 +43,7 @@ * or if that container can not be found, the application container. If no * parent container can be found, a <code>PicoInitializationException</code> * will be thrown. The action path specified in the mapping is used as - * the addComponent key for the action. + * the component key for the action. * * @param request the Http servlet request. * @param mapping the Struts mapping object, whose type property tells us what Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoActionServlet.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoActionServlet.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoActionServlet.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -30,7 +30,7 @@ /** * Creates or retrieves the action instance. The action is retrieved from the actions - * Pico container, using the mapping path as the addComponent key. If no such action exists, + * Pico container, using the mapping path as the component key. If no such action exists, * a new one will be instantiated and placed in the actions container, thus injecting * its dependencies. * Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoRequestProcessor.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoRequestProcessor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoRequestProcessor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -30,7 +30,7 @@ /** * Creates or retrieves the action instance. The action is retrieved from the actions - * Pico container, using the mapping path as the addComponent key. If no such action exists, + * Pico container, using the mapping path as the component key. If no such action exists, * a new one will be instantiated and placed in the actions container, thus injecting * its dependencies. * Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoTilesRequestProcessor.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoTilesRequestProcessor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-struts/src/java/org/nanocontainer/nanowar/struts/PicoTilesRequestProcessor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -31,7 +31,7 @@ /** * Creates or retrieves the action instance. The action is retrieved from the actions - * Pico container, using the mapping path as the addComponent key. If no such action exists, + * Pico container, using the mapping path as the component key. If no such action exists, * a new one will be instantiated and placed in the actions container, thus injecting * its dependencies. * Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/java/org/nanocontainer/nanowar/webwork2/PicoObjectFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/java/org/nanocontainer/nanowar/webwork2/PicoObjectFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/java/org/nanocontainer/nanowar/webwork2/PicoObjectFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -20,7 +20,7 @@ /** * <p> - * XWork ObjectFactory which uses a PicoContainer to create addComponent instances. + * XWork ObjectFactory which uses a PicoContainer to create component instances. * </p> * * @author Cyrille Le Clerc Modified: java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/test/org/nanocontainer/nanowar/webwork2/PicoObjectFactoryTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/test/org/nanocontainer/nanowar/webwork2/PicoObjectFactoryTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/nanowar/nanowar-webwork2/src/test/org/nanocontainer/nanowar/webwork2/PicoObjectFactoryTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -95,7 +95,7 @@ } /** - * if addComponent was not registered explicitely, there shall be different instance for + * if component was not registered explicitely, there shall be different instance for * next invocation. not only actions are instantiated via factory, but also important stuff like filters, * validators, interceptors etc - they shall not be shared. * @throws Exception Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/ExceptionFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/ExceptionFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/ExceptionFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -1,7 +1,7 @@ package org.nanocontainer.persistence; /** - * Factory addComponent used by ExceptionHandler in order to create exceptions. + * Factory component used by ExceptionHandler in order to create exceptions. * * @version $Revision: $ */ Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/DBCPDataSource.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/DBCPDataSource.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/DBCPDataSource.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -20,7 +20,7 @@ import org.picocontainer.Startable; /** - * Commons-DBCP DataSource addComponent implementation. It has failover support. + * Commons-DBCP DataSource component implementation. It has failover support. * * @author Juze Peleteiro <juze -a-t- intelli -dot- biz> */ @@ -49,7 +49,7 @@ * @param connectionURL The connection url. * @param username The connection username. * @param password The connection password. - * @param jdbcExceptionHandler The ExceptionHandler addComponent instance. + * @param jdbcExceptionHandler The ExceptionHandler component instance. */ public DBCPDataSource(final String driver, final String connectionURL, final String username, final String password, final ExceptionHandler jdbcExceptionHandler) { super(jdbcExceptionHandler); @@ -69,7 +69,7 @@ /** * @param properties DBCP properties. See at @{link http://jakarta.apache.org/commons/dbcp/configuration.html} - * @param jdbcExceptionHandler The ExceptionHandler addComponent instance. + * @param jdbcExceptionHandler The ExceptionHandler component instance. */ public DBCPDataSource(final Properties properties, final ExceptionHandler jdbcExceptionHandler) { super(jdbcExceptionHandler); Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/FailoverDataSourceConnection.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/FailoverDataSourceConnection.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/FailoverDataSourceConnection.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,7 +18,7 @@ import org.picocontainer.Startable; /** - * Connection addComponent implementation which obtains a connection instance using a injected datasource. It has failover + * Connection component implementation which obtains a connection instance using a injected datasource. It has failover * support. * * @author Juze Peleteiro <juze -a-t- intelli -dot- biz> Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/JNDIDataSource.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/JNDIDataSource.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence/src/java/org/nanocontainer/persistence/jdbc/JNDIDataSource.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -37,7 +37,7 @@ /** * @param name JNDI name where the original DataSource is. - * @param jdbcExceptionHandler The ExceptionHandler addComponent instance. + * @param jdbcExceptionHandler The ExceptionHandler component instance. */ public JNDIDataSource(final String name, final ExceptionHandler jdbcExceptionHandler) { super(jdbcExceptionHandler); @@ -57,7 +57,7 @@ /** * @param name JNDI name where the original DataSource is. * @param context JNDI context. - * @param jdbcExceptionHandler The ExceptionHandler addComponent instance. + * @param jdbcExceptionHandler The ExceptionHandler component instance. */ public JNDIDataSource(final String name, final Context context, final ExceptionHandler jdbcExceptionHandler) { super(jdbcExceptionHandler); Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/FailoverSessionDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/FailoverSessionDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/FailoverSessionDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -40,7 +40,7 @@ /** * @param sessionFactory session factory to obtain session from - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, ExceptionHandler exceptionHandler) { super(exceptionHandler); @@ -59,7 +59,7 @@ /** * @param sessionFactory sessionf actory to obtain session from * @param interceptor interceptor to use with created session - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, Interceptor interceptor, ExceptionHandler exceptionHandler) { this(sessionFactory, exceptionHandler); Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionComponent.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionComponent.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionComponent.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -31,7 +31,7 @@ import org.picocontainer.Startable; /** - * Session addComponent with failover behaviour in case of hibernate exception. Old session is disposed + * Session component with failover behaviour in case of hibernate exception. Old session is disposed * and new one is obtained transparently. Session creation is done lazily. * * @author Jose Peleteiro <juzepeleteiro-lziC5CizQUOpwFb5G8XvHQ@xxxxxxxxxxxxxxxx> Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionFactoryDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionFactoryDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate-annotations/src/java/org/nanocontainer/persistence/hibernate/annotations/SessionFactoryDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -32,7 +32,7 @@ /** * Delegates everything to session factory obtained from confiuration. this class is necessary - * because addComponent adapters are really ugly when it comes to scripting. + * because component adapters are really ugly when it comes to scripting. * * @version $Id: SessionFactoryDelegator.java 2158 2005-07-08 02:13:36Z juze $ */ Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/FailoverSessionDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/FailoverSessionDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/FailoverSessionDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -39,7 +39,7 @@ /** * @param sessionFactory session factory to obtain session from - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, HibernateExceptionHandler exceptionHandler) { super(exceptionHandler); @@ -58,7 +58,7 @@ /** * @param sessionFactory sessionf actory to obtain session from * @param interceptor interceptor to use with created session - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, Interceptor interceptor, HibernateExceptionHandler exceptionHandler) { this(sessionFactory, exceptionHandler); Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -47,7 +47,7 @@ } /** - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public SessionDelegator(HibernateExceptionHandler exceptionHandler) { this.exceptionHandler = exceptionHandler; Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -26,7 +26,7 @@ import org.picocontainer.PicoInitializationException; /** * delegates everything to session factory obtained from confiuration. - * this class is necessary because addComponent adapters are really ugly when + * this class is necessary because component adapters are really ugly when * it comes to scripting * * Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryLifecycle.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryLifecycle.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionFactoryLifecycle.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -15,7 +15,7 @@ import org.picocontainer.Startable; /** - * addComponent organising lifecycle for session factory + * component organising lifecycle for session factory * @author Konstanti Pribluda * @version $Revision: 2043 $ */ Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionLifecycle.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionLifecycle.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate2/src/java/org/nanocontainer/persistence/hibernate/classic/SessionLifecycle.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -15,7 +15,7 @@ import org.picocontainer.Startable; /** - * addComponent providing session lifecycle to be registered in container containing session + * component providing session lifecycle to be registered in container containing session * in question * @author Konstantin Pribluda * @version $Revision: 2043 $ Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/FailoverSessionDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/FailoverSessionDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/FailoverSessionDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -40,7 +40,7 @@ /** * @param sessionFactory session factory to obtain session from - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, ExceptionHandler exceptionHandler) { super(exceptionHandler); @@ -59,7 +59,7 @@ /** * @param sessionFactory sessionf actory to obtain session from * @param interceptor interceptor to use with created session - * @param exceptionHandler Exception handler addComponent to use with created session + * @param exceptionHandler Exception handler component to use with created session */ public FailoverSessionDelegator(SessionFactory sessionFactory, Interceptor interceptor, ExceptionHandler exceptionHandler) { this(sessionFactory, exceptionHandler); Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionComponent.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionComponent.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionComponent.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -31,7 +31,7 @@ import org.picocontainer.Startable; /** - * Session addComponent with failover behaviour in case of hibernate exception. Old session is disposed + * Session component with failover behaviour in case of hibernate exception. Old session is disposed * and new one is obtained transparently. Session creation is done lazily. * * @author Jose Peleteiro <juzepeleteiro-lziC5CizQUOpwFb5G8XvHQ@xxxxxxxxxxxxxxxx> Modified: java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionFactoryDelegator.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionFactoryDelegator.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/persistence/persistence-hibernate3/src/java/org/nanocontainer/persistence/hibernate/SessionFactoryDelegator.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -29,7 +29,7 @@ /** * Delegates everything to session factory obtained from confiuration. this class is necessary - * because addComponent adapters are really ugly when it comes to scripting. + * because component adapters are really ugly when it comes to scripting. * * @version $Id: SessionFactoryDelegator.java 2158 2005-07-08 02:13:36Z juze $ */ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/ejb/EJBClientAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/ejb/EJBClientAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/ejb/EJBClientAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -36,14 +36,14 @@ /** * {@link ComponentAdapter}, that is able to lookup and instantiate an EJB as client. * <p> - * The default mode for this addAdapter is late binding i.e. the addAdapter returns a proxy object for the requested type as + * The default mode for this adapter is late binding i.e. the adapter returns a proxy object for the requested type as * instance. The lookup for the EJB is started with the first call of the proxy and the stub is created. Any further * call will do the same, if the last call was aborted by a remote exception. With early binding the stub wiill be - * created in the constructor and the initialization of the addAdapter may fail. + * created in the constructor and the initialization of the adapter may fail. * </p> * <p> - * The addAdapter is using internally an own proxy for the stub object. This enables a failover in case of a temporary - * unavailability of the application server providing the EJB. With every call to a methof of the EJB, the addAdapter is + * The adapter is using internally an own proxy for the stub object. This enables a failover in case of a temporary + * unavailability of the application server providing the EJB. With every call to a methof of the EJB, the adapter is * able to reestablish the connection, if the last call had been failed. In this case you might try a call at some * minutes later again, but you should give up after some trials. * </p> @@ -61,7 +61,7 @@ /** * Construct a {@link ComponentAdapter} for an EJB. This constructor implies the home interface follows normal - * naming conventions. The addAdapter will use the default {@link InitialContext} and will also do late binding. + * naming conventions. The adapter will use the default {@link InitialContext} and will also do late binding. * @param name the EJB's JNDI name * @param type the implemented interface of the EJB * @throws ClassNotFoundException if the home interface could not be found Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractConstructingProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractConstructingProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractConstructingProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -28,11 +28,11 @@ public abstract class AbstractConstructingProvider implements DynamicMBeanProvider { /** - * Create a StandardMBean from the addComponent provided by the ComponentAdapter. One of the registered - * {@link MBeanInfoProvider} instances must provide a {@link MBeanInfo} for the addComponent and the registered + * Create a StandardMBean from the component provided by the ComponentAdapter. One of the registered + * {@link MBeanInfoProvider} instances must provide a {@link MBeanInfo} for the component and the registered * {@link ObjectNameFactory} has to provide a proper {@link ObjectName}. * <p> - * Note: An instance of the addComponent is only created, if a management interface is available. + * Note: An instance of the component is only created, if a management interface is available. * </p> * @see org.nanocontainer.remoting.jmx.DynamicMBeanProvider#provide(org.picocontainer.PicoContainer, * org.picocontainer.ComponentAdapter) @@ -64,7 +64,7 @@ return new JMXRegistrationInfo(objectName, mBean); } } catch (final MalformedObjectNameException e) { - throw new JMXRegistrationException("Cannot create ObjectName for addComponent '" + throw new JMXRegistrationException("Cannot create ObjectName for component '" + componentAdapter.getComponentKey() + "'", e); } @@ -91,7 +91,7 @@ protected abstract MBeanInfoProvider[] getMBeanInfoProviders(); /** - * Determin the management interface from the addComponent implementation type and an optional MBeanInfo instance. + * Determin the management interface from the component implementation type and an optional MBeanInfo instance. * @param implementation The type of the addComponent's implementation. * @param mBeanInfo The {@link MBeanInfo} to expose the addComponent. May be <code>null</code>. * @return Returns the management interface. Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractNamingConventionMBeanInfoProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractNamingConventionMBeanInfoProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/AbstractNamingConventionMBeanInfoProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,7 +24,7 @@ public abstract class AbstractNamingConventionMBeanInfoProvider implements MBeanInfoProvider { /** - * Locate a MBeanInfo as addComponent in a PicoContainer. If no addComponent is registered using the name of the MBeanInfo + * Locate a MBeanInfo as component in a PicoContainer. If no component is registered using the name of the MBeanInfo * as key, the method turns the name into a type and searches again. * @param mBeanInfoName The name of the {@link MBeanInfo} used as key. * @param picoContainer The {@link PicoContainer} used for the lookup. Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentKeyConventionMBeanInfoProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentKeyConventionMBeanInfoProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentKeyConventionMBeanInfoProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -25,7 +25,7 @@ public class ComponentKeyConventionMBeanInfoProvider extends AbstractNamingConventionMBeanInfoProvider { /** - * Use the key of the addComponent to search for a MBeanInfo in the PicoContainer. The matching MBeanInfo must be + * Use the key of the component to search for a MBeanInfo in the PicoContainer. The matching MBeanInfo must be * stored in the PicoContainer. The key of the MBeanInfo follows the naming scheme * "<ComponentKey>MBeanInfo". The the addComponent's key is a type, the class name is used as prefix * otherwise the string representation of the key. The key part may already end with "MBean" as it would Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentTypeConventionMBeanInfoProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentTypeConventionMBeanInfoProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ComponentTypeConventionMBeanInfoProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,14 +18,14 @@ /** * A MBeanInfoProvider that searches for a MBeanInfo instance in the PicoContainer. The key of the MBeanInfo is - * calculated from the addComponent type following naming conventions. + * calculated from the component type following naming conventions. * @author Jörg Schaible * @since 1.0 */ public class ComponentTypeConventionMBeanInfoProvider extends AbstractNamingConventionMBeanInfoProvider { /** - * Use the key of the addComponent to search for a MBeanInfo in the PicoContainer. The matching MBeanInfo must be + * Use the key of the component to search for a MBeanInfo in the PicoContainer. The matching MBeanInfo must be * stored in the PicoContainer. The key of the MBeanInfo follows the naming scheme * "<ComponentKey>MBeanInfo". The the addComponent's key is a type, the class name is used as prefix * otherwise the string representation of the key. The key part may already end with "MBean" as it would Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanComponentProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanComponentProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanComponentProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -19,7 +19,7 @@ /** - * DynamicMBeanProvider, that will provide a addComponent directly if it is already a {@link DynamicMBean}. + * DynamicMBeanProvider, that will provide a component directly if it is already a {@link DynamicMBean}. * @author Jörg Schaible * @since 1.0 */ @@ -47,7 +47,7 @@ } /** - * Provide the addComponent itself as {@link DynamicMBean} if it is one and if an {@link ObjectName} can be created. + * Provide the component itself as {@link DynamicMBean} if it is one and if an {@link ObjectName} can be created. * @see org.nanocontainer.remoting.jmx.DynamicMBeanProvider#provide(org.picocontainer.PicoContainer, * org.picocontainer.ComponentAdapter) */ @@ -60,7 +60,7 @@ return new JMXRegistrationInfo(objectName, mBean); } } catch (final MalformedObjectNameException e) { - throw new JMXRegistrationException("Cannot create ObjectName for addComponent '" + throw new JMXRegistrationException("Cannot create ObjectName for component '" + componentAdapter.getComponentKey() + "'", e); } Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/DynamicMBeanProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,7 +24,7 @@ public interface DynamicMBeanProvider { /** - * Provide a {@link DynamicMBean} from the addComponent delivered by the ComponentAdapter. + * Provide a {@link DynamicMBean} from the component delivered by the ComponentAdapter. * @param picoContainer The {@link PicoContainer} to resolve dependencies. * @param componentAdapter The {@link ComponentAdapter} referring the addComponent. * @return Returns the registration information. Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -28,7 +28,7 @@ /** - * {@link ComponentAdapter} that is exposing a addComponent as MBean in a MBeanServer. + * {@link ComponentAdapter} that is exposing a component as MBean in a MBeanServer. * @author Jörg Schaible * @since 1.0 */ @@ -42,7 +42,7 @@ * Construct a JMXExposingComponentAdapter. * @param delegate The delegated {@link ComponentAdapter}. * @param mBeanServer The {@link MBeanServer} used for registering the MBean. - * @param providers An array with providers for converting the addComponent instance into a + * @param providers An array with providers for converting the component instance into a * {@link javax.management.DynamicMBean}. * @throws NullPointerException Thrown if the {@link MBeanServer} or the array with the {@link DynamicMBeanProvider} * instances is null. @@ -61,7 +61,7 @@ /** * Construct a JMXExposingComponentAdapter. This instance uses a {@link DynamicMBeanComponentProvider} as default to - * register any addComponent instance in the {@link MBeanServer}, that is already a + * register any component instance in the {@link MBeanServer}, that is already a * {@link javax.management.DynamicMBean}. * @param delegate The delegated {@link ComponentAdapter}. * @param mBeanServer The {@link MBeanServer} used for registering the MBean. @@ -75,11 +75,11 @@ } /** - * Retrieve the addComponent instance. The implementation will automatically register it in the {@link MBeanServer}, + * Retrieve the component instance. The implementation will automatically register it in the {@link MBeanServer}, * if a provider can return a {@link javax.management.DynamicMBean} for it. * <p> * Note, that you will have to wrap this {@link ComponentAdapter} with a {@link CachingBehavior} to avoid - * the registration of the same addComponent again. + * the registration of the same component again. * </p> * @throws PicoInitializationException Thrown by the delegate or if the registering of the * {@link javax.management.DynamicMBean} in the {@link MBeanServer } fails. Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -36,7 +36,7 @@ /** * Construct a JMXExposingComponentAdapterFactory. * @param mBeanServer The {@link MBeanServer} used for registering the MBean. - * @param providers An array with providers for converting the addComponent instance into a + * @param providers An array with providers for converting the component instance into a * {@link javax.management.DynamicMBean}. * @throws NullPointerException Thrown if the {@link MBeanServer} or the array with the {@link DynamicMBeanProvider} * instances is null. @@ -54,7 +54,7 @@ /** * Construct a JMXExposingComponentAdapterFactory. This instance uses a {@link DynamicMBeanComponentProvider} as - * default to register any addComponent instance in the {@link MBeanServer}, that is already a + * default to register any component instance in the {@link MBeanServer}, that is already a * {@link javax.management.DynamicMBean}. * @param mBeanServer The {@link MBeanServer} used for registering the MBean. * @throws NullPointerException Thrown if the {@link MBeanServer} or the array with the {@link DynamicMBeanProvider} Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXRegistrationException.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXRegistrationException.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXRegistrationException.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -14,7 +14,7 @@ /** - * A registration exception caused trying to register the addComponent with JMX. + * A registration exception caused trying to register the component with JMX. * @author Michael Ward * @version $Revision$ */ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXVisitor.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXVisitor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/JMXVisitor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -40,7 +40,7 @@ private PicoContainer picoContainer; /** - * Construct a JMXVisitor. This instance will register by default any addComponent in the {@link MBeanServer}, that is + * Construct a JMXVisitor. This instance will register by default any component in the {@link MBeanServer}, that is * already a {@link DynamicMBean}. The {@link ObjectName} will use the default domain of the MBeanServer and has a * <em>type</em> key with the class name (without package name) as value. * @param server The {@link MBeanServer}to use for registering the MBeans. @@ -95,7 +95,7 @@ } /** - * Register the addComponent as MBean. The implementation uses the known DynamicMBeanProvider instances to get the + * Register the component as MBean. The implementation uses the known DynamicMBeanProvider instances to get the * MBean from the addComponent. * @see org.picocontainer.PicoVisitor#visitComponentAdapter(org.picocontainer.ComponentAdapter) */ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ObjectNameFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ObjectNameFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/ObjectNameFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,7 +24,7 @@ /** * Create an ObjectName. - * @param key The key of the addComponent within PicoContainer. + * @param key The key of the component within PicoContainer. * @param mBean The instance of the DynamicMBean. * @return Returns the Object Name for the DynamicMBean. * @throws MalformedObjectNameException Thrown for an invalid part in the {@link ObjectName}. Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/PredefinedObjectNameFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/PredefinedObjectNameFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/PredefinedObjectNameFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -15,7 +15,7 @@ /** - * An ObjectNameFactory, that uses the key of the Pico addComponent as {@link ObjectName}, if the key is of this type. + * An ObjectNameFactory, that uses the key of the Pico component as {@link ObjectName}, if the key is of this type. * @author Jörg Schaible * @since 1.0 */ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/RegisteredMBeanConstructingProvider.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/RegisteredMBeanConstructingProvider.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/RegisteredMBeanConstructingProvider.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -51,7 +51,7 @@ /** * Provide a DynamicMBean for the given Pico addComponent. The implementation will lookup the addComponent's key in the * internal registry. Only components that were registered with additional information will be considered and a - * {@link DynamicMBean} will be created for them using the {@link DynamicMBeanFactory}. If the addComponent key is of + * {@link DynamicMBean} will be created for them using the {@link DynamicMBeanFactory}. If the component key is of * type class, it is used as management interface. * @see org.nanocontainer.remoting.jmx.DynamicMBeanProvider#provide(PicoContainer, ComponentAdapter) */ @@ -73,7 +73,7 @@ } /** - * Register a specific Pico addComponent by key with an MBeanInfo and an ObjectName. + * Register a specific Pico component by key with an MBeanInfo and an ObjectName. * @param componentKey The key of the Pico addComponent. * @param objectName The {@link ObjectName} of the MBean. * @param management The management interface. @@ -85,7 +85,7 @@ } /** - * Register a specific Pico addComponent by key with an MBeanInfo and an ObjectName. + * Register a specific Pico component by key with an MBeanInfo and an ObjectName. * @param componentKey The key of the Pico addComponent. * @param objectName The {@link ObjectName} of the MBean. * @param mBeanInfo The {@link MBeanInfo} of the MBean. @@ -95,7 +95,7 @@ } /** - * Register a specific Pico addComponent with an MBeanInfo and an ObjectName. The implementation class of the + * Register a specific Pico component with an MBeanInfo and an ObjectName. The implementation class of the * {@link DynamicMBean} must be the key of the Pico addComponent. * @param objectName The {@link ObjectName} of the MBean. * @param mBeanInfo The {@link MBeanInfo} of the MBean. @@ -109,7 +109,7 @@ } /** - * Register a specific Pico addComponent by key with an ObjectName. + * Register a specific Pico component by key with an ObjectName. * @param componentKey The key of the Pico addComponent. * @param objectName The {@link ObjectName} of the MBean. */ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/StandardMBeanFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/StandardMBeanFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/StandardMBeanFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -26,7 +26,7 @@ /** * A factory for DynamicMBeans, that creates MBean instances using the classes {@link StandardMBean} and * {@link ModelMBean} provided by the JMX specification. The implementation offers special support for StandardMBeans - * following the naming convention for their management interface using the class name of the addComponent with an appended + * following the naming convention for their management interface using the class name of the component with an appended * <em>MBean</em>. * @author Michael Ward * @author Jörg Schaible Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/mx4j/MX4JDynamicMBeanFactory.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/mx4j/MX4JDynamicMBeanFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/java/org/nanocontainer/remoting/jmx/mx4j/MX4JDynamicMBeanFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -19,7 +19,7 @@ /** * This is the a factory for creating DynamicMBean instances. However it is tied specifically to MX4J. Those not * interested in being dependent on MX4J should implement another Factory and register it to the container. The single - * difference to the StandardMBeanFactory is, that it does not need a special management interface for a addComponent to + * difference to the StandardMBeanFactory is, that it does not need a special management interface for a component to * expose. * @author Michael Ward * @version $Revision$ Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/testmodel/PersonMBeanDescription.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/testmodel/PersonMBeanDescription.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/testmodel/PersonMBeanDescription.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -19,7 +19,7 @@ /** * MBean description used automatically for StandardMBeans by MX4J. Note: This will only work if MX4J provides * javax.management.StandardMBean. With J2SE 5 you will always use the classes from the JDK and therefore the mechanism - * fails. The addComponent will still be exposed as bean, but no description for the exposed parts will be available. + * fails. The component will still be exposed as bean, but no description for the exposed parts will be available. * @author Jörg Schaible */ public final class PersonMBeanDescription extends MBeanDescriptionAdapter { Modified: java/sandbox/baby-steps/nanoextras2/tools/tools/src/java/org/nanocontainer/tools/ant/Component.java (3509 => 3510) --- java/sandbox/baby-steps/nanoextras2/tools/tools/src/java/org/nanocontainer/tools/ant/Component.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/nanoextras2/tools/tools/src/java/org/nanocontainer/tools/ant/Component.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -17,7 +17,7 @@ /** * Instantiated by ant when the PicoContainer task element has a <addComponent> - * element. Holds class name of the addComponent and additional properties. + * element. Holds class name of the component and additional properties. * * @author Aslak Hellesøy * @version $Revision$ Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/BeanPropertyComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/BeanPropertyComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/BeanPropertyComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,13 +24,13 @@ import org.picocontainer.behaviors.CachingBehavior; /** - * Decorating addComponent addAdapter that can be used to set additional properties - * on a addComponent in a bean style. These properties must be managed manually + * Decorating component adapter that can be used to set additional properties + * on a component in a bean style. These properties must be managed manually * by the user of the API, and will not be managed by PicoContainer. This class * is therefore <em>not</em> the same as {@link SetterInjector}, * which is a true Setter Injection addAdapter. * <p/> - * This addAdapter is mostly handy for setting various primitive properties via setters; + * This adapter is mostly handy for setting various primitive properties via setters; * it is also able to set javabean properties by discovering an appropriate * {@link PropertyEditor} and using its <code>setAsText</code> method. * <p/> @@ -58,9 +58,9 @@ } /** - * Get a addComponent instance and set given property values. + * Get a component instance and set given property values. * - * @return the addComponent instance with any properties of the properties map set. + * @return the component instance with any properties of the properties map set. * @throws PicoInitializationException {@inheritDoc} * @throws PicoIntrospectionException {@inheritDoc} * @throws org.picocontainer.PicoRegistrationException @@ -149,8 +149,8 @@ if (result == null) { - // check if the propertyValue is a key of a addComponent in the container - // if so, the typeName of the addComponent and the setters parameter typeName + // check if the propertyValue is a key of a component in the container + // if so, the typeName of the component and the setters parameter typeName // have to be compatible // TODO: null check only because of test-case, otherwise null is impossible @@ -235,12 +235,12 @@ /** * Converts and validates the given property value to an appropriate object * for calling the bean's setter. - * @param propertyName String the property name on the addComponent that + * @param propertyName String the property name on the component that * we will be setting the value to. * @param propertyValue Object the property value that we've been given. It * may need conversion to be formed into the value we need for the - * addComponent instance setter. - * @param componentInstance the addComponent that we're looking to provide + * component instance setter. + * @param componentInstance the component that we're looking to provide * the setter to. * @return Object: the final converted object that can * be used in the setter. Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -10,8 +10,8 @@ import org.picocontainer.behaviors.CachingBehavior; /** - * A addComponent addAdapter is responsible for providing a specific addComponent instance. An instance of an implementation of - * this interface is used inside a {@link PicoContainer} for every registered addComponent or instance. Each + * A component adapter is responsible for providing a specific component instance. An instance of an implementation of + * this interface is used inside a {@link PicoContainer} for every registered component or instance. Each * <code>ComponentAdapter</code> instance has to have a key which is unique within that container. The key itself is * either a class type (normally an interface) or an identifier. * @@ -41,21 +41,21 @@ Class<T> getComponentImplementation(); /** - * Retrieve the addComponent instance. This method will usually create a new instance each time it is called, but that + * Retrieve the component instance. This method will usually create a new instance each time it is called, but that * is not required. For example, {@link CachingBehavior} will always return the * same instance. * * @param container the {@link PicoContainer}, that is used to resolve any possible dependencies of the instance. - * @return the addComponent instance. - * @throws PicoInitializationException if the addComponent could not be instantiated. - * @throws PicoIntrospectionException if the addComponent has dependencies which could not be resolved, or - * instantiation of the addComponent lead to an ambigous situation within the + * @return the component instance. + * @throws PicoInitializationException if the component could not be instantiated. + * @throws PicoIntrospectionException if the component has dependencies which could not be resolved, or + * instantiation of the component lead to an ambigous situation within the * container. */ T getComponentInstance(PicoContainer container) throws PicoInitializationException, PicoIntrospectionException; /** - * Verify that all dependencies for this addAdapter can be satisifed. Normally, the addAdapter should verify this by + * Verify that all dependencies for this adapter can be satisifed. Normally, the adapter should verify this by * checking that the associated PicoContainer contains all the needed dependnecies. * * @param container the {@link PicoContainer}, that is used to resolve any possible dependencies of the instance. Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,7 +18,7 @@ /** * <p/> - * A addComponent addAdapter factory is responsible for creating + * A component adapter factory is responsible for creating * {@link ComponentAdapter} component adapters. The main use of the component adapter factory is * inside {@link DefaultPicoContainer#DefaultPicoContainer(ComponentFactory)}, where it can * be used to customize the default component adapter that is used when none is specified @@ -32,7 +32,7 @@ public interface ComponentFactory { /** - * Create a new addComponent addAdapter based on the specified arguments. + * Create a new component adapter based on the specified arguments. * * @param componentMonitor * @param lifecycleStrategy @@ -43,10 +43,10 @@ * This value should be returned from a call to * {@link org.picocontainer.ComponentAdapter#getComponentImplementation()} on the created addAdapter. Should not * be null. - * @param parameters additional parameters to use by the addComponent addAdapter in constructing - * addComponent instances. These may be used, for example, to make decisions about the - * arguments passed into the addComponent constructor. These should be considered hints; they - * may be ignored by some implementations. May be null, and may be of zero length. @return a new addComponent addAdapter based on the specified arguments. Should not return null. @throws PicoIntrospectionException if the creation of the addComponent addAdapter results in a + * @param parameters additional parameters to use by the component adapter in constructing + * component instances. These may be used, for example, to make decisions about the + * arguments passed into the component constructor. These should be considered hints; they + * may be ignored by some implementations. May be null, and may be of zero length. @return a new component adapter based on the specified arguments. Should not return null. @throws PicoIntrospectionException if the creation of the component adapter results in a * {@link PicoIntrospectionException}. * @return The component adapter * @throws org.picocontainer.PicoRegistrationException Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitor.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -14,7 +14,7 @@ import java.lang.reflect.Method; /** - * A addComponent monitor is responsible for monitoring the addComponent instantiation + * A component monitor is responsible for monitoring the component instantiation * and method invocation. * * @author Paul Hammant @@ -27,18 +27,18 @@ public interface ComponentMonitor { /** - * Event thrown as the addComponent is being instantiated using the given constructor + * Event thrown as the component is being instantiated using the given constructor * * @param constructor the Constructor used to instantiate the addComponent */ void instantiating(Constructor constructor); /** - * Event thrown after the addComponent has been instantiated using the given constructor. + * Event thrown after the component has been instantiated using the given constructor. * This should be called for both Constructor and Setter DI. * * @param constructor the Constructor used to instantiate the addComponent - * @param instantiated the addComponent that was instantiated by PicoContainer + * @param instantiated the component that was instantiated by PicoContainer * @param injected the components during instantiation. * @param duration the duration in millis of the instantiation * @since 1.3 @@ -47,7 +47,7 @@ void instantiated(Constructor constructor, Object instantiated, Object[] injected, long duration); /** - * Event thrown if the addComponent instantiation failed using the given constructor + * Event thrown if the component instantiation failed using the given constructor * * @param constructor the Constructor used to instantiate the addComponent * @param cause the Exception detailing the cause of the failure @@ -55,27 +55,27 @@ void instantiationFailed(Constructor constructor, Exception cause); /** - * Event thrown as the addComponent method is being invoked on the given instance + * Event thrown as the component method is being invoked on the given instance * - * @param method the Method invoked on the addComponent instance - * @param instance the addComponent instance + * @param method the Method invoked on the component instance + * @param instance the component instance */ void invoking(Method method, Object instance); /** - * Event thrown after the addComponent method has been invoked on the given instance + * Event thrown after the component method has been invoked on the given instance * - * @param method the Method invoked on the addComponent instance - * @param instance the addComponent instance + * @param method the Method invoked on the component instance + * @param instance the component instance * @param duration the duration in millis of the invocation */ void invoked(Method method, Object instance, long duration); /** - * Event thrown if the addComponent method invocation failed on the given instance + * Event thrown if the component method invocation failed on the given instance * - * @param method the Method invoked on the addComponent instance - * @param instance the addComponent instance + * @param method the Method invoked on the component instance + * @param instance the component instance * @param cause the Exception detailing the cause of the failure */ void invocationFailed(Method method, Object instance, Exception cause); @@ -84,8 +84,8 @@ * Event thrown if a lifecycle method invocation - start, stop or dispose - * failed on the given instance * - * @param method the lifecycle Method invoked on the addComponent instance - * @param instance the addComponent instance + * @param method the lifecycle Method invoked on the component instance + * @param instance the component instance * @param cause the RuntimeException detailing the cause of the failure */ void lifecycleInvocationFailed(Method method, Object instance, RuntimeException cause); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitorStrategy.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitorStrategy.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentMonitorStrategy.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -14,7 +14,7 @@ * <p> * Interface responsible for changing monitoring strategy. * It may be implemented by {@link org.picocontainer.PicoContainer containers} and - * single {@link org.picocontainer.ComponentAdapter addComponent adapters}. + * single {@link org.picocontainer.ComponentAdapter component adapters}. * The choice of supporting the monitor strategy is left to the * implementers of the container and adapters. * </p> @@ -28,7 +28,7 @@ public interface ComponentMonitorStrategy { /** - * Changes the addComponent monitor used + * Changes the component monitor used * @param monitor the new ComponentMonitor to use */ void changeMonitor(ComponentMonitor monitor); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -102,7 +102,7 @@ * </em> * * @param componentAdapterFactory the factory to use for creation of ComponentAdapters. - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(ComponentFactory componentAdapterFactory, PicoContainer parent) { this(componentAdapterFactory, new StartableLifecycleStrategy(NullComponentMonitor.getInstance()), parent, NullComponentMonitor.getInstance()); @@ -123,7 +123,7 @@ * @param lifecycleStrategy * the lifecylce strategy chosen for regiered * instance (not implementations!) - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(ComponentFactory componentAdapterFactory, LifecycleStrategy lifecycleStrategy, @@ -153,7 +153,7 @@ * custom ComponentMonitor * * @param monitor the ComponentMonitor to use - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(ComponentMonitor monitor, PicoContainer parent) { this(new CachingBehaviorFactory().forThis(new AnyInjectionFactory()), new StartableLifecycleStrategy(monitor), parent, monitor); @@ -165,7 +165,7 @@ * * @param monitor the ComponentMonitor to use * @param lifecycleStrategy the lifecycle strategy to use. - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(ComponentMonitor monitor, LifecycleStrategy lifecycleStrategy, PicoContainer parent) { this(new CachingBehaviorFactory().forThis(new AnyInjectionFactory()), lifecycleStrategy, parent, monitor); @@ -176,7 +176,7 @@ * custom lifecycle strategy * * @param lifecycleStrategy the lifecycle strategy to use. - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(LifecycleStrategy lifecycleStrategy, PicoContainer parent) { this(NullComponentMonitor.getInstance(), lifecycleStrategy, parent); @@ -206,7 +206,7 @@ * Creates a new container with a (caching) {@link AnyInjectionFactory} * and a parent container. * - * @param parent the parent container (used for addComponent dependency lookups). + * @param parent the parent container (used for component dependency lookups). */ public DefaultPicoContainer(PicoContainer parent) { this(new CachingBehaviorFactory().forThis(new AnyInjectionFactory()), parent); @@ -466,7 +466,7 @@ * The starting of the child container is only attempted if the parent * container start successfully. The child container for which start is attempted * is tracked so that upon stop, only those need to be stopped. - * The lifecycle operation is delegated to the addComponent addAdapter, + * The lifecycle operation is delegated to the component addAdapter, * if it is an instance of {@link LifecycleManager lifecycle manager}. * The actual {@link LifecycleStrategy lifecycle strategy} supported * depends on the concrete implementation of the addAdapter. @@ -495,7 +495,7 @@ * Stop the components of this PicoContainer and all its logical child containers. * The stopping of the child containers is only attempted for those that have been * started, possibly not successfully. - * The lifecycle operation is delegated to the addComponent addAdapter, + * The lifecycle operation is delegated to the component addAdapter, * if it is an instance of {@link LifecycleManager lifecycle manager}. * The actual {@link LifecycleStrategy lifecycle strategy} supported * depends on the concrete implementation of the addAdapter. @@ -534,7 +534,7 @@ /** * Dispose the components of this PicoContainer and all its logical child containers. - * The lifecycle operation is delegated to the addComponent addAdapter, + * The lifecycle operation is delegated to the component addAdapter, * if it is an instance of {@link LifecycleManager lifecycle manager}. * The actual {@link LifecycleStrategy lifecycle strategy} supported * depends on the concrete implementation of the addAdapter. @@ -606,7 +606,7 @@ } /** - * Changes monitor in the ComponentAdapterFactory, the addComponent adapters + * Changes monitor in the ComponentAdapterFactory, the component adapters * and the child containers, if these support a ComponentMonitorStrategy. * {@inheritDoc} */ @@ -628,11 +628,11 @@ } /** - * Returns the first current monitor found in the ComponentAdapterFactory, the addComponent adapters + * Returns the first current monitor found in the ComponentAdapterFactory, the component adapters * and the child containers, if these support a ComponentMonitorStrategy. * {@inheritDoc} * - * @throws PicoIntrospectionException if no addComponent monitor is found in container or its children + * @throws PicoIntrospectionException if no component monitor is found in container or its children */ public ComponentMonitor currentMonitor() { return componentMonitor; @@ -640,9 +640,9 @@ /** * <p> - * Implementation of lifecycle manager which delegates to the container's addComponent adapters. - * The addComponent adapters will be ordered by dependency as registered in the container. - * This LifecycleManager will delegate calls on the lifecycle methods to the addComponent adapters + * Implementation of lifecycle manager which delegates to the container's component adapters. + * The component adapters will be ordered by dependency as registered in the container. + * This LifecycleManager will delegate calls on the lifecycle methods to the component adapters * if these are themselves LifecycleManagers. * </p> * @@ -656,7 +656,7 @@ /** * {@inheritDoc} - * Loops over all addComponent adapters and invokes + * Loops over all component adapters and invokes * start(PicoContainer) method on the ones which are LifecycleManagers */ public void start(PicoContainer node) { @@ -685,7 +685,7 @@ /** * {@inheritDoc} - * Loops over started addComponent adapters (in inverse order) and invokes + * Loops over started component adapters (in inverse order) and invokes * stop(PicoContainer) method on the ones which are LifecycleManagers */ public void stop(PicoContainer node) { @@ -701,7 +701,7 @@ /** * {@inheritDoc} - * Loops over all addComponent adapters (in inverse order) and invokes + * Loops over all component adapters (in inverse order) and invokes * dispose(PicoContainer) method on the ones which are LifecycleManagers */ public void dispose(PicoContainer node) { Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Disposable.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Disposable.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Disposable.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,7 +12,7 @@ /** * An interface which is implemented by components that need to dispose of resources during the shutdown of that * addComponent. The {@link Disposable#dispose()} must be called once during shutdown, directly after {@link - * Startable#stop()} (if the addComponent implements the {@link Startable} interface). + * Startable#stop()} (if the component implements the {@link Startable} interface). * @version $Revision$ * @see org.picocontainer.Startable the Startable interface if you need to <code>start()</code> and * <code>stop()</code> semantics. @@ -22,7 +22,7 @@ */ public interface Disposable { /** - * Dispose this addComponent. The addComponent should deallocate all resources. The contract for this method defines a + * Dispose this addComponent. The component should deallocate all resources. The contract for this method defines a * single call at the end of this addComponent's life. */ void dispose(); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleManager.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleManager.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleManager.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,8 +12,8 @@ /** * A manager for the lifecycle of a container's components. - * The lifecycle manager is implemented by the addComponent adapters - * which will resolve the dependencies of the addComponent instance and + * The lifecycle manager is implemented by the component adapters + * which will resolve the dependencies of the component instance and * delegate the implementation of the lifecycle control to the * {@link LifecycleStrategy lifecycle strategy}. * @@ -45,8 +45,8 @@ void dispose(PicoContainer container); /** - * Test if a container's addComponent has a lifecycle. - * @return <code>true</code> if the addComponent has a lifecycle + * Test if a container's component has a lifecycle. + * @return <code>true</code> if the component has a lifecycle */ boolean hasLifecycle(); } Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleStrategy.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleStrategy.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/LifecycleStrategy.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -8,9 +8,9 @@ package org.picocontainer; /** - * An interface which specifies the lifecyle strategy on the addComponent instance. - * Lifecycle strategies are used by addComponent adapters to delegate the lifecyle - * operations on the addComponent instances. + * An interface which specifies the lifecyle strategy on the component instance. + * Lifecycle strategies are used by component adapters to delegate the lifecyle + * operations on the component instances. * * @author Paul Hammant * @author Peter Royal @@ -22,34 +22,34 @@ public interface LifecycleStrategy { /** - * Invoke the "start" method on the addComponent instance if this is startable. + * Invoke the "start" method on the component instance if this is startable. * It is up to the implementation of the strategy what "start" and "startable" means. * - * @param component the instance of the addComponent to start + * @param component the instance of the component to start */ void start(Object component); /** - * Invoke the "stop" method on the addComponent instance if this is stoppable. + * Invoke the "stop" method on the component instance if this is stoppable. * It is up to the implementation of the strategy what "stop" and "stoppable" means. * - * @param component the instance of the addComponent to stop + * @param component the instance of the component to stop */ void stop(Object component); /** - * Invoke the "dispose" method on the addComponent instance if this is disposable. + * Invoke the "dispose" method on the component instance if this is disposable. * It is up to the implementation of the strategy what "dispose" and "disposable" means. * - * @param component the instance of the addComponent to dispose + * @param component the instance of the component to dispose */ void dispose(Object component); /** - * Test if a addComponent instance has a lifecycle. + * Test if a component instance has a lifecycle. * @param type the addComponent's type * - * @return <code>true</code> if the addComponent has a lifecycle + * @return <code>true</code> if the component has a lifecycle */ boolean hasLifecycle(Class type); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/MutablePicoContainer.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/MutablePicoContainer.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/MutablePicoContainer.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -23,7 +23,7 @@ public interface MutablePicoContainer extends PicoContainer, Startable, Disposable { /** - * Register a addComponent and creates specific instructions on which constructor to use, along with + * Register a component and creates specific instructions on which constructor to use, along with * which components and/or constants to provide as constructor arguments. These "directives" are * provided through an array of <tt>Parameter</tt> objects. Parameter[0] correspondes to the first constructor * argument, Parameter[N] corresponds to the N+1th constructor argument. @@ -32,10 +32,10 @@ * <li><strong>Partial Autowiring: </strong>If you have two constructor args to match and you only wish to specify one of the constructors and * let PicoContainer wire the other one, you can use as parameters: * <code><strong>new ComponentParameter()</strong>, new ComponentParameter("someService")</code> - * The default constructor for the addComponent parameter indicates auto-wiring should take place for + * The default constructor for the component parameter indicates auto-wiring should take place for * that parameter. * </li> - * <li><strong>Force No-Arg constructor usage:</strong> If you wish to force a addComponent to be constructed with + * <li><strong>Force No-Arg constructor usage:</strong> If you wish to force a component to be constructed with * the no-arg constructor, use a zero length Parameter array. Ex: <code>new Parameter[0]</code> * <ul> * @@ -51,9 +51,9 @@ * * @return the ComponentAdapter that has been associated with this addComponent. In the majority of cases, this return * value can be safely ignored, as one of the <code>getXXX()</code> methods of the - * {@link PicoContainer} interface can be used to retrieve a reference to the addComponent later on. + * {@link PicoContainer} interface can be used to retrieve a reference to the component later on. * - * @throws PicoRegistrationException if registration of the addComponent fails. + * @throws PicoRegistrationException if registration of the component fails. * @see org.picocontainer.Parameter * @see org.picocontainer.parameters.ConstantParameter * @see org.picocontainer.parameters.ComponentParameter @@ -70,37 +70,37 @@ * * @return the ComponentAdapter that has been associated with this addComponent. In the majority of cases, this return * value can be safely ignored, as one of the <code>getXXX()</code> methods of the - * {@link PicoContainer} interface can be used to retrieve a reference to the addComponent later on. + * {@link PicoContainer} interface can be used to retrieve a reference to the component later on. * * @throws PicoRegistrationException if registration fails. */ MutablePicoContainer addComponent(Object implOrInstance); /** - * Register a addComponent via a ComponentAdapter. Use this if you need fine grained control over what + * Register a component via a ComponentAdapter. Use this if you need fine grained control over what * ComponentAdapter to use for a specific addComponent. * * @param componentAdapter the addAdapter * - * @return the same addAdapter that was passed as an argument. + * @return the same adapter that was passed as an argument. * * @throws PicoRegistrationException if registration fails. */ MutablePicoContainer addAdapter(ComponentAdapter componentAdapter); /** - * Unregister a addComponent by key. + * Unregister a component by key. * - * @param componentKey key of the addComponent to unregister. + * @param componentKey key of the component to unregister. * * @return the ComponentAdapter that was associated with this addComponent. */ ComponentAdapter removeComponent(Object componentKey); /** - * Unregister a addComponent by instance. + * Unregister a component by instance. * - * @param componentInstance the addComponent instance to unregister. + * @param componentInstance the component instance to unregister. * * @return the ComponentAdapter that was associated with this addComponent. */ @@ -145,7 +145,7 @@ boolean removeChildContainer(PicoContainer child); /** - * Following an addAdapter or addComponent, pico holds onto the last ComponentAdapter and return it if this + * Following an adapter or addComponent, pico holds onto the last ComponentAdapter and return it if this * method is immediately after the add operation. It will be null at all other times. * * @return the last ComponentAdapter to be made Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Parameter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Parameter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Parameter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -42,7 +42,7 @@ * * @return the instance or <code>null</code> if no suitable instance can be found. * - * @throws PicoInitializationException if a referenced addComponent could not be instantiated. + * @throws PicoInitializationException if a referenced component could not be instantiated. * @since 1.1 */ Object resolveInstance(PicoContainer container, @@ -58,7 +58,7 @@ * @param expectedType the required type * @param expectedParameterName Expected parameter name * - * @return <code>true</code> if the addComponent parameter can be resolved. + * @return <code>true</code> if the component parameter can be resolved. * * @since 1.1 */ Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoContainer.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoContainer.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoContainer.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -14,7 +14,7 @@ /** - * This is the core interface for PicoContainer. It is used to retrieve addComponent instances from the container; it only + * This is the core interface for PicoContainer. It is used to retrieve component instances from the container; it only * has accessor methods (in addition to the {@link #accept(PicoVisitor)} method). In order to register components in a * PicoContainer, use a {@link MutablePicoContainer}, such as {@link DefaultPicoContainer}. * @@ -29,11 +29,11 @@ public interface PicoContainer { /** - * Retrieve a addComponent instance registered with a specific key or type. If a addComponent cannot be found in this container, + * Retrieve a component instance registered with a specific key or type. If a component cannot be found in this container, * the parent container (if one exists) will be searched. * - * @param componentKeyOrType the key or Type that the addComponent was registered with. - * @return an instantiated addComponent, or <code>null</code> if no addComponent has been registered for the specified + * @param componentKeyOrType the key or Type that the component was registered with. + * @return an instantiated addComponent, or <code>null</code> if no component has been registered for the specified * key. */ Object getComponent(Object componentKeyOrType); @@ -42,11 +42,11 @@ /** - * Retrieve all the registered addComponent instances in the container, (not including those in the parent container). + * Retrieve all the registered component instances in the container, (not including those in the parent container). * The components are returned in their order of instantiation, which depends on the dependency order between them. * * @return all the components. - * @throws PicoException if the instantiation of the addComponent fails + * @throws PicoException if the instantiation of the component fails */ List getComponents(); @@ -58,38 +58,38 @@ PicoContainer getParent(); /** - * Find a addComponent addAdapter associated with the specified key. If a addComponent addAdapter cannot be found in this + * Find a component adapter associated with the specified key. If a component adapter cannot be found in this * container, the parent container (if one exists) will be searched. * - * @param componentKey the key that the addComponent was registered with. - * @return the addComponent addAdapter associated with this key, or <code>null</code> if no addComponent has been + * @param componentKey the key that the component was registered with. + * @return the component adapter associated with this key, or <code>null</code> if no component has been * registered for the specified key. */ ComponentAdapter<?> getComponentAdapter(Object componentKey); /** - * Find a addComponent addAdapter associated with the specified type. If a addComponent addAdapter cannot be found in this + * Find a component adapter associated with the specified type. If a component adapter cannot be found in this * container, the parent container (if one exists) will be searched. * * @param componentType the type of the addComponent. - * @return the addComponent addAdapter associated with this class, or <code>null</code> if no addComponent has been + * @return the component adapter associated with this class, or <code>null</code> if no component has been * registered for the specified key. */ <T> ComponentAdapter<T> getComponentAdapter(Class<T> componentType); /** - * Retrieve all the addComponent adapters inside this container. The addComponent adapters from the parent container are + * Retrieve all the component adapters inside this container. The component adapters from the parent container are * not returned. * * @return a collection containing all the {@link ComponentAdapter}s inside this container. The collection will not * be modifiable. - * @see #getComponentAdapters(Class) a variant of this method which returns the addComponent adapters inside this + * @see #getComponentAdapters(Class) a variant of this method which returns the component adapters inside this * container that are associated with the specified type. */ Collection<ComponentAdapter<?>> getComponentAdapters(); /** - * Retrieve all addComponent adapters inside this container that are associated with the specified type. The addComponent + * Retrieve all component adapters inside this container that are associated with the specified type. The addComponent * adapters from the parent container are not returned. * * @param componentType the type of the components. @@ -104,13 +104,13 @@ * * @param componentType the searched type. * @return a List of components. - * @throws PicoException if the instantiation of a addComponent fails + * @throws PicoException if the instantiation of a component fails * @since 1.1 */ <T> List<T> getComponents(Class<T> componentType); /** - * Accepts a visitor that should visit the child containers, addComponent adapters and addComponent instances. + * Accepts a visitor that should visit the child containers, component adapters and component instances. * * @param visitor the visitor * @since 1.1 Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoRegistrationException.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoRegistrationException.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/PicoRegistrationException.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,8 +11,8 @@ package org.picocontainer; /** - * Subclass of {@link PicoException} that is thrown when there is a problem registering a addComponent with the container - * or another part of the PicoContainer API, for example, when a request for a addComponent is ambiguous. + * Subclass of {@link PicoException} that is thrown when there is a problem registering a component with the container + * or another part of the PicoContainer API, for example, when a request for a component is ambiguous. * * @version $Revision$ * @since 1.0 Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Startable.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Startable.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/Startable.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -12,9 +12,9 @@ /** * <p>An interface which is implemented by components that can be started and stopped. The {@link Startable#start()} - * must be called at the begin of the addComponent lifecycle. It can be called again only after a call to - * {@link Startable#stop()}. The {@link Startable#stop()} method must be called at the end of the addComponent lifecycle, - * and can further be called after every {@link Startable#start()}. If a addComponent implements the {@link Disposable} + * must be called at the begin of the component lifecycle. It can be called again only after a call to + * {@link Startable#stop()}. The {@link Startable#stop()} method must be called at the end of the component lifecycle, + * and can further be called after every {@link Startable#start()}. If a component implements the {@link Disposable} * interface as well, {@link Startable#stop()} should be called before {@link Disposable#dispose()}.</p> * <p/> * <p>For more advanced and pluggable lifecycle support, see the functionality offered by picocontainer-gems Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/AbstractAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/AbstractAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/AbstractAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -21,7 +21,7 @@ /** * Base class for a ComponentAdapter with general functionality. * This implementation provides basic checks for a healthy implementation of a ComponentAdapter. - * It does not allow to use <code>null</code> for the addComponent key or the implementation, + * It does not allow to use <code>null</code> for the component key or the implementation, * ensures that the implementation is a concrete class and that the key is assignable from the * implementation if the key represents a type. * Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/InstanceAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/InstanceAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/adapters/InstanceAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,13 +18,13 @@ /** * <p> - * Component addAdapter which wraps a addComponent instance. + * Component adapter which wraps a component instance. * </p> * <p> - * This addComponent addAdapter supports both a {@link LifecycleManager LifecycleManager} and a + * This component adapter supports both a {@link LifecycleManager LifecycleManager} and a * {@link org.picocontainer.LifecycleStrategy LifecycleStrategy} to control the lifecycle of the addComponent. * The lifecycle manager methods simply delegate to the lifecycle strategy methods - * on the addComponent instance. + * on the component instance. * </p> * * @author Aslak Hellesøy Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,15 +24,15 @@ /** * <p> - * Component addAdapter which decorates another addAdapter. + * Component adapter which decorates another addAdapter. * </p> * <p> - * This addAdapter supports a {@link org.picocontainer.ComponentMonitorStrategy addComponent monitor strategy} + * This adapter supports a {@link org.picocontainer.ComponentMonitorStrategy component monitor strategy} * and will propagate change of monitor to the delegate if the delegate itself * support the monitor strategy. * </p> * <p> - * This addAdapter also supports a {@link LifecycleManager lifecycle manager} and a + * This adapter also supports a {@link LifecycleManager lifecycle manager} and a * {@link org.picocontainer.LifecycleStrategy lifecycle strategy} if the delegate does. * </p> * @@ -77,7 +77,7 @@ /** * Delegates change of monitor if the delegate supports - * a addComponent monitor strategy. + * a component monitor strategy. * {@inheritDoc} */ public void changeMonitor(ComponentMonitor monitor) { @@ -88,15 +88,15 @@ /** * Returns delegate's current monitor if the delegate supports - * a addComponent monitor strategy. + * a component monitor strategy. * {@inheritDoc} - * @throws PicoIntrospectionException if no addComponent monitor is found in delegate + * @throws PicoIntrospectionException if no component monitor is found in delegate */ public ComponentMonitor currentMonitor() { if ( delegate instanceof ComponentMonitorStrategy ){ return ((ComponentMonitorStrategy)delegate).currentMonitor(); } - throw new PicoIntrospectionException("No addComponent monitor found in delegate"); + throw new PicoIntrospectionException("No component monitor found in delegate"); } // ~~~~~~~~ LifecylceManager ~~~~~~~~ Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/CachingBehavior.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/CachingBehavior.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/CachingBehavior.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,11 +24,11 @@ /** * <p> - * {@link ComponentAdapter} implementation that caches the addComponent instance. + * {@link ComponentAdapter} implementation that caches the component instance. * </p> * <p> * This adapter supports components with a lifecycle, as it is a {@link LifecycleManager lifecycle manager} - * which will apply the delegate's {@link org.picocontainer.LifecycleStrategy lifecycle strategy} to the cached addComponent instance. + * which will apply the delegate's {@link org.picocontainer.LifecycleStrategy lifecycle strategy} to the cached component instance. * The lifecycle state is maintained so that the component instance behaves in the expected way: * it can't be started if already started, it can't be started or stopped if disposed, it can't * be stopped if not started, it can't be disposed if already disposed. @@ -69,7 +69,7 @@ /** * Flushes the cache. - * If the addComponent instance is started is will stop and dispose it before + * If the component instance is started is will stop and dispose it before * flushing the cache. */ public void flush() { @@ -82,7 +82,7 @@ } /** - * Starts the cached addComponent instance + * Starts the cached component instance * {@inheritDoc} */ public void start(PicoContainer container) { @@ -95,7 +95,7 @@ } /** - * Stops the cached addComponent instance + * Stops the cached component instance * {@inheritDoc} */ public void stop(PicoContainer container) { @@ -108,7 +108,7 @@ } /** - * Disposes the cached addComponent instance + * Disposes the cached component instance * {@inheritDoc} */ public void dispose(PicoContainer container) { Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/ImplementationHidingBehavior.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/ImplementationHidingBehavior.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/behaviors/ImplementationHidingBehavior.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -23,7 +23,7 @@ import org.picocontainer.behaviors.AbstractBehavior; /** - * This addComponent addAdapter makes it possible to hide the implementation + * This component adapter makes it possible to hide the implementation * of a real subject (behind a proxy) provided the key is an interface. * <p/> * This class exists here, because a) it has no deps on external jars, b) dynamic proxy is quite easy. @@ -38,7 +38,7 @@ /** * Creates an ImplementationHidingComponentAdapter with a delegate - * @param delegate the addComponent addAdapter to which this addAdapter delegates + * @param delegate the component adapter to which this adapter delegates */ public ImplementationHidingBehavior(ComponentAdapter delegate) { super(delegate); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AbstractInjector.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AbstractInjector.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AbstractInjector.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -59,7 +59,7 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this ComponentAdapter + * @param monitor the component monitor used by this ComponentAdapter * @param lifecycleStrategy the lifecycle strategy used by this ComponentAdapter * @throws org.picocontainer.injectors.AbstractInjector.NotConcreteRegistrationException if the implementation is not a concrete class * @throws NullPointerException if one of the parameters is <code>null</code> @@ -84,7 +84,7 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this ComponentAdapter + * @param monitor the component monitor used by this ComponentAdapter * @throws org.picocontainer.injectors.AbstractInjector.NotConcreteRegistrationException if the implementation is not a concrete class * @throws NullPointerException if one of the parameters is <code>null</code> */ @@ -107,7 +107,7 @@ } private void checkConcrete() throws NotConcreteRegistrationException { - // Assert that the addComponent class is concrete. + // Assert that the component class is concrete. boolean isAbstract = (getComponentImplementation().getModifiers() & Modifier.ABSTRACT) == Modifier.ABSTRACT; if (getComponentImplementation().isInterface() || isAbstract) { throw new NotConcreteRegistrationException(getComponentImplementation()); @@ -286,7 +286,7 @@ /** - * Construct a new exception with the ambigous class type and the ambiguous addComponent keys. + * Construct a new exception with the ambigous class type and the ambiguous component keys. * * @param ambiguousDependency the unresolved dependency type * @param componentKeys the ambiguous keys. @@ -313,7 +313,7 @@ } /** - * @return Returns the ambiguous addComponent keys as array. + * @return Returns the ambiguous component keys as array. */ public Object[] getAmbiguousComponentKeys() { return ambiguousComponentKeys; Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AnnotationInjectionFactory.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AnnotationInjectionFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/AnnotationInjectionFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -39,7 +39,7 @@ * @param componentCharacteristic * @param componentKey The addComponent's key * @param componentImplementation The class of the bean. - * @param parameters Any parameters for the setters. If null the addAdapter solves the + * @param parameters Any parameters for the setters. If null the adapter solves the * dependencies for all setters internally. Otherwise the number parameters must match * the number of the setter. @return Returns a new {@link SetterInjector}. @throws org.picocontainer.PicoIntrospectionException if dependencies cannot be solved * @throws org.picocontainer.PicoRegistrationException Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/ConstructorInjector.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/ConstructorInjector.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/ConstructorInjector.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -62,8 +62,8 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this addAdapter - * @param lifecycleStrategy the addComponent lifecycle strategy used by this addAdapter + * @param monitor the component monitor used by this addAdapter + * @param lifecycleStrategy the component lifecycle strategy used by this addAdapter * @throws org.picocontainer.injectors.AbstractInjector.NotConcreteRegistrationException * if the implementation is not a concrete class. * @throws NullPointerException if one of the parameters is <code>null</code> @@ -78,7 +78,7 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this addAdapter + * @param monitor the component monitor used by this addAdapter * @throws NotConcreteRegistrationException * if the implementation is not a concrete class. * @throws NullPointerException if one of the parameters is <code>null</code> Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjectionFactory.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjectionFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjectionFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -39,7 +39,7 @@ * @param componentCharacteristic * @param componentKey The addComponent's key * @param componentImplementation The class of the bean. - * @param parameters Any parameters for the setters. If null the addAdapter solves the + * @param parameters Any parameters for the setters. If null the adapter solves the * dependencies for all setters internally. Otherwise the number parameters must match * the number of the setter. @return Returns a new {@link SetterInjector}. @throws PicoIntrospectionException if dependencies cannot be solved * @throws org.picocontainer.PicoRegistrationException Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjector.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjector.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/injectors/SetterInjector.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -60,8 +60,8 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this addAdapter - * @param lifecycleStrategy the addComponent lifecycle strategy used by this addAdapter + * @param monitor the component monitor used by this addAdapter + * @param lifecycleStrategy the component lifecycle strategy used by this addAdapter * @throws org.picocontainer.injectors.AbstractInjector.NotConcreteRegistrationException * if the implementation is not a concrete class. * @throws NullPointerException if one of the parameters is <code>null</code> @@ -77,7 +77,7 @@ * @param componentKey the search key for this implementation * @param componentImplementation the concrete implementation * @param parameters the parameters to use for the initialization - * @param monitor the addComponent monitor used by this addAdapter + * @param monitor the component monitor used by this addAdapter * @throws NotConcreteRegistrationException * if the implementation is not a concrete class. * @throws NullPointerException if one of the parameters is <code>null</code> Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/ReflectionLifecycleStrategy.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/ReflectionLifecycleStrategy.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/ReflectionLifecycleStrategy.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,8 +18,8 @@ /** - * Reflection lifecycle strategy. Starts, stops, disposes of addComponent if appropriate methods are - * present. The addComponent may implement only one of the three methods. + * Reflection lifecycle strategy. Starts, stops, disposes of component if appropriate methods are + * present. The component may implement only one of the three methods. * * @author Paul Hammant * @author Mauro Talevi @@ -99,7 +99,7 @@ } /** - * {@inheritDoc} The addComponent has a lifecylce if at least one of the three methods is present. + * {@inheritDoc} The component has a lifecylce if at least one of the three methods is present. */ public boolean hasLifecycle(Class type) { Method[] methods = init(type); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/StartableLifecycleStrategy.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/StartableLifecycleStrategy.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/lifecycle/StartableLifecycleStrategy.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -15,7 +15,7 @@ import java.lang.reflect.Method; /** - * Startable lifecycle strategy. Starts and stops addComponent if Startable, + * Startable lifecycle strategy. Starts and stops component if Startable, * and disposes it if Disposable. * * @author Mauro Talevi Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/monitors/AbstractComponentMonitor.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/monitors/AbstractComponentMonitor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/monitors/AbstractComponentMonitor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -26,7 +26,7 @@ public final static String INSTANTIATING = "PicoContainer: instantiating {0}"; public final static String INSTANTIATED = "PicoContainer: instantiated {0} [{1} ms]"; - public final static String INSTANTIATED2 = "PicoContainer: instantiated {0} [{1} ms], addComponent {2}, injected [{3}]"; + public final static String INSTANTIATED2 = "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]"; Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/BasicComponentParameter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/BasicComponentParameter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/BasicComponentParameter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -23,11 +23,11 @@ import java.util.Set; /** - * A BasicComponentParameter should be used to pass in a particular addComponent as argument to a + * A BasicComponentParameter should be used to pass in a particular component as argument to a * different addComponent'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 addComponent will give PicoContainer a hint - * about what other addComponent to use in the constructor. This Parameter will never resolve + * ComponentParameter as a parameter when registering a component will give PicoContainer 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. * * @author Jon Tirsén @@ -46,7 +46,7 @@ private Object componentKey; /** - * Expect a parameter matching a addComponent of a specific key. + * Expect a parameter matching a component of a specific key. * * @param componentKey the key of the desired addComponent */ Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/CollectionComponentParameter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/CollectionComponentParameter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/CollectionComponentParameter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -37,7 +37,7 @@ * A CollectionComponentParameter should be used to support inject an {@link Array}, a * {@link Collection}or {@link Map}of components automatically. The collection will contain * all components of a special type and additionally the type of the key may be specified. In - * case of a map, the map's keys are the one of the addComponent addAdapter. + * case of a map, the map's keys are the one of the component addAdapter. * * @author Aslak Hellesøy * @author Jörg Schaible @@ -60,8 +60,8 @@ private final Class componentValueType; /** - * Expect an {@link Array}of an appropriate type as parameter. At least one addComponent of - * the array's addComponent type must exist. + * Expect an {@link Array}of an appropriate type as parameter. At least one component of + * the array's component type must exist. */ public CollectionComponentParameter() { this(false); @@ -222,11 +222,11 @@ } /** - * Evaluate whether the given addComponent addAdapter will be part of the collective type. + * Evaluate whether the given component adapter will be part of the collective type. * * @param adapter a <code>ComponentAdapter</code> value * - * @return <code>true</code> if the addAdapter takes part + * @return <code>true</code> if the adapter takes part */ protected boolean evaluate(final ComponentAdapter adapter) { return adapter != null; // use parameter, prevent compiler warning @@ -240,7 +240,7 @@ * @param keyType the compatible type of the key * @param valueType the compatible type of the addComponent * - * @return a {@link Map} with the ComponentAdapter instances and their addComponent keys as map key. + * @return a {@link Map} with the ComponentAdapter instances and their component keys as map key. */ @SuppressWarnings({ "unchecked" }) protected Map<Object, ComponentAdapter<?>> getMatchingComponentAdapters(PicoContainer container, Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/ComponentParameter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/ComponentParameter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/parameters/ComponentParameter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -18,11 +18,11 @@ /** - * A ComponentParameter should be used to pass in a particular addComponent as argument to a + * A ComponentParameter should be used to pass in a particular component as argument to a * different addComponent'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 addComponent will give PicoContainer a hint - * about what other addComponent to use in the constructor. Collecting parameter types are + * ComponentParameter as a parameter when registering a component will give PicoContainer a hint + * about what other component to use in the constructor. Collecting parameter types are * supported for {@link java.lang.reflect.Array},{@link java.util.Collection}and * {@link java.util.Map}. * @@ -52,7 +52,7 @@ private final Parameter collectionParameter; /** - * Expect a parameter matching a addComponent of a specific key. + * Expect a parameter matching a component of a specific key. * * @param componentKey the key of the desired addComponent */ @@ -69,7 +69,7 @@ /** * Expect any scalar paramter of the appropriate type or an {@link java.lang.reflect.Array}. - * Resolve the parameter even if no compoennt is of the array's addComponent type. + * Resolve the parameter even if no compoennt is of the array's component type. * * @param emptyCollection <code>true</code> allows an Array to be empty * @since 1.1 @@ -97,7 +97,7 @@ * The components in the collection will be of the specified type and their addAdapter's key * must have a particular type. * - * @param componentKeyType the addComponent addAdapter's key type + * @param componentKeyType the component addAdapter's key type * @param componentValueType the addComponent's type (ignored for an Array) * @param emptyCollection <code>true</code> allows the collection to be empty * @since 1.1 Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/visitors/MethodCallingVisitor.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/visitors/MethodCallingVisitor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/visitors/MethodCallingVisitor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -56,7 +56,7 @@ } /** - * Construct a MethodCallingVisitor for standard methods visiting the addComponent in instantiation order. + * Construct a MethodCallingVisitor for standard methods visiting the component in instantiation order. * * @param method the method to invoke * @param ofType the type of the components, that will be invoked Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/DefaultPicoContainerTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/DefaultPicoContainerTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/DefaultPicoContainerTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -222,7 +222,7 @@ }); dpc.addComponent(DefaultPicoContainer.class); dpc.start(); - assertEquals("ComponentMonitor should have been notified that the addComponent had been started", + assertEquals("ComponentMonitor should have been notified that the component had been started", "public abstract void org.picocontainer.Startable.start()", sb.toString()); } Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/adapters/SynchronizedComponentAdapterTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/adapters/SynchronizedComponentAdapterTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/adapters/SynchronizedComponentAdapterTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -135,7 +135,7 @@ runConcurrencyTest(pico); } - // This is overkill - an outer sync addAdapter is enough + // This is overkill - an outer sync adapter is enough public void testSingletonCreationWithSynchronizedAdapterAndDoubleLocking() throws InterruptedException { DefaultPicoContainer pico = new DefaultPicoContainer(); pico.addAdapter(new SynchronizedBehavior(new CachingBehavior(new SynchronizedBehavior(new ConstructorInjector("slow", SlowCtor.class))))); Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/behaviors/BehaviorAdapterTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/behaviors/BehaviorAdapterTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/behaviors/BehaviorAdapterTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -33,7 +33,7 @@ adapter.currentMonitor(); fail("PicoIntrospectionException expected"); } catch (PicoIntrospectionException e) { - assertEquals("No addComponent monitor found in delegate", e.getMessage()); + assertEquals("No component monitor found in delegate", e.getMessage()); } } Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -222,7 +222,7 @@ parent.start(); fail("Thrown " + AbstractInjector.UnsatisfiableDependenciesException.class.getName() + " expected"); } catch ( AbstractInjector.UnsatisfiableDependenciesException e) { - // FiveTriesToBeMalicious can't get instantiated as there is no PicoContainer in any addComponent set + // FiveTriesToBeMalicious can't get instantiated as there is no PicoContainer in any component set } String recording = parent.getComponent("recording").toString(); assertEquals("<One<Two<Three", recording); @@ -230,7 +230,7 @@ child.getComponent(FiveTriesToBeMalicious.class); fail("Thrown " + AbstractInjector.UnsatisfiableDependenciesException.class.getName() + " expected"); } catch (final AbstractInjector.UnsatisfiableDependenciesException e) { - // can't get instantiated as there is no PicoContainer in any addComponent set + // can't get instantiated as there is no PicoContainer in any component set } recording = parent.getComponent("recording").toString(); assertEquals("<One<Two<Three", recording); // still the same Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/doc/advanced/CollectionsTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/doc/advanced/CollectionsTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/doc/advanced/CollectionsTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -111,7 +111,7 @@ pico.addComponent(Cod.class); pico.addComponent(Bowl.class, Bowl.class, new CollectionComponentParameter(Fish.class, false), new CollectionComponentParameter(Cod.class, false)); - // This addComponent will match both arguments of Bowl's constructor + // This component will match both arguments of Bowl's constructor pico.addComponent(new LinkedList()); Bowl bowl = pico.getComponent(Bowl.class); Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -82,7 +82,7 @@ * Prepare the test <em>verifyWithoutDependencyWorks</em>. * * @param picoContainer container, may probably not be used. - * @return a ComponentAdapter of the type to test for a addComponent without dependencies. Registration in the pico is + * @return a ComponentAdapter of the type to test for a component without dependencies. Registration in the pico is * not necessary. */ protected abstract ComponentAdapter prepDEF_verifyWithoutDependencyWorks(MutablePicoContainer picoContainer); @@ -98,7 +98,7 @@ * Prepare the test <em>verifyDoesNotInstantiate</em>. * * @param picoContainer container, may probably not be used. - * @return a ComponentAdapter of the type to test for a addComponent that may throw on instantiation. Registration in + * @return a ComponentAdapter of the type to test for a component that may throw on instantiation. Registration in * the pico is not necessary. */ protected abstract ComponentAdapter prepDEF_verifyDoesNotInstantiate(MutablePicoContainer picoContainer); @@ -332,7 +332,7 @@ * Prepare the test <em>errorIsRethrown</em>. Overload this function, if the ComponentAdapter is instantiating. * * @param picoContainer container, may probably not be used. - * @return a ComponentAdapter of the type to test with a addComponent that fails with an {@link Error} at + * @return a ComponentAdapter of the type to test with a component that fails with an {@link Error} at * instantiation. Registration in the pico is not necessary. */ protected ComponentAdapter prepINS_errorIsRethrown(MutablePicoContainer picoContainer) { @@ -358,7 +358,7 @@ * instantiating. * * @param picoContainer container, may probably not be used. - * @return a ComponentAdapter of the type to test with a addComponent that fails with a {@link RuntimeException} at + * @return a ComponentAdapter of the type to test with a component that fails with a {@link RuntimeException} at * instantiation. Registration in the pico is not necessary. */ protected ComponentAdapter prepINS_runtimeExceptionIsRethrown(MutablePicoContainer picoContainer) { @@ -384,7 +384,7 @@ * this function, if the ComponentAdapter is instantiating. * * @param picoContainer container, may probably not be used. - * @return a ComponentAdapter of the type to test with a addComponent that fails with a + * @return a ComponentAdapter of the type to test with a component that fails with a * {@link PicoInitializationException} at instantiation. Registration in the pico is not * necessary. */ @@ -417,7 +417,7 @@ * dependencies. * * @param picoContainer container, used to register dependencies. - * @return a ComponentAdapter of the type to test with a addComponent that has dependencies. Registration in the pico + * @return a ComponentAdapter of the type to test with a component that has dependencies. Registration in the pico * is not necessary. */ protected ComponentAdapter prepRES_dependenciesAreResolved(MutablePicoContainer picoContainer) { @@ -445,8 +445,8 @@ * ComponentAdapter is resolves dependencies. * * @param picoContainer container, used to register dependencies. - * @return a ComponentAdapter of the type to test with a addComponent that has cyclic dependencies. You have to - * register the addComponent itself in the pico. + * @return a ComponentAdapter of the type to test with a component that has cyclic dependencies. You have to + * register the component itself in the pico. */ protected ComponentAdapter prepRES_failingVerificationWithCyclicDependencyException( MutablePicoContainer picoContainer) { @@ -479,8 +479,8 @@ * ComponentAdapter is resolves dependencies. * * @param picoContainer container, used to register dependencies. - * @return a ComponentAdapter of the type to test with a addComponent that has cyclic dependencies. You have to - * register the addComponent itself in the pico. + * @return a ComponentAdapter of the type to test with a component that has cyclic dependencies. You have to + * register the component itself in the pico. */ protected ComponentAdapter prepRES_failingInstantiationWithCyclicDependencyException( MutablePicoContainer picoContainer) { Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractImplementationHidingPicoContainerTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractImplementationHidingPicoContainerTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractImplementationHidingPicoContainerTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -66,7 +66,7 @@ IOException, ClassNotFoundException { try { super.testSerializedContainerCanRetrieveImplementation(); - fail("The ImplementationHidingPicoContainer should not be able to retrieve the addComponent impl"); + fail("The ImplementationHidingPicoContainer should not be able to retrieve the component impl"); } catch (ClassCastException cce) { // expected. } Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractPicoContainerTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractPicoContainerTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/tck/AbstractPicoContainerTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -445,7 +445,7 @@ } } - // An addAdapter has no longer a hosting container. + // An adapter has no longer a hosting container. // public void testRegistrationOfAdapterSetsHostingContainerAsSelf() { // final InstanceAdapter componentAdapter = new InstanceAdapter("", new Object()); Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTestCase.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTestCase.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTestCase.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -77,7 +77,7 @@ for (ComponentAdapter allAdapter : allAdapters) { boolean knownAdapter = knownAdapters.remove(allAdapter); - assertTrue("Encountered unknown addAdapter in collection: " + allAdapters.toString(), knownAdapter); + assertTrue("Encountered unknown adapter in collection: " + allAdapters.toString(), knownAdapter); } assertTrue("All adapters should match known adapters.", knownAdapters.size() == 0); Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -24,10 +24,10 @@ /** - * ComponentAdapter, that assimilates a addComponent for a specific type. + * ComponentAdapter, that assimilates a component for a specific type. * <p> * Allows the instance of another {@link ComponentAdapter} to be converted into interfacte <code>type</code>, that the - * instance is not assignable from. In other words the instance of the delegated addAdapter does NOT necessarily implement the + * instance is not assignable from. In other words the instance of the delegated adapter does NOT necessarily implement the * <code>type</code> interface. * </p> * <p> @@ -61,8 +61,8 @@ private final boolean isCompatible; /** - * Construct an AssimilatingComponentAdapter. The <code>type</code> may not implement the type of the addComponent instance. - * If the addComponent instance <b>does</b> implement the interface, no proxy is used though. + * Construct an AssimilatingComponentAdapter. The <code>type</code> may not implement the type of the component instance. + * If the component instance <b>does</b> implement the interface, no proxy is used though. * * @param type The class type used as key. * @param delegate The delegated {@link ComponentAdapter}. @@ -95,8 +95,8 @@ } /** - * Construct an AssimilatingComponentAdapter. The <code>type</code> may not implement the type of the addComponent instance. - * The implementation will use JDK {@link java.lang.reflect.Proxy} instances. If the addComponent instant <b>does </b> + * Construct an AssimilatingComponentAdapter. The <code>type</code> may not implement the type of the component instance. + * The implementation will use JDK {@link java.lang.reflect.Proxy} instances. If the component instant <b>does </b> * implement the interface, no proxy is used anyway. * * @param type The class type used as key. @@ -107,7 +107,7 @@ } /** - * Create and return a addComponent instance. If the addComponent instance and the type to assimilate is not compatible, a proxy + * Create and return a component instance. If the component instance and the type to assimilate is not compatible, a proxy * for the instance is generated, that implements the assimilated type. * * @see AbstractBehavior#getComponentInstance(org.picocontainer.PicoContainer) @@ -119,7 +119,7 @@ } /** - * Return the type of the addComponent. If the addComponent type is not compatible with the type to assimilate, the assimilated + * Return the type of the addComponent. If the component type is not compatible with the type to assimilate, the assimilated * type is returned. * * @see AbstractBehavior#getComponentImplementation() @@ -129,7 +129,7 @@ } /** - * Return the key of the addComponent. If the key of the delegated addComponent is a type, that is not compatible with the type to + * Return the key of the addComponent. If the key of the delegated component is a type, that is not compatible with the type to * assimilate, then the assimilated type replaces the original type. * * @see AbstractBehavior#getComponentKey() Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapterFactory.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapterFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/AssimilatingComponentAdapterFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -26,7 +26,7 @@ /** * Factory for the AssimilatingComponentAdapter. This factory will create {@link AssimilatingComponentAdapter} instances for all - * {@link ComponentAdapter} instances created by the delegate. This will assimilate every addComponent for a specific type. + * {@link ComponentAdapter} instances created by the delegate. This will assimilate every component for a specific type. * * @author Jörg Schaible * @since 1.2 @@ -58,7 +58,7 @@ } /** - * Create a {@link AssimilatingComponentAdapter}. This addAdapter will wrap the returned {@link ComponentAdapter} of the + * Create a {@link AssimilatingComponentAdapter}. This adapter will wrap the returned {@link ComponentAdapter} of the * deleated {@link ComponentFactory}. * * @see org.picocontainer.ComponentFactory#createComponentAdapter(org.picocontainer.ComponentMonitor,org.picocontainer.LifecycleStrategy,org.picocontainer.ComponentCharacteristic,Object,Class,org.picocontainer.Parameter...) Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/HotSwappingComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/HotSwappingComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/HotSwappingComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -15,8 +15,8 @@ /** - * This addComponent addAdapter makes it possible to hide the implementation of a real subject (behind a proxy). If the key of the - * addComponent is of type {@link Class} and that class represents an interface, the proxy will only implement the interface + * This component adapter makes it possible to hide the implementation of a real subject (behind a proxy). If the key of the + * component is of type {@link Class} and that class represents an interface, the proxy will only implement the interface * represented by that Class. Otherwise (if the key is something else), the proxy will implement all the interfaces of the * underlying subject. In any case, the proxy will also implement {@link com.thoughtworks.proxy.toys.hotswap.Swappable}, making * it possible to swap out the underlying subject at runtime. <p/> <em> Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ImplementationHidingBehaviorAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ImplementationHidingBehaviorAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ImplementationHidingBehaviorAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -28,7 +28,7 @@ /** - * This addComponent addAdapter makes it possible to hide the implementation of a real subject (behind a proxy). + * This component adapter makes it possible to hide the implementation of a real subject (behind a proxy). * The proxy will implement all the interfaces of the * underlying subject. If you want caching, * use a {@link CachingBehavior} around this one. Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/PoolingComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/PoolingComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/PoolingComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -36,7 +36,7 @@ * {@link ComponentAdapter} implementation that pools components. * <p> * The implementation utilizes a delegated ComponentAdapter to create the instances of the pool. The - * pool can be configured to grow unlimited or to a maximum size. If a addComponent is requested from + * pool can be configured to grow unlimited or to a maximum size. If a component is requested from * this addAdapter, the implementation returns an availailabe instance from the pool or will create a * new one, if the maximum pool size is not reached yet. If none is available, the implementation * can wait a defined time for a returned object before it throws a {@link PoolException}. @@ -45,7 +45,7 @@ * This implementation uses the {@link Pool} toy from the <a * href="" project. This ensures, that any addComponent, * that is out of scope will be automatically returned to the pool by the garbage collector. - * Additionally will every addComponent instance also implement + * Additionally will every component instance also implement * {@link com.thoughtworks.proxy.toys.pool.Poolable}, that can be used to return the instance * manually. After returning an instance it should not be used in client code anymore. * </p> @@ -57,8 +57,8 @@ * </p> * <p> * The pool supports components with a lifecylce. If the delegated {@link ComponentAdapter} - * implements a {@link LifecycleStrategy}, any addComponent retrieved form the pool will be started - * before and stopped again, when it returns back into the pool. Also if a addComponent cannot be + * implements a {@link LifecycleStrategy}, any component retrieved form the pool will be started + * before and stopped again, when it returns back into the pool. Also if a component cannot be * resetted it will automatically be disposed. If the container of the pool is disposed, that any * returning object is also disposed and will not return to the pool anymore. Note, that current * implementation cannot dispose pooled objects. @@ -234,9 +234,9 @@ /** * Construct a PoolingComponentAdapter. Remember, that the implementation will request new - * components from the delegate as long as no addComponent instance is available in the pool and + * components from the delegate as long as no component instance is available in the pool and * the maximum pool size is not reached. Therefore the delegate may not return the same - * addComponent instance twice. Ensure, that the used {@link ComponentAdapter} does not cache. + * component instance twice. Ensure, that the used {@link ComponentAdapter} does not cache. * * @param delegate the delegated ComponentAdapter * @param context the {@link Context} of the pool @@ -375,7 +375,7 @@ } /** - * Start of the container ensures that at least one pooled addComponent has been started. Applies + * Start of the container ensures that at least one pooled component has been started. Applies * only if the delegated {@link ComponentAdapter} supports a lifecylce by implementing * {@link LifecycleStrategy}. * Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/StaticFactoryAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/StaticFactoryAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/StaticFactoryAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -17,7 +17,7 @@ /** - * Component addAdapter that wrapps a static factory with the help of {@link StaticFactory}. + * Component adapter that wrapps a static factory with the help of {@link StaticFactory}. * * @author Jörg Schaible * @author Leo Simmons @@ -38,7 +38,7 @@ } /** - * Construct a ComponentAdapter accessing a static factory creating the addComponent using a special key for addComponent + * Construct a ComponentAdapter accessing a static factory creating the component using a special key for addComponent * registration. * * @param componentKey The key of the created addComponent. @@ -51,7 +51,7 @@ } /** - * @return Returns the addComponent created by the static factory. + * @return Returns the component created by the static factory. * @see org.picocontainer.ComponentAdapter#getComponentInstance(org.picocontainer.PicoContainer) */ public Object getComponentInstance(PicoContainer container) throws PicoInitializationException, PicoIntrospectionException { Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapter.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapter.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapter.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -29,9 +29,9 @@ /** - * A {@link ComponentAdapter} that realizes a {@link ThreadLocal} addComponent instance. + * A {@link ComponentAdapter} that realizes a {@link ThreadLocal} component instance. * <p> - * The addAdapter creates proxy instances, that will create the necessary instances on-the-fly invoking the methods of the + * The adapter creates proxy instances, that will create the necessary instances on-the-fly invoking the methods of the * instance. Use this addAdapter, if you are instantiating your components in a single thread, but should be different when * accessed from different threads. See {@link ThreadLocalComponentAdapterFactory} for details. * </p> @@ -52,7 +52,7 @@ * * @param delegate The {@link ComponentAdapter} to delegate. * @param proxyFactory The {@link ProxyFactory} to use. - * @throws PicoIntrospectionException Thrown if the addComponent does not implement any interface. + * @throws PicoIntrospectionException Thrown if the component does not implement any interface. */ public ThreadLocalComponentAdapter(final ComponentAdapter delegate, final ProxyFactory proxyFactory) throws PicoIntrospectionException { @@ -65,7 +65,7 @@ * Construct a ThreadLocalComponentAdapter using {@link Proxy} instances. * * @param delegate The {@link ComponentAdapter} to delegate. - * @throws PicoIntrospectionException Thrown if the addComponent does not implement any interface. + * @throws PicoIntrospectionException Thrown if the component does not implement any interface. */ public ThreadLocalComponentAdapter(final ComponentAdapter delegate) throws PicoIntrospectionException { this(new CachingBehavior(delegate, new ThreadLocalReference()), new StandardProxyFactory()); Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactory.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactory.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactory.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -28,9 +28,9 @@ /** * A {@link ComponentFactory} for components kept in {@link ThreadLocal} instances. * <p> - * This factory has two operating modes. By default it ensures, that every thread uses its own addComponent at any time. + * This factory has two operating modes. By default it ensures, that every thread uses its own component at any time. * This mode ({@link #ENSURE_THREAD_LOCALITY}) makes internal usage of a {@link ThreadLocalComponentAdapter}. If the - * application architecture ensures, that the thread that creates the addComponent is always also the thread that is th + * application architecture ensures, that the thread that creates the component is always also the thread that is th * only user, you can set the mode {@link #THREAD_ENSURES_LOCALITY}. In this mode the factory uses a simple * {@link CachingBehavior} that uses a {@link ThreadLocalReference} to cache the addComponent. * </p> @@ -40,16 +40,16 @@ * <p> * <code>THREAD_ENSURES_LOCALITY</code> is applicable, if the pico container is requested for a thread local addComponent * from the working thread e.g. in a web application for a request. In this environment it is ensured, that the request - * is processed from the same thread and the thread local addComponent is reused, if a previous request was handled in the - * same thread. Note that thi scenario fails badly, if the thread local addComponent is created because of another cached - * addComponent indirectly by a dependecy. In this case the cached addComponent already have an instance of the thread local - * addComponent, that may have been created in another thread, since only the addComponent addAdapter for the thread local - * addComponent can ensure a unique addComponent for each thread. + * is processed from the same thread and the thread local component is reused, if a previous request was handled in the + * same thread. Note that thi scenario fails badly, if the thread local component is created because of another cached + * component indirectly by a dependecy. In this case the cached component already have an instance of the thread local + * addComponent, that may have been created in another thread, since only the component adapter for the thread local + * component can ensure a unique component for each thread. * </p> * <p> - * <code>ENSURES_THREAD_LOCALITY</code> solves this problem. In this case the returned addComponent is just a proxy for - * the thread local addComponent and this proxy ensures, that a new addComponent is created for each thread. Even if another - * cached addComponent has an indirect dependency on the thread local addComponent, the proxy ensures unique instances. This + * <code>ENSURES_THREAD_LOCALITY</code> solves this problem. In this case the returned component is just a proxy for + * the thread local component and this proxy ensures, that a new component is created for each thread. Even if another + * cached component has an indirect dependency on the thread local addComponent, the proxy ensures unique instances. This * is vital for a multithreaded application that uses EJBs. * </p> * @author Jörg Schaible Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Anything.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Anything.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Anything.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,7 +11,7 @@ import org.picocontainer.ComponentAdapter; /** - * A constraint that matches any addComponent addAdapter. + * A constraint that matches any component addAdapter. * * @author Nick Sieger * @version 1.1 Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Constraint.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Constraint.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/Constraint.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -13,17 +13,17 @@ /** * Extension to {@link org.picocontainer.Parameter} that allows for - * constraint-based configuration of addComponent parameters. + * constraint-based configuration of component parameters. * * @author Nick Sieger * @version 1.0 */ public interface Constraint extends Parameter { /** - * Evaluate whether the given addComponent addAdapter matches this constraint. + * Evaluate whether the given component adapter matches this constraint. * * @param adapter a <code>ComponentAdapter</code> value - * @return true if the addAdapter matches the constraint + * @return true if the adapter matches the constraint */ boolean evaluate(ComponentAdapter adapter); } Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsExactType.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsExactType.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsExactType.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,7 +11,7 @@ import org.picocontainer.ComponentAdapter; /** - * Constraint that only accepts an addAdapter whose implementation is the same + * Constraint that only accepts an adapter whose implementation is the same * class instance as the type represented by this object. * * @author Nick Sieger Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKey.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKey.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKey.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,7 +11,7 @@ import org.picocontainer.ComponentAdapter; /** - * Constraint that accepts an addAdapter of a specific key. + * Constraint that accepts an adapter of a specific key. * * @author Nick Sieger * @version 1.1 Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKeyType.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKeyType.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsKeyType.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,7 +11,7 @@ import org.picocontainer.ComponentAdapter; /** - * Constraint that accepts an addAdapter whose key type is either the + * Constraint that accepts an adapter whose key type is either the * same type or a subtype of the type(s) represented by this object. * * @author Nick Sieger Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsType.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsType.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/constraints/IsType.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -11,7 +11,7 @@ import org.picocontainer.ComponentAdapter; /** - * Constraint that accepts an addAdapter whose implementation is either the + * Constraint that accepts an adapter whose implementation is either the * same type or a subtype of the type(s) represented by this object. * * @author Nick Sieger Modified: java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/monitors/ComponentDependencyMonitor.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/monitors/ComponentDependencyMonitor.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/java/org/picocontainer/gems/monitors/ComponentDependencyMonitor.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -6,7 +6,7 @@ import org.picocontainer.gems.monitors.prefuse.ComponentDependencyListener; /** - * Understands how to capture addComponent dependency information from + * Understands how to capture component dependency information from * picocontainer. * * @author Peter Barry Modified: java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/AssimilatingComponentAdapterTest.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/AssimilatingComponentAdapterTest.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/AssimilatingComponentAdapterTest.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -54,7 +54,7 @@ } /** - * Test if the addComponent key is preserved if it is not a class type. + * Test if the component key is preserved if it is not a class type. */ public void testComponentKeyIsPreserved() { final MutablePicoContainer mpc = new DefaultPicoContainer(); @@ -82,7 +82,7 @@ } /** - * Test if proxy generation is omitted, if types are compatible and that the addComponent key is not changed. + * Test if proxy generation is omitted, if types are compatible and that the component key is not changed. */ public void testAvoidedProxyDoesNotChangeComponentKey() { final MutablePicoContainer mpc = new DefaultPicoContainer(); Modified: java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/PoolingComponentAdapterTest.java (3509 => 3510) --- java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/PoolingComponentAdapterTest.java 2007-06-10 06:54:54 UTC (rev 3509) +++ java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/PoolingComponentAdapterTest.java 2007-06-10 16:53:02 UTC (rev 3510) @@ -262,7 +262,7 @@ * The recorded String in the buffer must result in <strong>&qout;<OneOne>!One&qout;</strong>. The addAdapter * top test should be registered in the container and delivered as return value. * @param picoContainer the container - * @return the addAdapter to test + * @return the adapter to test */ private ComponentAdapter prepDEF_lifecycleManagerSupport(MutablePicoContainer picoContainer) { picoContainer.addComponent(RecordingLifecycle.One.class); @@ -295,10 +295,10 @@ * Prepare the test <em>lifecycleManagerHonorsInstantiationSequence</em>. Prepare the delivered PicoContainer * with addAdapter(s), that have dependend components, have a lifecycle and use a StringBuffer registered in the * container to record the lifecycle method invocations. The recorded String in the buffer must result in - * <strong>&qout;<One<TwoTwo>One>!Two!One&qout;</strong>. The addAdapter top test should be registered in + * <strong>&qout;<One<TwoTwo>One>!Two!One&qout;</strong>. The adapter top test should be registered in * the container and delivered as return value. * @param picoContainer the container - * @return the addAdapter to test + * @return the adapter to test */ private ComponentAdapter prepRES_lifecycleManagerHonorsInstantiationSequence(MutablePicoContainer picoContainer) { picoContainer.addComponent(RecordingLifecycle.One.class); To unsubscribe from this list please visit: http://xircles.codehaus.org/manage_email Next Message by Thread: click to view message preview[picocontainer-scm] [3512] java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems: fixup var names + text for CFRevision 3512 Author paul Date 2007-06-10 12:15:13 -0500 (Sun, 10 Jun 2007) Log Message fixup var names + text for CF Modified Paths java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/DefaultNanoContainer.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoBuilder.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NodeBuilderDecorationDelegate.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NullNodeBuilderDecorationDelegate.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/NanoBuilderTestCase.java java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AopNodeBuilderDecorationDelegate.java java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopAspectablePicoContainerFactory.java java/sandbox/baby-steps/nano2/container-groovy/src/java/org/nanocontainer/script/groovy/buildernodes/ChildContainerNode.java java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderAopTestCase.java java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderScriptedTestCase.groovy java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderTestCase.java java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactoryTestCase.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/PicoBuilderTestCase.java java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/PicoGemsBuilderTestCase.java java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactoryTest.java Diff Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/DefaultNanoContainer.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/DefaultNanoContainer.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/DefaultNanoContainer.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -123,17 +123,17 @@ * Constructor that provides the same control over the nanocontainer lifecycle strategies * as {@link DefaultPicoContainer ( org.picocontainer.ComponentFactory , org.picocontainer.LifecycleStrategy , PicoContainer)}. * - * @param componentAdapterFactory ComponentAdapterFactory + * @param componentFactory ComponentAdapterFactory * @param lifecycleStrategy LifecycleStrategy * @param parent PicoContainer may be null if there is no parent. * @param cl the Classloader to use. May be null, in which case DefaultNanoPicoContainer.class.getClassLoader() * will be called instead. */ - public DefaultNanoContainer(ComponentFactory componentAdapterFactory, + public DefaultNanoContainer(ComponentFactory componentFactory, LifecycleStrategy lifecycleStrategy, PicoContainer parent, ClassLoader cl) { - super(new DefaultPicoContainer(componentAdapterFactory, lifecycleStrategy, parent)); + super(new DefaultPicoContainer(componentFactory, lifecycleStrategy, parent)); parentClassLoader = (cl != null) ? cl : DefaultNanoContainer.class.getClassLoader(); } Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoBuilder.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoBuilder.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/NanoBuilder.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -64,8 +64,8 @@ return this; } - public NanoBuilder withComponentAdapterFactory(ComponentFactory componentAdapterFactory) { - picoBuilder.withComponentAdapterFactory(componentAdapterFactory); + public NanoBuilder withComponentAdapterFactory(ComponentFactory componentFactory) { + picoBuilder.withComponentAdapterFactory(componentFactory); return this; } Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NodeBuilderDecorationDelegate.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NodeBuilderDecorationDelegate.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NodeBuilderDecorationDelegate.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -29,7 +29,7 @@ */ public interface NodeBuilderDecorationDelegate { - ComponentFactory decorate(ComponentFactory componentAdapterFactory, Map attributes); + ComponentFactory decorate(ComponentFactory componentFactory, Map attributes); MutablePicoContainer decorate(MutablePicoContainer picoContainer); Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NullNodeBuilderDecorationDelegate.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NullNodeBuilderDecorationDelegate.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/NullNodeBuilderDecorationDelegate.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -11,8 +11,8 @@ * @version $Revision$ */ public class NullNodeBuilderDecorationDelegate implements NodeBuilderDecorationDelegate { - public ComponentFactory decorate(ComponentFactory componentAdapterFactory, Map attributes) { - return componentAdapterFactory; + public ComponentFactory decorate(ComponentFactory componentFactory, Map attributes) { + return componentFactory; } public MutablePicoContainer decorate(MutablePicoContainer picoContainer) { Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XMLContainerBuilder.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -508,9 +508,9 @@ } } Parameter[] parameters = createChildParameters(container, element); - ComponentFactory componentAdapterFactory = createComponentAdapterFactory(element.getAttribute(FACTORY), metaContainer); + ComponentFactory componentFactory = createComponentAdapterFactory(element.getAttribute(FACTORY), metaContainer); - container.addAdapter(componentAdapterFactory.createComponentAdapter(new NullComponentMonitor(), new NullLifecycleStrategy(), new ComponentCharacteristic(), key, implementationClass, parameters)); + container.addAdapter(componentFactory.createComponentAdapter(new NullComponentMonitor(), new NullLifecycleStrategy(), new ComponentCharacteristic(), key, implementationClass, parameters)); } private ComponentFactory createComponentAdapterFactory(String factoryName, NanoContainer metaContainer) throws PicoCompositionException { Modified: java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/java/org/nanocontainer/script/xml/XStreamContainerBuilder.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -301,8 +301,8 @@ cafName = CachingBehaviorFactory.class.getName(); } Class cafClass = getClassLoader().loadClass(cafName); - ComponentFactory componentAdapterFactory = (ComponentFactory) cafClass.newInstance(); - MutablePicoContainer picoContainer = new DefaultPicoContainer(componentAdapterFactory); + ComponentFactory componentFactory = (ComponentFactory) cafClass.newInstance(); + MutablePicoContainer picoContainer = new DefaultPicoContainer(componentFactory); DefaultNanoContainer nano = new DefaultNanoContainer(getClassLoader(), picoContainer); populateContainer(nano); return nano; Modified: java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/NanoBuilderTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/NanoBuilderTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/NanoBuilderTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -54,7 +54,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -68,7 +68,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -84,7 +84,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -105,7 +105,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -120,7 +120,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -144,7 +144,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -159,7 +159,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -174,7 +174,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + " delegate=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -191,7 +191,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.nanocontainer.NanoBuilderTestCase_CustomParentcontainer\n" + @@ -214,7 +214,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.SetterInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n", @@ -226,7 +226,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnnotationInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnnotationInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n", @@ -238,7 +238,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.ConstructorInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.ConstructorInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n",foo); @@ -249,7 +249,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + @@ -262,7 +262,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + " delegate=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -276,7 +276,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.DefaultNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.behaviors.SynchronizedBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.SynchronizedBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -291,7 +291,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.NanoBuilderTestCase_-TestNanoContainer\n" + " delegate=org.picocontainer.DefaultPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -313,7 +313,7 @@ String foo = simplifyRepresentation(nc); assertEquals("org.nanocontainer.NanoBuilderTestCase_-TestNanoContainer\n" + " delegate=org.nanocontainer.NanoBuilderTestCase_TestPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -354,7 +354,7 @@ foo = foo.replaceAll("\n componentKeyToAdapterCache",""); foo = foo.replaceAll("\n startedComponentAdapters",""); foo = foo.replaceAll("\"class=","\"\nclass="); - foo = foo.replaceAll("\n componentAdapterFactory\n","\n"); + foo = foo.replaceAll("\n componentFactory\n","\n"); foo = foo.replaceAll("\n componentMonitor\n","\n"); foo = foo.replaceAll("\n lifecycleManager",""); foo = foo.replaceAll("class=\"org.picocontainer.DefaultPicoContainer_1\"",""); Modified: java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container/src/test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -704,12 +704,12 @@ " <namedChildContainers/>\n" + " <delegate class='org.picocontainer.DefaultPicoContainer'>\n" + " <componentKeyToAdapterCache/>\n" + - " <componentAdapterFactory class='"+MyCAF3.class.getName()+"'>\n" + + " <componentFactory class='"+MyCAF3.class.getName()+"'>\n" + " <delegate class='"+MyCAF2.class.getName()+"'>\n" + " <delegate class='"+MyCAF.class.getName()+"'>\n" + " </delegate>\n" + " </delegate>\n" + - " </componentAdapterFactory>\n" + + " </componentFactory>\n" + " <children/>\n" + " <componentAdapters/>\n" + " <orderedComponentAdapters/>\n" + Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/AspectablePicoContainerFactory.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -30,24 +30,24 @@ * @param containerClass the class of the basic container to delegate to. * @param aspectsManager the aspects manager used to register and apply * aspects. - * @param componentAdapterFactory the delegate component adapter factory + * @param componentFactory the delegate component factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. */ public AspectablePicoContainer createContainer(Class containerClass, AspectsManager aspectsManager, - ComponentFactory componentAdapterFactory, PicoContainer parent); + ComponentFactory componentFactory, PicoContainer parent); /** * Creates a new <code>AspectablePicoContainer</code>. * * @param containerClass the class of the basic container to delegate to. - * @param componentAdapterFactory the delegate component adapter factory + * @param componentFactory the delegate component factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. */ - AspectablePicoContainer createContainer(Class containerClass, ComponentFactory componentAdapterFactory, + AspectablePicoContainer createContainer(Class containerClass, ComponentFactory componentFactory, PicoContainer parent); /** @@ -55,30 +55,30 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. * - * @param componentAdapterFactory the delegate component adapter factory + * @param componentFactory the delegate component factory * used to produce components. * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. */ - AspectablePicoContainer createContainer(ComponentFactory componentAdapterFactory, PicoContainer parent); + AspectablePicoContainer createContainer(ComponentFactory componentFactory, PicoContainer parent); /** * Creates a new <code>AspectablePicoContainer</code>. Uses * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. * - * @param componentAdapterFactory the delegate component adapter factory + * @param componentFactory the delegate component factory * used to produce components. * @return a new <code>AspectablePicoContainer</code>. */ - AspectablePicoContainer createContainer(ComponentFactory componentAdapterFactory); + AspectablePicoContainer createContainer(ComponentFactory componentFactory); /** * Creates a new <code>AspectablePicoContainer</code>. Uses * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. Uses * <code>org.picocontainer.injectors.AnyInjectionFactory</code> - * as the delegate component adapter factory. + * as the delegate component factory. * * @param parent the parent container. * @return a new <code>AspectablePicoContainer</code>. @@ -90,7 +90,7 @@ * <code>org.picocontainer.DefaultPicoContainer</code> as the * delegate container. Uses * <code>org.picocontainer.injectors.AnyInjectionFactory</code> - * as the delegate component adapter factory. + * as the delegate component factory. * * @return a new <code>AspectablePicoContainer</code>. */ Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AopNodeBuilderDecorationDelegate.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AopNodeBuilderDecorationDelegate.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/defaults/AopNodeBuilderDecorationDelegate.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -47,8 +47,8 @@ this.aspectsManager = aspectsManager; } - public ComponentFactory decorate(ComponentFactory componentAdapterFactory, Map attributes) { - return createAdapterFactory(aspectsManager, componentAdapterFactory); + public ComponentFactory decorate(ComponentFactory componentFactory, Map attributes) { + return createAdapterFactory(aspectsManager, componentFactory); } public MutablePicoContainer decorate(MutablePicoContainer picoContainer) { Modified: java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopAspectablePicoContainerFactory.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopAspectablePicoContainerFactory.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopAspectablePicoContainerFactory.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -33,24 +33,24 @@ public class DynaopAspectablePicoContainerFactory implements AspectablePicoContainerFactory { public AspectablePicoContainer createContainer(Class containerClass, AspectsManager aspectsManager, - ComponentFactory componentAdapterFactory, PicoContainer parent) { + ComponentFactory componentFactory, PicoContainer parent) { - ComponentFactory aspectsComponentAdapterFactory = new AspectsComponentAdapterFactory(aspectsManager).forThis(componentAdapterFactory); + ComponentFactory aspectsComponentAdapterFactory = new AspectsComponentAdapterFactory(aspectsManager).forThis(componentFactory); MutablePicoContainer pico = createMutablePicoContainer(containerClass, aspectsComponentAdapterFactory, parent); return mixinAspectablePicoContainer(aspectsManager, pico); } public AspectablePicoContainer createContainer(Class containerClass, - ComponentFactory componentAdapterFactory, PicoContainer parent) { - return createContainer(containerClass, new DynaopAspectsManager(), componentAdapterFactory, parent); + ComponentFactory componentFactory, PicoContainer parent) { + return createContainer(containerClass, new DynaopAspectsManager(), componentFactory, parent); } - public AspectablePicoContainer createContainer(ComponentFactory componentAdapterFactory, PicoContainer parent) { - return createContainer(DefaultPicoContainer.class, componentAdapterFactory, parent); + public AspectablePicoContainer createContainer(ComponentFactory componentFactory, PicoContainer parent) { + return createContainer(DefaultPicoContainer.class, componentFactory, parent); } - public AspectablePicoContainer createContainer(ComponentFactory componentAdapterFactory) { - return createContainer(componentAdapterFactory, null); + public AspectablePicoContainer createContainer(ComponentFactory componentFactory) { + return createContainer(componentFactory, null); } public AspectablePicoContainer createContainer(PicoContainer parent) { Modified: java/sandbox/baby-steps/nano2/container-groovy/src/java/org/nanocontainer/script/groovy/buildernodes/ChildContainerNode.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-groovy/src/java/org/nanocontainer/script/groovy/buildernodes/ChildContainerNode.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-groovy/src/java/org/nanocontainer/script/groovy/buildernodes/ChildContainerNode.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -56,10 +56,10 @@ private final NodeBuilderDecorationDelegate decorationDelegate; /** - * Attribute: 'componentAdapterFactory' a reference to an instance of a - * component adapter factory. + * Attribute: 'componentFactory' a reference to an instance of a + * component factory. */ - private static final String COMPONENT_ADAPTER_FACTORY = "componentAdapterFactory"; + private static final String COMPONENT_ADAPTER_FACTORY = "componentFactory"; /** * Attribute: 'componentMonitor' a reference to an instance of a component monitor. @@ -127,7 +127,7 @@ * Creates a new container. There may or may not be a parent to this container. * Supported attributes are: * <ul> - * <li><tt>componentAdapterFactory</tt>: The ComponentAdapterFactory used for new container</li> + * <li><tt>componentFactory</tt>: The ComponentAdapterFactory used for new container</li> * <li><tt>componentMonitor</tt>: The ComponentMonitor used for new container</li> * </ul> * @param attributes Map Attributes defined by the builder in the script. @@ -141,16 +141,16 @@ if (parent != null) { parentClassLoader = parent.getComponentClassLoader(); if ( isAttribute(attributes, COMPONENT_ADAPTER_FACTORY) ) { - ComponentFactory componentAdapterFactory = createComponentAdapterFactory(attributes); + ComponentFactory componentFactory = createComponentAdapterFactory(attributes); childContainer = new DefaultPicoContainer( - getDecorationDelegate().decorate(componentAdapterFactory, attributes), parent); + getDecorationDelegate().decorate(componentFactory, attributes), parent); if ( isAttribute(attributes, COMPONENT_MONITOR) ) { changeComponentMonitor(childContainer, createComponentMonitor(attributes)); } parent.addChildContainer(childContainer); } else if ( isAttribute(attributes, COMPONENT_MONITOR) ) { - ComponentFactory componentAdapterFactory = new CachingBehaviorFactory().forThis(new AnyInjectionFactory()); - childContainer = new DefaultPicoContainer(getDecorationDelegate().decorate(componentAdapterFactory, attributes), parent); + ComponentFactory componentFactory = new CachingBehaviorFactory().forThis(new AnyInjectionFactory()); + childContainer = new DefaultPicoContainer(getDecorationDelegate().decorate(componentFactory, attributes), parent); changeComponentMonitor(childContainer, createComponentMonitor(attributes)); } else { childContainer = parent.makeChildContainer(); @@ -161,9 +161,9 @@ return PicoContainer.class.getClassLoader(); } }); - ComponentFactory componentAdapterFactory = createComponentAdapterFactory(attributes); + ComponentFactory componentFactory = createComponentAdapterFactory(attributes); childContainer = new DefaultPicoContainer( - getDecorationDelegate().decorate(componentAdapterFactory, attributes)); + getDecorationDelegate().decorate(componentFactory, attributes)); if ( isAttribute(attributes, COMPONENT_MONITOR) ) { changeComponentMonitor(childContainer, createComponentMonitor(attributes)); } Modified: java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderAopTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderAopTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderAopTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -169,7 +169,7 @@ "caf = new TestComponentAdapterFactory(cafLog)\n" + "cuts = new DynaopPointcutsFactory()\n" + "builder = new DynaopGroovyNodeBuilder()\n" + - "nano = builder.container(componentAdapterFactory:caf) {\n" + + "nano = builder.container(componentFactory:caf) {\n" + " aspect(classCut:cuts.instancesOf(Dao.class), methodCut:cuts.allMethods(), interceptor:logger)\n" + " component(key:Dao, class:DaoImpl)\n" + " component(key:'intLog', instance:intLog)\n" + Modified: java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderScriptedTestCase.groovy (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderScriptedTestCase.groovy 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderScriptedTestCase.groovy 2007-06-10 17:15:13 UTC (rev 3512) @@ -71,7 +71,7 @@ def builder = new GroovyNodeBuilder() def caf = new TestComponentAdapterFactory(sb) - def nano = builder.container(componentAdapterFactory:caf) { + def nano = builder.container(componentFactory:caf) { component(key:WebServerConfig, class:DefaultWebServerConfig) component(key:WebServer, class:WebServerImpl) } Modified: java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nano2/container-groovy/src/test/org/nanocontainer/script/groovy/GroovyNodeBuilderTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -268,7 +268,7 @@ Reader script = new StringReader("" + "package org.nanocontainer.script.groovy\n" + "import org.nanocontainer.testmodel.*\n" + - "nano = builder.container(componentAdapterFactory:assemblyScope) {\n" + + "nano = builder.container(componentFactory:assemblyScope) {\n" + " component(A)\n" + "}"); @@ -276,8 +276,8 @@ Mock cafMock = mock(ComponentFactory.class); cafMock.expects(once()).method("createComponentAdapter").with(new Constraint[] { isA(ComponentMonitor.class), isA(LifecycleStrategy.class), isA(ComponentCharacteristic.class), same(A.class), same(A.class), eq(null)}).will(returnValue(new InstanceAdapter(A.class, a, NullLifecycleStrategy.getInstance(), NullComponentMonitor.getInstance()))); - ComponentFactory componentAdapterFactory = (ComponentFactory) cafMock.proxy(); - PicoContainer pico = buildContainer(script, null, componentAdapterFactory); + ComponentFactory componentFactory = (ComponentFactory) cafMock.proxy(); + PicoContainer pico = buildContainer(script, null, componentFactory); assertSame(a, pico.getComponent(A.class)); } @@ -311,7 +311,7 @@ "import org.nanocontainer.testmodel.*\n" + "writer = new StringWriter()\n" + "monitor = new WriterComponentMonitor(writer) \n"+ - "nano = builder.container(componentAdapterFactory: new CachingBehaviorFactory(), componentMonitor: monitor) {\n" + + "nano = builder.container(componentFactory: new CachingBehaviorFactory(), componentMonitor: monitor) {\n" + " component(A)\n" + " component(key:StringWriter, instance:writer)\n" + "}"); @@ -352,7 +352,7 @@ "import org.nanocontainer.testmodel.*\n" + "writer = new StringWriter()\n" + "monitor = new WriterComponentMonitor(writer) \n"+ - "nano = builder.container(parent:parent, componentAdapterFactory: new CachingBehaviorFactory(), componentMonitor: monitor) {\n" + + "nano = builder.container(parent:parent, componentFactory: new CachingBehaviorFactory(), componentMonitor: monitor) {\n" + " component(A)\n" + " component(key:StringWriter, instance:writer)\n" + "}"); Modified: java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactoryTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactoryTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/nanoextras2/remoting/remoting/src/test/org/nanocontainer/remoting/jmx/JMXExposingBehaviorFactoryTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -39,30 +39,30 @@ } public void testWillRegisterByDefaultComponentsThatAreMBeans() throws NotCompliantMBeanException { - final JMXExposingBehaviorFactory componentAdapterFactory = new JMXExposingBehaviorFactory( + final JMXExposingBehaviorFactory componentFactory = new JMXExposingBehaviorFactory( (MBeanServer)mockMBeanServer.proxy()); - componentAdapterFactory.forThis(new ConstructorInjectionFactory()); + componentFactory.forThis(new ConstructorInjectionFactory()); mockMBeanServer.expects(once()).method("registerMBean").with( isA(DynamicMBeanPerson.class), isA(ObjectName.class)); - final ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter( + final ComponentAdapter componentAdapter = componentFactory.createComponentAdapter( new NullComponentMonitor(), new NullLifecycleStrategy(), ComponentCharacteristics.CDI, PersonMBean.class, DynamicMBeanPerson.class, null); assertNotNull(componentAdapter); assertNotNull(componentAdapter.getComponentInstance(null)); } public void testWillRegisterByDefaultComponentsThatAreMBeansUnlessNOJMX() throws NotCompliantMBeanException { - final JMXExposingBehaviorFactory componentAdapterFactory = new JMXExposingBehaviorFactory( + final JMXExposingBehaviorFactory componentFactory = new JMXExposingBehaviorFactory( (MBeanServer)mockMBeanServer.proxy()); - componentAdapterFactory.forThis(new ConstructorInjectionFactory()); + componentFactory.forThis(new ConstructorInjectionFactory()); final ComponentCharacteristic rc = new ComponentCharacteristic() { }; ComponentCharacteristics.NOJMX.mergeInto(rc); - final ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter( + final ComponentAdapter componentAdapter = componentFactory.createComponentAdapter( new NullComponentMonitor(), new NullLifecycleStrategy(), rc, PersonMBean.class, DynamicMBeanPerson.class, null); assertNotNull(componentAdapter); assertNotNull(componentAdapter.getComponentInstance(null)); Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java (3511 => 3512) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/ComponentFactory.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -18,8 +18,8 @@ /** * <p/> - * A component adapter factory is responsible for creating - * {@link ComponentAdapter} component adapters. The main use of the component adapter factory is + * A component factory is responsible for creating + * {@link ComponentAdapter} component adapters. The main use of the component factory is * inside {@link DefaultPicoContainer#DefaultPicoContainer(ComponentFactory)}, where it can * be used to customize the default component adapter that is used when none is specified * explicitly. Modified: java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java (3511 => 3512) --- java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/pico2/container/src/java/org/picocontainer/DefaultPicoContainer.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -64,7 +64,7 @@ */ public class DefaultPicoContainer implements MutablePicoContainer, ComponentMonitorStrategy, Serializable { private final Map<Object, ComponentAdapter> componentKeyToAdapterCache = new HashMap<Object, ComponentAdapter>(); - private ComponentFactory componentAdapterFactory; + private ComponentFactory componentFactory; private PicoContainer parent; private final Set<PicoContainer> children = new HashSet<PicoContainer>(); @@ -101,11 +101,11 @@ * other ComponentAdapterFactories. * </em> * - * @param componentAdapterFactory the factory to use for creation of ComponentAdapters. + * @param componentFactory the factory to use for creation of ComponentAdapters. * @param parent the parent container (used for component dependency lookups). */ - public DefaultPicoContainer(ComponentFactory componentAdapterFactory, PicoContainer parent) { - this(componentAdapterFactory, new StartableLifecycleStrategy(NullComponentMonitor.getInstance()), parent, NullComponentMonitor.getInstance()); + public DefaultPicoContainer(ComponentFactory componentFactory, PicoContainer parent) { + this(componentFactory, new StartableLifecycleStrategy(NullComponentMonitor.getInstance()), parent, NullComponentMonitor.getInstance()); } /** @@ -119,26 +119,26 @@ * other ComponentAdapterFactories. * </em> * - * @param componentAdapterFactory the factory to use for creation of ComponentAdapters. + * @param componentFactory the factory to use for creation of ComponentAdapters. * @param lifecycleStrategy * the lifecylce strategy chosen for regiered * instance (not implementations!) * @param parent the parent container (used for component dependency lookups). */ - public DefaultPicoContainer(ComponentFactory componentAdapterFactory, + public DefaultPicoContainer(ComponentFactory componentFactory, LifecycleStrategy lifecycleStrategy, PicoContainer parent) { - this(componentAdapterFactory, lifecycleStrategy, parent, NullComponentMonitor.getInstance() ); + this(componentFactory, lifecycleStrategy, parent, NullComponentMonitor.getInstance() ); } - public DefaultPicoContainer(ComponentFactory componentAdapterFactory, + public DefaultPicoContainer(ComponentFactory componentFactory, LifecycleStrategy lifecycleStrategy, PicoContainer parent, ComponentMonitor componentMonitor) { - if (componentAdapterFactory == null) throw new NullPointerException("componentAdapterFactory"); + if (componentFactory == null) throw new NullPointerException("componentFactory"); if (lifecycleStrategy == null) throw new NullPointerException("lifecycleStrategy"); - this.componentAdapterFactory = componentAdapterFactory; + this.componentFactory = componentFactory; this.lifecycleStrategy = lifecycleStrategy; this.parent = parent; if (parent != null && !(parent instanceof EmptyPicoContainer)) { @@ -186,10 +186,10 @@ /** * Creates a new container with a custom ComponentAdapterFactory and no parent container. * - * @param componentAdapterFactory the ComponentAdapterFactory to use. + * @param componentFactory the ComponentAdapterFactory to use. */ - public DefaultPicoContainer(ComponentFactory componentAdapterFactory) { - this(componentAdapterFactory, null); + public DefaultPicoContainer(ComponentFactory componentFactory) { + this(componentFactory, null); } /** @@ -331,7 +331,7 @@ parameters = null; // backwards compatibility! solve this better later - Paul } if (componentImplementationOrInstance instanceof Class) { - ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter(componentMonitor, + ComponentAdapter componentAdapter = componentFactory.createComponentAdapter(componentMonitor, lifecycleStrategy, characteristic, componentKey, @@ -557,7 +557,7 @@ } public MutablePicoContainer makeChildContainer() { - DefaultPicoContainer pc = new DefaultPicoContainer(componentAdapterFactory, lifecycleStrategy, this); + DefaultPicoContainer pc = new DefaultPicoContainer(componentFactory, lifecycleStrategy, this); addChildContainer(pc); return pc; } Modified: java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/PicoBuilderTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/PicoBuilderTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/pico2/container/src/test/org/picocontainer/PicoBuilderTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -53,7 +53,7 @@ MutablePicoContainer mpc = new PicoBuilder().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -69,7 +69,7 @@ MutablePicoContainer mpc = new PicoBuilder().withLifecycle().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -83,7 +83,7 @@ MutablePicoContainer mpc = new PicoBuilder().withReflectionLifecycle().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -103,7 +103,7 @@ MutablePicoContainer mpc = new PicoBuilder().withConsoleMonitor().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -117,7 +117,7 @@ MutablePicoContainer mpc = new PicoBuilder().withLifecycle().withConsoleMonitor().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -133,7 +133,7 @@ MutablePicoContainer mpc = new PicoBuilder().withMonitor(ConsoleComponentMonitor.class).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -156,7 +156,7 @@ MutablePicoContainer mpc = new PicoBuilder().withHiddenImplementations().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -170,7 +170,7 @@ MutablePicoContainer mpc = new PicoBuilder().withComponentAdapterFactory(new ImplementationHidingBehaviorFactory()).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -184,7 +184,7 @@ MutablePicoContainer mpc = new PicoBuilder(SDI()).withBehaviors(caching(), threadSafe(), implHiding()).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + " delegate=org.picocontainer.behaviors.SynchronizedBehaviorFactory\n" + " delegate=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + @@ -201,7 +201,7 @@ MutablePicoContainer mpc = new PicoBuilder(new CustomParentcontainer()).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.PicoBuilderTestCase_CustomParentcontainer\n" + @@ -224,7 +224,7 @@ MutablePicoContainer mpc = new PicoBuilder().withSetterInjection().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.SetterInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n" + @@ -235,7 +235,7 @@ MutablePicoContainer mpc = new PicoBuilder().withAnnotationInjection().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnnotationInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnnotationInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n" + @@ -246,7 +246,7 @@ MutablePicoContainer mpc = new PicoBuilder().withConstructorInjection().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.ConstructorInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.ConstructorInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n" + @@ -257,7 +257,7 @@ MutablePicoContainer mpc = new PicoBuilder().withHiddenImplementations().withSetterInjection().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + @@ -269,7 +269,7 @@ MutablePicoContainer mpc = new PicoBuilder().withCaching().withHiddenImplementations().withSetterInjection().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.CachingBehaviorFactory\n" + " delegate=org.picocontainer.behaviors.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.SetterInjectionFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -282,7 +282,7 @@ MutablePicoContainer mpc = new PicoBuilder().withThreadSafety().build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.behaviors.SynchronizedBehaviorFactory\n" + + " componentFactory=org.picocontainer.behaviors.SynchronizedBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -296,7 +296,7 @@ MutablePicoContainer mpc = new PicoBuilder().withCustomContainerComponent(new SomeContainerDependency()).withComponentFactory(CustomComponentFactory.class).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.PicoBuilderTestCase_CustomComponentFactory\n" + + " componentFactory=org.picocontainer.PicoBuilderTestCase_CustomComponentFactory\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + " lifecycleStrategy=org.picocontainer.lifecycle.NullLifecycleStrategy\n" + " componentMonitor=org.picocontainer.monitors.NullComponentMonitor\n" + @@ -327,7 +327,7 @@ MutablePicoContainer mpc = new PicoBuilder().thisMutablePicoContainer(TestPicoContainer.class).build(); String foo = simplifyRepresentation(mpc); assertEquals("org.picocontainer.PicoBuilderTestCase_-TestPicoContainer\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -369,7 +369,7 @@ foo = foo.replaceAll("\n componentKeyToAdapterCache",""); foo = foo.replaceAll("\n startedComponentAdapters",""); foo = foo.replaceAll("\"class=","\"\nclass="); - foo = foo.replaceAll("\n componentAdapterFactory\n","\n"); + foo = foo.replaceAll("\n componentFactory\n","\n"); foo = foo.replaceAll("\n lifecycleManager",""); foo = foo.replaceAll("class=\"org.picocontainer.DefaultPicoContainer_1\"",""); foo = foo.replaceAll("class=\"org.picocontainer.DefaultPicoContainer_OrderedComponentAdapterLifecycleManager\"",""); Modified: java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/PicoGemsBuilderTestCase.java (3511 => 3512) --- java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/PicoGemsBuilderTestCase.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/PicoGemsBuilderTestCase.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -25,7 +25,7 @@ MutablePicoContainer mpc = new PicoBuilder().withBehaviors(IMPL_HIDING()).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.gems.adapters.ImplementationHidingBehaviorFactory\n" + + " componentFactory=org.picocontainer.gems.adapters.ImplementationHidingBehaviorFactory\n" + " delegate=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + @@ -39,7 +39,7 @@ MutablePicoContainer mpc = new PicoBuilder().withMonitor(Log4JComponentMonitor.class).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -53,7 +53,7 @@ MutablePicoContainer mpc = new PicoBuilder().withMonitor(LOG4J()).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -67,7 +67,7 @@ MutablePicoContainer mpc = new PicoBuilder().withMonitor(CommonsLoggingComponentMonitor.class).build(); String foo = simplifyRepresentation(mpc); assertEquals("PICO\n" + - " componentAdapterFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + + " componentFactory=org.picocontainer.injectors.AnyInjectionFactory\n" + " cdiDelegate\n" + " sdiDelegate\n" + " parent=org.picocontainer.containers.EmptyPicoContainer\n" + @@ -100,7 +100,7 @@ foo = foo.replaceAll("\n startedComponentAdapters",""); foo = foo.replaceAll("\n props",""); foo = foo.replaceAll("\"class=","\"\nclass="); - foo = foo.replaceAll("\n componentAdapterFactory\n","\n"); + foo = foo.replaceAll("\n componentFactory\n","\n"); foo = foo.replaceAll("\n componentMonitor\n","\n"); foo = foo.replaceAll("\n lifecycleManager",""); foo = foo.replaceAll("class=\"org.picocontainer.DefaultPicoContainer_1\"",""); Modified: java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactoryTest.java (3511 => 3512) --- java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactoryTest.java 2007-06-10 17:10:30 UTC (rev 3511) +++ java/sandbox/baby-steps/pico2/gems/src/test/org/picocontainer/gems/adapters/ThreadLocalComponentAdapterFactoryTest.java 2007-06-10 17:15:13 UTC (rev 3512) @@ -35,8 +35,8 @@ * @throws InterruptedException */ public final void testCreateComponentAdapterEnsuringThreadLocal() throws InterruptedException { - final ComponentFactory componentAdapterFactory = new ThreadLocalComponentAdapterFactory().forThis(new ConstructorInjectionFactory()); - final ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter( + final ComponentFactory componentFactory = new ThreadLocalComponentAdapterFactory().forThis(new ConstructorInjectionFactory()); + final ComponentAdapter componentAdapter = componentFactory.createComponentAdapter( new NullComponentMonitor(), new NullLifecycleStrategy(), null, List.class, ArrayList.class); final List list = (List)componentAdapter.getComponentInstance(null); list.add(this); @@ -62,8 +62,8 @@ * @throws InterruptedException */ public final void testCreateComponentAdapterFailingThreadLocal() throws InterruptedException { - final ComponentFactory componentAdapterFactory = new ThreadLocalComponentAdapterFactory(ThreadLocalComponentAdapterFactory.THREAD_ENSURES_LOCALITY).forThis(new ConstructorInjectionFactory()); - final ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter( + final ComponentFactory componentFactory = new ThreadLocalComponentAdapterFactory(ThreadLocalComponentAdapterFactory.THREAD_ENSURES_LOCALITY).forThis(new ConstructorInjectionFactory()); + final ComponentAdapter componentAdapter = componentFactory.createComponentAdapter( new NullComponentMonitor(), new NullLifecycleStrategy(), null, List.class, ArrayList.class); final List list = (List)componentAdapter.getComponentInstance(null); list.add(this); @@ -90,8 +90,8 @@ * @throws InterruptedException */ public final void testCreateComponentAdapterWorksForDifferentThreads() throws InterruptedException { - final ComponentFactory componentAdapterFactory = new ThreadLocalComponentAdapterFactory(ThreadLocalComponentAdapterFactory.THREAD_ENSURES_LOCALITY).forThis(new ConstructorInjectionFactory()); - final ComponentAdapter componentAdapter = componentAdapterFactory.createComponentAdapter( + final ComponentFactory componentFactory = new ThreadLocalComponentAdapterFactory(ThreadLocalComponentAdapterFactory.THREAD_ENSURES_LOCALITY).forThis(new ConstructorInjectionFactory()); + final ComponentAdapter componentAdapter = componentFactory.createComponentAdapter( new NullComponentMonitor(), new NullLifecycleStrategy(), null, List.class, ArrayList.class); final List list = (List)componentAdapter.getComponentInstance(null); list.add(this); To unsubscribe from this list please visit: http://xircles.codehaus.org/manage_email Loading Comments...
|
|
