[CVS nano] corrections after move

Commit in nano/src on MAIN

java/org/nanocontainer/script/jython/JythonContainerBuilder.java +1 -2 1.4 -> 1.5

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

+2 -3

2 modified files

corrections after move

----------

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

JythonContainerBuilder.java 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- JythonContainerBuilder.java 29 Jan 2004 00:03:43 -0000 1.4
+++ JythonContainerBuilder.java 6 Feb 2004 21:20:37 -0000 1.5
@@ -15,7 +15,7 @@

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

- * @version $Revision: 1.4 $

+ * @version $Revision: 1.5 $

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

@@ -30,7 +30,6 @@

PythonInterpreter interpreter = new PythonInterpreter();
interpreter.exec("from org.picocontainer.defaults import *");

- interpreter.exec("from org.picocontainer.extras import *");

interpreter.exec("from org.picoextras.reflection import *");
interpreter.exec("from java.net import *");
interpreter.execfile(new InputStream() {

----------

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

JavascriptContainerBuilderTestCase.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- JavascriptContainerBuilderTestCase.java 29 Jan 2004 00:19:05 -0000 1.5
+++ JavascriptContainerBuilderTestCase.java 6 Feb 2004 21:20:37 -0000 1.6
@@ -20,7 +20,7 @@

Reader script = new StringReader("" +
"var pico = new DefaultPicoContainer()\n" +

- "pico.registerComponentImplementation(Packages.org.picoextras.testmodel.DefaultWebServerConfigXX)\n");

+ "pico.registerComponentImplementation(Packages.org.picoextras.testmodel.DefaultWebServerConfig)\n");

PicoContainer pico = buildContainer(new JavascriptContainerBuilder(script, getClass().getClassLoader()));