[CVS nano] imports corrected

Commit in nano on MAIN

jmx/src/test/org/nanocontainer/jmx/NanoMXComponentFactoryTestCase.java +1 -1 1.2 -> 1.3

/NanoMXContainerTestCase.java +1 -1 1.3 -> 1.4

rhino/src/java/org/nanocontainer/rhino/DefaultNanoRhinoScriptable.java +8 -5 1.5 -> 1.6

rhino/src/test/org/nanocontainer/rhino/DefaultNanoRhinoScriptableTestCase.java +3 -3 1.3 -> 1.4

+13 -10

4 modified files

imports corrected

----------

nano /jmx /src /test /org /nanocontainer /jmx

NanoMXComponentFactoryTestCase.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- NanoMXComponentFactoryTestCase.java 6 Oct 2003 10:38:04 -0000 1.2
+++ NanoMXComponentFactoryTestCase.java 17 Nov 2003 20:33:31 -0000 1.3
@@ -10,7 +10,7 @@

package org.nanocontainer.jmx;

-import org.nanocontainer.testmodel.WilmaImpl;

+import org.picoextras.testmodel.WilmaImpl;

public class NanoMXComponentFactoryTestCase extends AbstractNanoMXTestCase {

----------

nano /jmx /src /test /org /nanocontainer /jmx

NanoMXContainerTestCase.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- NanoMXContainerTestCase.java 6 Oct 2003 10:38:04 -0000 1.3
+++ NanoMXContainerTestCase.java 17 Nov 2003 20:33:31 -0000 1.4
@@ -15,10 +15,10 @@

import javax.management.ObjectName;
import javax.management.MBeanServerFactory;

-import org.nanocontainer.testmodel.WilmaImpl;

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

+import org.picoextras.testmodel.WilmaImpl;

public class NanoMXContainerTestCase extends AbstractNanoMXTestCase {

----------

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

DefaultNanoRhinoScriptable.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- DefaultNanoRhinoScriptable.java 29 Oct 2003 08:03:49 -0000 1.5
+++ DefaultNanoRhinoScriptable.java 17 Nov 2003 20:33:31 -0000 1.6
@@ -8,16 +8,19 @@

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

-import org.mozilla.javascript.*;
-import org.nanocontainer.reflection.DefaultReflectionFrontEnd;
-import org.nanocontainer.reflection.ReflectionFrontEnd;

+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.NativeJavaObject;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;

import org.picocontainer.MutablePicoContainer;

-import org.picocontainer.defaults.DefaultPicoContainer;

import org.picocontainer.defaults.ComponentAdapterFactory;

+import org.picocontainer.defaults.DefaultPicoContainer;
+import org.picoextras.reflection.DefaultReflectionFrontEnd;
+import org.picoextras.reflection.ReflectionFrontEnd;

import java.io.File;
import java.io.IOException;

-import java.net.MalformedURLException;

public class DefaultNanoRhinoScriptable extends ScriptableObject implements NanoRhinoScriptable {

----------

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

DefaultNanoRhinoScriptableTestCase.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- DefaultNanoRhinoScriptableTestCase.java 8 Nov 2003 12:13:37 -0000 1.3
+++ DefaultNanoRhinoScriptableTestCase.java 17 Nov 2003 20:33:32 -0000 1.4
@@ -1,11 +1,11 @@

package org.nanocontainer.rhino;

import junit.framework.TestCase;

-import org.nanocontainer.testmodel.WebServer;
-import org.nanocontainer.testmodel.WebServerImpl;
-import org.nanocontainer.testmodel.WebServerConfig;

import org.picocontainer.PicoCompositionException;
import org.picocontainer.PicoContainer;

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

import java.io.File;
import java.io.IOException;