svn commit: r693746 - /geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java

[jd...@apache.org]

Author: jdillon
Date: Wed Sep 10 02:08:23 2008
New Revision: 693746

URL: http://svn.apache.org/viewvc?rev=693746&view=rev
Log:
Don't deal with ClassWorlds at this level

Modified:
    geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java

Modified: geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=693746&r1=693745&r2=693746&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java (original)
+++ geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java Wed Sep 10 02:08:23 2008
@@ -33,7 +33,6 @@
 import org.apache.geronimo.gshell.application.settings.SettingsLocator;
 import org.apache.geronimo.gshell.wisdom.builder.ShellBuilder;
 import org.apache.geronimo.gshell.wisdom.builder.ShellBuilderImpl;
-import org.codehaus.plexus.classworlds.ClassWorld;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,16 +51,8 @@
     //       picked up on the initial loading of Log4j
     //
 
-    private final ClassWorld classWorld;
-
     private final IO io = new IO();
 
-    public Main(final ClassWorld classWorld) {
-        assert classWorld != null;
-
-        this.classWorld = classWorld;
-    }
-    
     //
     // TODO: Add flag to capture output to log file
     //       https://issues.apache.org/jira/browse/GSHELL-47
@@ -263,13 +254,9 @@
         System.exit(code);
     }
 
-    public static void main(final String[] args, final ClassWorld world) throws Exception {
-        Main main = new Main(world);
-        main.boot(args);
-    }
-
     public static void main(final String[] args) throws Exception {
-        main(args, new ClassWorld("gshell", Thread.currentThread().getContextClassLoader()));
+        Main main = new Main();
+        main.boot(args);
     }
 }