[CVS nano] o Renamed assembler to builder

Commit in nano/src/java/org/nanocontainer on MAIN

Main.java +5 -4 1.6 -> 1.7

XmlCompositionNanoContainer.java +4 -5 1.5 -> 1.6

+9 -9

2 modified files

o Renamed assembler to builder
o Specification of adapter factory in root element is back
o Added eclipse jars

----------

nano /src /java /org /nanocontainer

Main.java 1.6 -> 1.7

diff -u -r1.6 -r1.7
--- Main.java 19 Jan 2004 20:40:24 -0000 1.6
+++ Main.java 25 Jan 2004 15:39:43 -0000 1.7
@@ -15,7 +15,7 @@

import org.picoextras.integrationkit.ContainerBuilder;
import org.picoextras.script.jython.JythonContainerAssembler;
import org.picoextras.script.rhino.JavascriptContainerAssembler;

-import org.picoextras.script.xml.XMLContainerAssembler;

+import org.picoextras.script.xml.XMLContainerBuilder;

import org.realityforge.cli.CLArgsParser;
import org.realityforge.cli.CLOption;
import org.realityforge.cli.CLOptionDescriptor;

@@ -34,9 +34,10 @@

private static final int COMPOSITION_OPT = 'c';

private static final Map extensionToAssemblerMap = new HashMap();

+

static {
extensionToAssemblerMap.put(".js", JavascriptContainerAssembler.class);

- extensionToAssemblerMap.put(".xml", XMLContainerAssembler.class);

+ extensionToAssemblerMap.put(".xml", XMLContainerBuilder.class);

extensionToAssemblerMap.put(".py", JythonContainerAssembler.class);
}

@@ -128,12 +129,12 @@

// This won't work. They all need different ctor parameters. We should use pico itself to assemble this!!
ContainerAssembler ca = (ContainerAssembler) containerAssemblerClass.newInstance();

- final ContainerBuilder cb = new org.picoextras.integrationkit.LifecycleContainerBuilder();

+ final ContainerBuilder cb = new org.picoextras.integrationkit.DefaultLifecycleContainerBuilder(ca);

final ObjectReference containerRef = new SimpleReference();

// build and start the container

- cb.buildContainer(containerRef, null, ca, null);

+ cb.buildContainer(containerRef, null, null);

// add a shutdown hook that will tell the builder to kill it.
Runnable shutdownHook = new Runnable() {

----------

nano /src /java /org /nanocontainer

XmlCompositionNanoContainer.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- XmlCompositionNanoContainer.java 19 Jan 2004 20:40:24 -0000 1.5
+++ XmlCompositionNanoContainer.java 25 Jan 2004 15:39:43 -0000 1.6
@@ -8,16 +8,15 @@

*****************************************************************************/
package org.nanocontainer;

-import org.picoextras.script.xml.XMLContainerAssembler;

+import org.picoextras.script.xml.XMLContainerBuilder;

/**
* @author Aslak Hellesøy
* @author Paul Hammant
* @author Ward Cunningham

- * @version $Revision: 1.5 $
- *

+ * @version $Revision: 1.6 $

* @deprecated To replace with a NanoContainer instance that is given a

- * {@link XMLContainerAssembler} instance in its ctor.

+ * {@link XMLContainerBuilder} instance in its ctor.

*/
public class XmlCompositionNanoContainer /*extends NanoContainer*/ {

@@ -57,7 +56,7 @@

// if (xmlFrontEndClassName != null && !xmlFrontEndClassName.equals("")) {
// xmlFrontEnd = createXmlFrontEnd(xmlFrontEndClassName);
// } else {

-// xmlFrontEnd = new XMLContainerAssembler();

+// xmlFrontEnd = new XMLContainerBuilder();

// }
// return xmlFrontEnd.createPicoContainer(rootElement);
// } catch (SAXException e) {