[CVS nano] nearer

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

Main.java +3 -3 1.8 -> 1.9

XmlCompositionNanoContainer.java +2 -3 1.7 -> 1.8

script/deployer/Deployer.java +4 -5 1.2 -> 1.3

script/jython/JythonContainerBuilder.java +2 -2 1.3 -> 1.4

script/rhino/JavascriptContainerBuilder.java +1 -1 1.4 -> 1.5

script/xml/XMLContainerBuilder.java +2 -2 1.5 -> 1.6

+14 -16

6 modified files

nearer

----------

nano /src /java /org /nanocontainer

Main.java 1.8 -> 1.9

diff -u -r1.8 -r1.9
--- Main.java 28 Jan 2004 22:56:48 -0000 1.8
+++ Main.java 29 Jan 2004 00:03:43 -0000 1.9
@@ -14,13 +14,13 @@

import org.picoextras.integrationkit.ContainerComposer;
import org.picoextras.integrationkit.ContainerBuilder;
import org.picoextras.integrationkit.DefaultLifecycleContainerBuilder;

-import org.picoextras.script.rhino.JavascriptContainerBuilder;
-import org.picoextras.script.xml.XMLContainerBuilder;
-import org.picoextras.script.jython.JythonContainerBuilder;

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

+import org.nanocontainer.script.rhino.JavascriptContainerBuilder;
+import org.nanocontainer.script.xml.XMLContainerBuilder;
+import org.nanocontainer.script.jython.JythonContainerBuilder;

import java.util.HashMap;
import java.util.Iterator;

----------

nano /src /java /org /nanocontainer

XmlCompositionNanoContainer.java 1.7 -> 1.8

diff -u -r1.7 -r1.8
--- XmlCompositionNanoContainer.java 28 Jan 2004 22:56:48 -0000 1.7
+++ XmlCompositionNanoContainer.java 29 Jan 2004 00:03:43 -0000 1.8
@@ -8,15 +8,14 @@

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

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

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

- * @version $Revision: 1.7 $

+ * @version $Revision: 1.8 $

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

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

+ * {@link org.nanocontainer.script.xml.XMLContainerBuilder} instance in its ctor.

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

----------

nano /src /java /org /nanocontainer /script /deployer

Deployer.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- Deployer.java 28 Jan 2004 22:50:18 -0000 1.2
+++ Deployer.java 29 Jan 2004 00:03:43 -0000 1.3
@@ -1,6 +1,6 @@

/**
* @author Aslak Hellesøy

- * @version $Revision: 1.2 $

+ * @version $Revision: 1.3 $

*/
package org.nanocontainer.script.deployer;

@@ -12,10 +12,9 @@

import org.picocontainer.defaults.ObjectReference;
import org.picocontainer.defaults.SimpleReference;
import org.picoextras.integrationkit.PicoAssemblyException;

-import org.picoextras.script.ScriptedComposingLifecycleContainerBuilder;
-import org.picoextras.script.jython.JythonContainerBuilder;
-import org.picoextras.script.rhino.JavascriptContainerBuilder;
-import org.picoextras.script.xml.XMLContainerBuilder;

+import org.nanocontainer.script.rhino.JavascriptContainerBuilder;
+import org.nanocontainer.script.jython.JythonContainerBuilder;
+import org.nanocontainer.script.xml.XMLContainerBuilder;

import java.io.InputStreamReader;
import java.util.HashMap;

----------

nano /src /java /org /nanocontainer /script /jython

JythonContainerBuilder.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- JythonContainerBuilder.java 28 Jan 2004 22:50:18 -0000 1.3
+++ JythonContainerBuilder.java 29 Jan 2004 00:03:43 -0000 1.4
@@ -2,7 +2,7 @@

import org.picocontainer.MutablePicoContainer;
import org.picocontainer.defaults.DefaultPicoContainer;

-import org.picoextras.script.ScriptedComposingLifecycleContainerBuilder;

+import org.nanocontainer.script.ScriptedComposingLifecycleContainerBuilder;

import org.python.util.PythonInterpreter;
import org.python.core.PySystemState;

@@ -15,7 +15,7 @@

* @author Paul Hammant
* @author Mike Royle
* @author Aslak Hellesøy

- * @version $Revision: 1.3 $

+ * @version $Revision: 1.4 $

*/
public class JythonContainerBuilder extends ScriptedComposingLifecycleContainerBuilder {
public JythonContainerBuilder(Reader script, ClassLoader classLoader) {

----------

nano /src /java /org /nanocontainer /script /rhino

JavascriptContainerBuilder.java 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- JavascriptContainerBuilder.java 28 Jan 2004 22:50:18 -0000 1.4
+++ JavascriptContainerBuilder.java 29 Jan 2004 00:03:43 -0000 1.5
@@ -3,7 +3,7 @@

import org.mozilla.javascript.*;
import org.picocontainer.MutablePicoContainer;
import org.picoextras.integrationkit.PicoAssemblyException;

-import org.picoextras.script.ScriptedComposingLifecycleContainerBuilder;

+import org.nanocontainer.script.ScriptedComposingLifecycleContainerBuilder;

import java.io.Reader;

----------

nano /src /java /org /nanocontainer /script /xml

XMLContainerBuilder.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- XMLContainerBuilder.java 28 Jan 2004 22:50:18 -0000 1.5
+++ XMLContainerBuilder.java 29 Jan 2004 00:03:43 -0000 1.6
@@ -20,7 +20,7 @@

import org.picoextras.integrationkit.PicoAssemblyException;
import org.picoextras.reflection.DefaultReflectionContainerAdapter;
import org.picoextras.reflection.ReflectionContainerAdapter;

-import org.picoextras.script.ScriptedComposingLifecycleContainerBuilder;

+import org.nanocontainer.script.ScriptedComposingLifecycleContainerBuilder;

import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;

@@ -43,7 +43,7 @@

* @author Paul Hammant
* @author Aslak Hellesøy
* @author Jeppe Cramon

- * @version $Revision: 1.5 $

+ * @version $Revision: 1.6 $

*/
public class XMLContainerBuilder extends ScriptedComposingLifecycleContainerBuilder {
private final Element rootElement;