jdillon 2003/09/05 13:25:37
Modified: modules/twiddle/src/bin twiddle twiddle.bat
modules/twiddle/src/java/org/apache/geronimo/twiddle
Twiddle.java
modules/twiddle/src/java/org/apache/geronimo/twiddle/cli
Main.java
modules/twiddle/src/java/org/apache/geronimo/twiddle/command
CommandFactory.java CommandInfo.java
modules/twiddle/src/java/org/apache/geronimo/twiddle/config
Configurator.java
modules/twiddle/src/test/org/apache/geronimo/twiddle/command
CommandContainerTest.java CommandFactoryTest.java
Log:
o Updated to use new classworlds snaps (package changed)
Revision Changes Path
1.5 +2 -2 incubator-geronimo/modules/twiddle/src/bin/twiddle
Index: twiddle
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/twiddle/src/bin/twiddle,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- twiddle 29 Aug 2003 12:37:35 -0000 1.4
+++ twiddle 5 Sep 2003 20:25:36 -0000 1.5
@@ -136,5 +136,5 @@
-Dtwiddle.home="$TWIDDLE_HOME" \
-Dtools.jar="$TOOLS_JAR" \
-Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.rmi.RMIClassLoaderSpiImpl
\
- com.werken.classworlds.Launcher "$@"
+ org.codehaus.classworlds.Launcher "$@"
fi
1.4 +2 -2 incubator-geronimo/modules/twiddle/src/bin/twiddle.bat
Index: twiddle.bat
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/twiddle/src/bin/twiddle.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- twiddle.bat 29 Aug 2003 12:37:35 -0000 1.3
+++ twiddle.bat 5 Sep 2003 20:25:36 -0000 1.4
@@ -85,7 +85,7 @@
:execute
@rem Setup the command line
set
CLASSWORLDS_CLASSPATH=%TWIDDLE_HOME%\lib\classworlds-%CLASSWORLDS_VERSION%.jar;%TWIDDLE_HOME%\lib\geronimo-core-rmiclassloaderspi.jar
-set CLASSWORLDS_MAIN_CLASS=com.werken.classworlds.Launcher
+set CLASSWORLDS_MAIN_CLASS=org.codehaus.classworlds.Launcher
set CLASSWORLDS_CONF=%TWIDDLE_HOME%\etc\classworlds.conf
set JAVA_EXE=%JAVA_HOME%\bin\java.exe
1.12 +3 -3
incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/Twiddle.java
Index: Twiddle.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/Twiddle.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Twiddle.java 27 Aug 2003 11:59:59 -0000 1.11
+++ Twiddle.java 5 Sep 2003 20:25:36 -0000 1.12
@@ -65,8 +65,8 @@
import java.io.StringWriter;
import java.io.PrintWriter;
-import com.werken.classworlds.ClassWorld;
-import com.werken.classworlds.DuplicateRealmException;
+import org.codehaus.classworlds.ClassWorld;
+import org.codehaus.classworlds.DuplicateRealmException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.13 +2 -2
incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/cli/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/cli/Main.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Main.java 27 Aug 2003 11:08:57 -0000 1.12
+++ Main.java 5 Sep 2003 20:25:36 -0000 1.13
@@ -62,7 +62,7 @@
import java.net.URL;
-import com.werken.classworlds.ClassWorld;
+import org.codehaus.classworlds.ClassWorld;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.Option;
1.8 +4 -4
incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandFactory.java
Index: CommandFactory.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CommandFactory.java 27 Aug 2003 12:00:00 -0000 1.7
+++ CommandFactory.java 5 Sep 2003 20:25:37 -0000 1.8
@@ -62,9 +62,9 @@
import java.lang.reflect.InvocationTargetException;
-import com.werken.classworlds.ClassWorld;
-import com.werken.classworlds.ClassRealm;
-import com.werken.classworlds.NoSuchRealmException;
+import org.codehaus.classworlds.ClassWorld;
+import org.codehaus.classworlds.ClassRealm;
+import org.codehaus.classworlds.NoSuchRealmException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.6 +2 -2
incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandInfo.java
Index: CommandInfo.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/command/CommandInfo.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CommandInfo.java 27 Aug 2003 12:00:00 -0000 1.5
+++ CommandInfo.java 5 Sep 2003 20:25:37 -0000 1.6
@@ -56,7 +56,7 @@
package org.apache.geronimo.twiddle.command;
-import com.werken.classworlds.ClassWorld;
+import org.codehaus.classworlds.ClassWorld;
import org.apache.geronimo.common.NullArgumentException;
1.12 +5 -5
incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/config/Configurator.java
Index: Configurator.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/config/Configurator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Configurator.java 3 Sep 2003 13:50:29 -0000 1.11
+++ Configurator.java 5 Sep 2003 20:25:37 -0000 1.12
@@ -65,10 +65,10 @@
import java.util.List;
import java.util.LinkedList;
-import com.werken.classworlds.ClassWorld;
-import com.werken.classworlds.ClassRealm;
-import com.werken.classworlds.NoSuchRealmException;
-import com.werken.classworlds.ClassWorldException;
+import org.codehaus.classworlds.ClassWorld;
+import org.codehaus.classworlds.ClassRealm;
+import org.codehaus.classworlds.NoSuchRealmException;
+import org.codehaus.classworlds.ClassWorldException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +2 -2
incubator-geronimo/modules/twiddle/src/test/org/apache/geronimo/twiddle/command/CommandContainerTest.java
Index: CommandContainerTest.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/twiddle/src/test/org/apache/geronimo/twiddle/command/CommandContainerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommandContainerTest.java 27 Aug 2003 12:00:00 -0000 1.2
+++ CommandContainerTest.java 5 Sep 2003 20:25:37 -0000 1.3
@@ -61,7 +61,7 @@
import junit.framework.TestCase;
-import com.werken.classworlds.ClassWorld;
+import org.codehaus.classworlds.ClassWorld;
import org.apache.geronimo.common.NullArgumentException;
import org.apache.geronimo.twiddle.config.CommandConfig;
1.9 +2 -2
incubator-geronimo/modules/twiddle/src/test/org/apache/geronimo/twiddle/command/CommandFactoryTest.java
Index: CommandFactoryTest.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/twiddle/src/test/org/apache/geronimo/twiddle/command/CommandFactoryTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CommandFactoryTest.java 27 Aug 2003 12:00:00 -0000 1.8
+++ CommandFactoryTest.java 5 Sep 2003 20:25:37 -0000 1.9
@@ -58,7 +58,7 @@
import junit.framework.TestCase;
-import com.werken.classworlds.ClassWorld;
+import org.codehaus.classworlds.ClassWorld;
import org.apache.geronimo.twiddle.config.CommandConfig;
import org.apache.geronimo.twiddle.config.Attribute;