You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/06/02 09:30:55 UTC
svn commit: r411079 - in /geronimo/sandbox/gshell/trunk:
gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/
gshell-core/src/main/java/org/apache/geronimo/gshell/
gshell-core/src/main/java/org/apache/geronimo/gshell/command/
gshell-core/src/main/j...
Author: jdillon
Date: Fri Jun 2 00:30:54 2006
New Revision: 411079
URL: http://svn.apache.org/viewvc?rev=411079&view=rev
Log:
Stripped 'G' prefix
Added:
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveShell.java (contents, props changed)
- copied, changed from r411069, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveGShell.java
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java (contents, props changed)
- copied, changed from r411069, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java
geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/
geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/jline
geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/simple
geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/ShellTest.java (contents, props changed)
- copied, changed from r411069, geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/GShellTest.java
geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/MockCommandExecutor.java (with props)
geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ShellServer.java (contents, props changed)
- copied, changed from r411072, geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/GShellServer.java
Removed:
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveGShell.java
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/MockCommandExecutor.java
geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/GShellTest.java
geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/GShellServer.java
Modified:
geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/console/InteractiveConsole.java
geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ServerCommand.java
Modified: geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=411079&r1=411078&r2=411079&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java Fri Jun 2 00:30:54 2006
@@ -28,8 +28,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gshell.GShell;
-import org.apache.geronimo.gshell.InteractiveGShell;
+import org.apache.geronimo.gshell.Shell;
+import org.apache.geronimo.gshell.InteractiveShell;
import org.apache.geronimo.gshell.console.IO;
import org.apache.geronimo.gshell.console.Console;
import org.apache.geronimo.gshell.console.JLineConsole;
@@ -40,7 +40,7 @@
import jline.Terminal;
/**
- * Command-line interface to bootstrap GShell.
+ * Command-line interface to bootstrap Shell.
*
* @version $Id$
*/
@@ -101,7 +101,7 @@
.create('h'));
options.addOption(OptionBuilder.withLongOpt("version")
- .withDescription("Display GShell version")
+ .withDescription("Display Shell version")
.create('V'));
options.addOption(OptionBuilder.withLongOpt("define")
@@ -194,11 +194,11 @@
boolean debug = log.isDebugEnabled();
//
- // TODO: Need to pass GShell the ClassWorld, so that the application can add to it if needed
+ // TODO: Need to pass Shell the ClassWorld, so that the application can add to it if needed
//
// Startup the shell
- final GShell gshell = new GShell(io);
+ final Shell gshell = new Shell(io);
// Force interactive if there are no args
if (args.length == 0) {
@@ -236,7 +236,7 @@
//
Console console = new JLineConsole(io);
- InteractiveGShell interp = new InteractiveGShell(console, gshell);
+ InteractiveShell interp = new InteractiveShell(console, gshell);
// Check if there are args, and run them and then enter interactive
if (args.length != 0) {
Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveShell.java (from r411069, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveGShell.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveShell.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveShell.java&p1=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveGShell.java&r1=411069&r2=411079&rev=411079&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveGShell.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveShell.java Fri Jun 2 00:30:54 2006
@@ -22,11 +22,11 @@
import java.io.IOException;
/**
- * Provides the user-interaction bits for GShell.
+ * Provides the user-interaction bits for Shell.
*
* @version $Id$
*/
-public class InteractiveGShell
+public class InteractiveShell
extends InteractiveConsole
{
//
@@ -34,7 +34,7 @@
// Seems like that is what we are doing so far anyways (sub-classing that is)
//
- public InteractiveGShell(final Console console, final GShell gshell) throws IOException {
+ public InteractiveShell(final Console console, final Shell gshell) throws IOException {
super(console,
new InteractiveConsole.Executor() {
public Result execute(final String line) throws Exception {
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveShell.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveShell.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/InteractiveShell.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java (from r411069, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java&p1=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java&r1=411069&r2=411079&rev=411079&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java Fri Jun 2 00:30:54 2006
@@ -38,10 +38,10 @@
*
* @version $Id$
*/
-public class GShell
+public class Shell
implements CommandExecutor
{
- private static final Log log = LogFactory.getLog(GShell.class);
+ private static final Log log = LogFactory.getLog(Shell.class);
private final IO io;
@@ -53,7 +53,7 @@
private final Variables vars = new VariablesImpl();
- public GShell(final IO io) throws CommandException {
+ public Shell(final IO io) throws CommandException {
if (io == null) {
throw new IllegalArgumentException("IO is null");
}
@@ -72,7 +72,7 @@
this.commandLineBuilder = (CommandLineBuilder) shellContainer.getComponentInstanceOfType(CommandLineBuilder.class);
}
- public GShell() throws CommandException {
+ public Shell() throws CommandException {
this(new IO());
}
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/console/InteractiveConsole.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/console/InteractiveConsole.java?rev=411079&r1=411078&r2=411079&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/console/InteractiveConsole.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/console/InteractiveConsole.java Fri Jun 2 00:30:54 2006
@@ -133,8 +133,8 @@
//
// TODO: Probably need to expose more configurability for handing/rejecting shutdown
//
- // Use-case is that GShell might want to disallow and print a "use exit command",
- // but Script interp wants this to exit and return control to GShell.
+ // Use-case is that Shell might want to disallow and print a "use exit command",
+ // but Script interp wants this to exit and return control to Shell.
//
}
Added: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/jline
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/jline?rev=411079&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/jline (added)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/jline Fri Jun 2 00:30:54 2006
@@ -0,0 +1 @@
+org.apache.geronimo.gshell.console.JLineConsoleFactory
\ No newline at end of file
Added: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/simple
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/simple?rev=411079&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/simple (added)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/simple Fri Jun 2 00:30:54 2006
@@ -0,0 +1 @@
+org.apache.geronimo.gshell.console.SimpleConsoleFactory
\ No newline at end of file
Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/ShellTest.java (from r411069, geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/GShellTest.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/ShellTest.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/ShellTest.java&p1=geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/GShellTest.java&r1=411069&r2=411079&rev=411079&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/GShellTest.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/ShellTest.java Fri Jun 2 00:30:54 2006
@@ -21,29 +21,29 @@
import org.apache.geronimo.gshell.command.CommandNotFoundException;
/**
- * Unit tests for the {@link GShell} class.
+ * Unit tests for the {@link Shell} class.
*
* @version $Id$
*/
-public class GShellTest
+public class ShellTest
extends TestCase
{
public void testConstructorArgs() throws Exception {
try {
- new GShell(null);
+ new Shell(null);
fail("Accepted null value");
}
catch (IllegalArgumentException expected) {
// ignore
}
- new GShell();
+ new Shell();
- new GShell(new IO());
+ new Shell(new IO());
}
public void testExecuteVarargs() throws Exception {
- GShell shell = new GShell();
+ Shell shell = new Shell();
try {
shell.execute("foo", "bar", "baz");
@@ -54,7 +54,7 @@
}
public void testExecuteArray() throws Exception {
- GShell shell = new GShell();
+ Shell shell = new Shell();
try {
shell.execute(new String[]{ "foo", "bar", "baz" });
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/ShellTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/ShellTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/ShellTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/MockCommandExecutor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/MockCommandExecutor.java?rev=411079&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/MockCommandExecutor.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/MockCommandExecutor.java Fri Jun 2 00:30:54 2006
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.gshell.command;
+
+/**
+ * Unit tests for the {@link CommandSupport} class.
+ *
+ * @version $Id$
+ */
+public class MockCommandExecutor
+ implements CommandExecutor
+{
+ public String[] args;
+
+ public String commandName;
+
+ public int execute(String... args) throws Exception {
+ this.args = args;
+
+ return 0;
+ }
+
+ public int execute(String commandName, String[] args) throws Exception {
+ this.commandName = commandName;
+ this.args = args;
+
+ return 0;
+ }
+}
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/MockCommandExecutor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/MockCommandExecutor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/MockCommandExecutor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ServerCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ServerCommand.java?rev=411079&r1=411078&r2=411079&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ServerCommand.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ServerCommand.java Fri Jun 2 00:30:54 2006
@@ -30,7 +30,7 @@
import java.net.Socket;
/**
- * Starts a GShell server.
+ * Starts a Shell server.
*
* @version $Id$
*/
@@ -67,7 +67,7 @@
CommandLine line = parser.parse(options, args);
if (line.hasOption('h')) {
- io.out.println(getName() + " -- starts a GShell server");
+ io.out.println(getName() + " -- starts a Shell server");
io.out.println();
HelpFormatter formatter = new HelpFormatter();
@@ -99,7 +99,7 @@
private void server() throws Exception {
SocketHandler handler = new SocketHandler() {
- GShellServer server = new GShellServer();
+ ShellServer server = new ShellServer();
public void handle(final Socket socket) throws Exception {
assert socket != null;
Copied: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ShellServer.java (from r411072, geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/GShellServer.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ShellServer.java?p2=geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ShellServer.java&p1=geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/GShellServer.java&r1=411072&r2=411079&rev=411079&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/GShellServer.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ShellServer.java Fri Jun 2 00:30:54 2006
@@ -18,12 +18,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gshell.GShell;
-import org.apache.geronimo.gshell.InteractiveGShell;
+import org.apache.geronimo.gshell.Shell;
+import org.apache.geronimo.gshell.InteractiveShell;
import org.apache.geronimo.gshell.command.CommandException;
import org.apache.geronimo.gshell.console.IO;
import org.apache.geronimo.gshell.console.Console;
-import org.apache.geronimo.gshell.console.JLineConsole;
import org.apache.geronimo.gshell.console.ConsoleFactory;
import org.apache.xbean.finder.ResourceFinder;
@@ -33,8 +32,6 @@
import java.io.OutputStream;
import java.util.Map;
-import jline.ConsoleReader;
-
//
// NOTE: Some bits lifted from XBean Telnet module
//
@@ -44,15 +41,15 @@
*
* @version $Id$
*/
-public class GShellServer
+public class ShellServer
{
- private static final Log log = LogFactory.getLog(GShellServer.class);
+ private static final Log log = LogFactory.getLog(ShellServer.class);
private final ConsoleFactory consoleFactory;
- public GShellServer() throws Exception {
+ public ShellServer() throws Exception {
ResourceFinder resourceFinder = new ResourceFinder("META-INF/");
- Map<String, Class> resourcesMap = resourceFinder.mapAllImplementations(ConsoleFactory.class);
+ Map<String, Class> resourcesMap = resourceFinder.mapAvailableImplementations(ConsoleFactory.class);
//
// HACK: Just for now hardcode this
@@ -101,7 +98,7 @@
}
//
- // TODO: Need to figure out how to get the logging stream for this GShell to use
+ // TODO: Need to figure out how to get the logging stream for this Shell to use
// the given IO streams
//
@@ -110,9 +107,9 @@
Console console = consoleFactory.create(input, output);
io = console.getIO();
- GShell shell = new GShell(io);
+ Shell shell = new Shell(io);
- InteractiveGShell interp = new InteractiveGShell(console, shell);
+ InteractiveShell interp = new InteractiveShell(console, shell);
interp.run();
}
catch (Exception e) {
Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ShellServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ShellServer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ShellServer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain