[CVS nano] nearer

Commit in nano/src on MAIN

java/org/nanocontainer/script/deployer/Deployer.java +2 -1 1.3 -> 1.4

test/org/nanocontainer/script/jython/JythonContainerBuilderTestCase.java +2 -2 1.3 -> 1.4

test/org/nanocontainer/script/rhino/JavascriptContainerBuilderTestCase.java +1 -1 1.4 -> 1.5

test/org/nanocontainer/script/xml/XMLContainerBuilderTestCase.java +2 -2 1.3 -> 1.4

+7 -6

4 modified files

nearer

----------

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

Deployer.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- Deployer.java 29 Jan 2004 00:03:43 -0000 1.3
+++ Deployer.java 29 Jan 2004 00:19:05 -0000 1.4
@@ -1,6 +1,6 @@

/**
* @author Aslak Hellesøy

- * @version $Revision: 1.3 $

+ * @version $Revision: 1.4 $

*/
package org.nanocontainer.script.deployer;

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

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

+import org.nanocontainer.script.ScriptedComposingLifecycleContainerBuilder;

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

----------

nano /src /test /org /nanocontainer /script /jython

JythonContainerBuilderTestCase.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- JythonContainerBuilderTestCase.java 28 Jan 2004 22:50:19 -0000 1.3
+++ JythonContainerBuilderTestCase.java 29 Jan 2004 00:19:05 -0000 1.4
@@ -3,7 +3,7 @@

import org.picocontainer.PicoContainer;
import org.picocontainer.defaults.UnsatisfiableDependenciesException;
import org.picoextras.integrationkit.PicoAssemblyException;

-import org.picoextras.script.AbstractScriptedComposingLifecycleContainerBuilderTestCase;

+import org.nanocontainer.script.AbstractScriptedComposingLifecycleContainerBuilderTestCase;

import org.picoextras.testmodel.WebServer;

import java.io.IOException;

@@ -12,7 +12,7 @@

/**
* @author Aslak Hellesøy

- * @version $Revision: 1.3 $

+ * @version $Revision: 1.4 $

*/
public class JythonContainerBuilderTestCase extends AbstractScriptedComposingLifecycleContainerBuilderTestCase {

----------

nano /src /test /org /nanocontainer /script /rhino

JavascriptContainerBuilderTestCase.java 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- JavascriptContainerBuilderTestCase.java 28 Jan 2004 22:50:19 -0000 1.4
+++ JavascriptContainerBuilderTestCase.java 29 Jan 2004 00:19:05 -0000 1.5
@@ -3,7 +3,7 @@

import org.mozilla.javascript.JavaScriptException;
import org.picocontainer.PicoContainer;
import org.picoextras.integrationkit.PicoAssemblyException;

-import org.picoextras.script.AbstractScriptedComposingLifecycleContainerBuilderTestCase;

+import org.nanocontainer.script.AbstractScriptedComposingLifecycleContainerBuilderTestCase;

import org.picoextras.testmodel.WebServer;
import org.picoextras.testmodel.WebServerConfig;
import org.picoextras.testmodel.WebServerImpl;

----------

nano /src /test /org /nanocontainer /script /xml

XMLContainerBuilderTestCase.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- XMLContainerBuilderTestCase.java 28 Jan 2004 22:50:19 -0000 1.3
+++ XMLContainerBuilderTestCase.java 29 Jan 2004 00:19:05 -0000 1.4
@@ -13,7 +13,7 @@

import org.picocontainer.PicoContainer;
import org.picocontainer.extras.ImplementationHidingComponentAdapterFactory;
import org.picoextras.integrationkit.PicoAssemblyException;

-import org.picoextras.script.AbstractScriptedComposingLifecycleContainerBuilderTestCase;

+import org.nanocontainer.script.AbstractScriptedComposingLifecycleContainerBuilderTestCase;

import org.picoextras.testmodel.DefaultWebServerConfig;
import org.picoextras.testmodel.WebServer;
import org.picoextras.testmodel.WebServerConfig;

@@ -31,7 +31,7 @@

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

- * @version $Revision: 1.3 $

+ * @version $Revision: 1.4 $

*/
public class XMLContainerBuilderTestCase extends AbstractScriptedComposingLifecycleContainerBuilderTestCase {