[picocontainer-scm] [5639] java/2.x/trunk/script: -Update to Pico 2.10

Revision 5639
Author rimovm
Date 2010-02-23 15:38:31 -0600 (Tue, 23 Feb 2010)

Log Message

-Update to Pico 2.10
-Minor code cleanups to reduce Eclipse's whining
-Test case fix for the way Pico 2.10 does things.

Modified Paths

- java/2.x/trunk/script/pom.xml

- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/AbstractContainerBuilder.java

- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/DefaultContainerBuilder.java

- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/LifecycleMode.java

- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/NodeBuilderDecorator.java

- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/NullNodeBuilderDecorator.java

- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedBuilder.java

- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedContainerBuilder.java

- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedContainerBuilderFactory.java

- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/Standalone.java

- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/UnsupportedScriptTypeException.java

- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/xml/XMLContainerBuilder.java

- java/2.x/trunk/script/script-groovy/pom.xml

- java/2.x/trunk/script/script-groovy/src/test/org/picocontainer/script/groovy/GroovyNodeBuilderTestCase.java

Diff

Modified: java/2.x/trunk/script/pom.xml (5638 => 5639)

--- java/2.x/trunk/script/pom.xml 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/pom.xml 2010-02-23 21:38:31 UTC (rev 5639)
@@ -24,7 +24,7 @@
<description><![CDATA[Please refer to the <a href="http://picocontainer.org/script">main website</a> for documentation.]]></description>
<issueManagement>
<system>JIRA</system>
- <url>http://jira.codehaus.org/browse/NANO</url>
+ <url>http://jira.codehaus.org/browse/PICO</url>
</issueManagement>
<licenses>
<license>
@@ -50,7 +50,7 @@
</snapshotRepository>
</distributionManagement>
<properties>
- <pico.version>2.9</pico.version>
+ <pico.version>2.10</pico.version>
</properties>
<dependencyManagement>
<dependencies>

Modified: java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/AbstractContainerBuilder.java (5638 => 5639)

--- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/AbstractContainerBuilder.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/AbstractContainerBuilder.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -65,25 +65,21 @@
}

public void killContainer(PicoContainer container) {
- try {
- if (startMode.isInvokeLifecycle()) {
- if (container instanceof Startable) {
- ((Startable) container).stop();
- }
+ if (startMode.isInvokeLifecycle()) {
+ if (container instanceof Startable) {
+ ((Startable) container).stop();
}
+ }

- if (container instanceof Disposable) {
- ((Disposable) container).dispose();
+ if (container instanceof Disposable) {
+ ((Disposable) container).dispose();
+ }
+ PicoContainer parent = container.getParent();
+ if (parent != null && parent instanceof MutablePicoContainer) {
+ // see comment in buildContainer
+ synchronized (parent) {
+ ((MutablePicoContainer) parent).removeChildContainer(container);
}
- PicoContainer parent = container.getParent();
- if (parent != null && parent instanceof MutablePicoContainer) {
- // see comment in buildContainer
- synchronized (parent) {
- ((MutablePicoContainer) parent).removeChildContainer(container);
- }
- }
- } finally {
- container = null;
}
}

Modified: java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/DefaultContainerBuilder.java (5638 => 5639)

--- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/DefaultContainerBuilder.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/DefaultContainerBuilder.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -12,14 +12,17 @@
import org.picocontainer.PicoContainer;

/**
- * Default builder creates an empty caching DefaultPicoContainer
+ * Default builder creates an empty caching DefaultPicoContainer.
+ * <p>Note that assembly scope is ignored when creating the container.</p>
*/
public class DefaultContainerBuilder extends AbstractContainerBuilder {

public DefaultContainerBuilder() {
+ //default constructor
}

// TODO better solution to activate default caching
+ @Override
protected PicoContainer createContainer(PicoContainer parentContainer, Object assemblyScope) {
return (new DefaultPicoContainer(parentContainer)).change(Characteristics.CACHE);
}

Modified: java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/LifecycleMode.java (5638 => 5639)

--- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/LifecycleMode.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/LifecycleMode.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -28,7 +28,7 @@

/**
* Returns true if lifecycle methods should be called.
- * @return
+ * @return true/false
*/
public boolean isInvokeLifecycle() {
return (this.equals(AUTO_LIFECYCLE));

Modified: java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/NodeBuilderDecorator.java (5638 => 5639)

--- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/NodeBuilderDecorator.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/NodeBuilderDecorator.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -14,8 +14,7 @@

/**
* NodeBuilderDecorators allows to dynamically extend node-based builder syntax,
- * such as
- * {@link org.picocontainer.script.groovy.GroovyNodeBuilder GroovyNodeBuilder}.
+ * such as <a href="http://picocontainer.org/script/javadoc/groovy/org/picocontainer/script/groovy/GroovyNodeBuilder.html">GroovyNodeBuilder</a>.
*
* @author Paul Hammant
* @author Aslak Helles&oslash;y

Modified: java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/NullNodeBuilderDecorator.java (5638 => 5639)

--- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/NullNodeBuilderDecorator.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/NullNodeBuilderDecorator.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -18,7 +18,7 @@
* @author Aslak Helles&oslash;y
* @author Paul Hammant
*/
-@SuppressWarnings("unchecked")
+@SuppressWarnings({"unchecked","unused"})
public class NullNodeBuilderDecorator implements NodeBuilderDecorator {
public ComponentFactory decorate(ComponentFactory componentFactory, Map attributes) {
return componentFactory;
@@ -34,5 +34,6 @@
}

public void rememberComponentKey(Map attributes) {
+ //Does nothing.
}
}

Modified: java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedBuilder.java (5638 => 5639)

--- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedBuilder.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedBuilder.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -139,8 +139,8 @@
return this;
}

- public ScriptedBuilder withClassLoader(ClassLoader classLoader) {
- this.classLoader = classLoader;
+ public ScriptedBuilder withClassLoader(ClassLoader usingClassloader) {
+ this.classLoader = usingClassloader;
return this;
}

Modified: java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedContainerBuilder.java (5638 => 5639)

--- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedContainerBuilder.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedContainerBuilder.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -63,6 +63,7 @@
}
}

+ @Override
protected final PicoContainer createContainer(PicoContainer parentContainer, Object assemblyScope) {
try {
return createContainerFromScript(parentContainer, assemblyScope);
@@ -82,9 +83,11 @@
return classLoader;
}

+ @SuppressWarnings("synthetic-access")
protected final InputStream getScriptInputStream() throws IOException{
if ( scriptReader != null ){
return new InputStream() {
+ @Override
public int read() throws IOException {
return scriptReader.read();
}

Modified: java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedContainerBuilderFactory.java (5638 => 5639)

--- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedContainerBuilderFactory.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/ScriptedContainerBuilderFactory.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -50,7 +50,6 @@
* the name of the builder should be.
* @param scriptedBuilderResolver ScriptedBuilderNameResolver the resolver of
* container builder class names from file names.
- * @throws IOException upon File name resolution error
* @throws UnsupportedScriptTypeException if the extension of the file does
* not match that of any known script.
* @throws FileNotFoundException if composition file is not found

Modified: java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/Standalone.java (5638 => 5639)

--- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/Standalone.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/Standalone.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -12,16 +12,12 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
-import org.picocontainer.script.ScriptedContainerBuilderFactory;
-import org.picocontainer.ObjectReference;
import org.picocontainer.PicoContainer;
-import org.picocontainer.references.SimpleReference;

/**
* Standalone offers a command line interface to PicoContainer.
@@ -165,6 +161,7 @@
}
}

+ @SuppressWarnings("synthetic-access")
private static void setShutdownHook(final boolean quiet, final ScriptedContainerBuilderFactory scriptedContainerBuilderFactory, final PicoContainer container) {
// add a shutdown hook that will tell the builder to kill it.
Runnable shutdownHook = new Runnable() {

Modified: java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/UnsupportedScriptTypeException.java (5638 => 5639)

--- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/UnsupportedScriptTypeException.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/UnsupportedScriptTypeException.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -59,6 +59,7 @@
return message.toString();
}

+ @Override
public String getMessage() {
return buildExceptionMessage();
}

Modified: java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/xml/XMLContainerBuilder.java (5638 => 5639)

--- java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/xml/XMLContainerBuilder.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-core/src/java/org/picocontainer/script/xml/XMLContainerBuilder.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -264,8 +264,9 @@
}
}

+ @SuppressWarnings("serial")
public class ForCaf extends Properties {
- private String key;
+
public ForCaf(String key) {
super.put("ForCAF", key);
}
@@ -564,6 +565,7 @@
}

+ @SuppressWarnings({"serial","synthetic-access"})
public static class CompFactoryWrappingComponentFactory extends AbstractInjectionFactory {

ConstructorInjection constructorInjection = new ConstructorInjection();
@@ -575,24 +577,26 @@
String otherKey = props.getProperty("ForCAF");
if (otherKey != null && !otherKey.equals("")) {
props.remove("ForCAF");
- return new MySingleMemberInjector(key, impl, parms, monitor, lifecycle, false, otherKey, (Injector) adapter);
+ return new MySingleMemberInjector(key, impl, parms, monitor, false, otherKey, (Injector) adapter);
}
return adapter;
}
}

+ @SuppressWarnings("serial")
private static class MySingleMemberInjector extends SingleMemberInjector {
private final String otherKey;
private final Injector injector;

private MySingleMemberInjector(Object key, Class impl, Parameter[] parms,
- ComponentMonitor monitor, LifecycleStrategy lifecycle,
+ ComponentMonitor monitor,
boolean useNames, String otherKey, Injector injector) {
- super(key, impl, parms, monitor, lifecycle, useNames);
+ super(key, impl, parms, monitor, useNames);
this.otherKey = otherKey;
this.injector = injector;
}

+ @Override
public Object getComponentInstance(PicoContainer container, Type into) throws PicoCompositionException {
BehaviorFactory bf = (BehaviorFactory) injector.getComponentInstance(container, into);
bf.wrap((ComponentFactory) container.getComponent(otherKey));

Modified: java/2.x/trunk/script/script-groovy/pom.xml (5638 => 5639)

--- java/2.x/trunk/script/script-groovy/pom.xml 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-groovy/pom.xml 2010-02-23 21:38:31 UTC (rev 5639)
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.7.0</version>
+ <version>1.7.1</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>

Modified: java/2.x/trunk/script/script-groovy/src/test/org/picocontainer/script/groovy/GroovyNodeBuilderTestCase.java (5638 => 5639)

--- java/2.x/trunk/script/script-groovy/src/test/org/picocontainer/script/groovy/GroovyNodeBuilderTestCase.java 2010-02-23 04:22:59 UTC (rev 5638)
+++ java/2.x/trunk/script/script-groovy/src/test/org/picocontainer/script/groovy/GroovyNodeBuilderTestCase.java 2010-02-23 21:38:31 UTC (rev 5639)
@@ -574,8 +574,8 @@

MutablePicoContainer pico = (MutablePicoContainer)buildContainer(script, parent, ASSEMBLY_SCOPE);
// Should be able to get instance that was registered in the parent container
- ComponentAdapter<String> componentAdapter = pico.addComponent(String.class).getComponentAdapter(String.class, (NameBinding) null);
- assertTrue("ComponentAdapter should be originally defined by parent" , componentAdapter instanceof SetterInjector);
+ ComponentAdapter<String> componentAdapter = pico.addComponent(String.class).getComponentAdapter(String.class, (NameBinding) null);
+ assertNotNull("ComponentAdapter should be originally defined by parent" , componentAdapter.findAdapterOfType(SetterInjector.class));
}

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email