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/26 04:17:17 UTC
svn commit: r417112 - in
/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell:
Shell.java commandline/CommandLine.java commandline/CommandLineBuilder.java
Author: jdillon
Date: Sun Jun 25 19:17:16 2006
New Revision: 417112
URL: http://svn.apache.org/viewvc?rev=417112&view=rev
Log:
CL now returns an Object, so pass it back
Modified:
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLine.java
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLineBuilder.java
Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java?rev=417112&r1=417111&r2=417112&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java Sun Jun 25 19:17:16 2006
@@ -110,13 +110,7 @@
}
CommandLine cl = commandLineBuilder.create(commandLine);
- cl.execute();
-
- //
- // TODO: Fix API to allow CL to pass back data
- //
-
- return Command.SUCCESS;
+ return cl.execute();
}
//
Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLine.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLine.java?rev=417112&r1=417111&r2=417112&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLine.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLine.java Sun Jun 25 19:17:16 2006
@@ -23,10 +23,5 @@
*/
public interface CommandLine
{
- //
- // TODO: If we descide on returning an Object from a command, then
- // this returns an Object too
- //
-
- void execute() throws Exception;
+ Object execute() throws Exception;
}
Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLineBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLineBuilder.java?rev=417112&r1=417111&r2=417112&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLineBuilder.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLineBuilder.java Sun Jun 25 19:17:16 2006
@@ -77,13 +77,13 @@
final ExecutingVisitor visitor = new ExecutingVisitor(this.shell);
return new CommandLine() {
- public void execute() throws Exception {
+ public Object execute() throws Exception {
//
// TODO: Handle ErrorNotification
//
- root.jjtAccept(visitor, null);
+ return root.jjtAccept(visitor, null);
}
};
}