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 2008/05/31 08:47:31 UTC
svn commit: r661964 - in /geronimo/gshell/trunk:
gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/
gshell-buildsupport/gshell-maven-plugin/
gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gsh...
Author: jdillon
Date: Fri May 30 23:47:30 2008
New Revision: 661964
URL: http://svn.apache.org/viewvc?rev=661964&view=rev
Log:
Commit some fixes before I revert back the whole api mess I made
Modified:
geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/CommandComponent.java
geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Dependency.java
geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Parameter.java
geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Requirement.java
geronimo/gshell/trunk/gshell-buildsupport/gshell-maven-plugin/pom.xml
geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/CatCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/SleepCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/WaitCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-repository/src/main/java/org/apache/geronimo/gshell/commands/repository/ResolveCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/VFSCommandSupport.java
geronimo/gshell/trunk/gshell-plugin/pom.xml
geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/GShellBuilderTest.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java
geronimo/gshell/trunk/gshell-remote/pom.xml
Modified: geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/CommandComponent.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/CommandComponent.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/CommandComponent.java (original)
+++ geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/CommandComponent.java Fri May 30 23:47:30 2008
@@ -31,7 +31,7 @@
//
/**
- * ???
+ * Defines a command componet.
*
* @version $Rev$ $Date$
*/
Modified: geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Dependency.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Dependency.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Dependency.java (original)
+++ geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Dependency.java Fri May 30 23:47:30 2008
@@ -27,7 +27,7 @@
import java.lang.annotation.Target;
/**
- * ????
+ * Defines a depedency of a command.
*
* @version $Rev$ $Date$
*/
Modified: geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Parameter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Parameter.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Parameter.java (original)
+++ geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Parameter.java Fri May 30 23:47:30 2008
@@ -27,7 +27,7 @@
import java.lang.annotation.Target;
/**
- * ???
+ * Defines a parameter of a command.
*
* @version $Rev$ $Date$
*/
Modified: geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Requirement.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Requirement.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Requirement.java (original)
+++ geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/annotation/Requirement.java Fri May 30 23:47:30 2008
@@ -27,7 +27,7 @@
import java.lang.annotation.Target;
/**
- * ????
+ * Defines a requirement of a command.
*
* @version $Rev$ $Date$
*/
Modified: geronimo/gshell/trunk/gshell-buildsupport/gshell-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-buildsupport/gshell-maven-plugin/pom.xml?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-buildsupport/gshell-maven-plugin/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-buildsupport/gshell-maven-plugin/pom.xml Fri May 30 23:47:30 2008
@@ -38,6 +38,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.geronimo.gshell.api</groupId>
+ <artifactId>gshell-command-annotation</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-core</artifactId>
</dependency>
Modified: geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptCommand.java Fri May 30 23:47:30 2008
@@ -24,6 +24,8 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.command.CommandException;
+import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.console.Console;
import org.apache.geronimo.gshell.console.JLineConsole;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java Fri May 30 23:47:30 2008
@@ -22,6 +22,7 @@
import jline.ConsoleReader;
import org.apache.geronimo.gshell.ansi.ANSI;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.command.CommandSupport;
import java.io.PrintWriter;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java Fri May 30 23:47:30 2008
@@ -24,6 +24,7 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.command.CommandSupport;
/**
* A simple command to <em>echo</em> all given arguments to the commands standard output.
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java Fri May 30 23:47:30 2008
@@ -21,6 +21,8 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.command.CommandSupport;
+import org.apache.geronimo.gshell.ExitNotification;
/**
* Exit the current shell.
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java Fri May 30 23:47:30 2008
@@ -24,6 +24,8 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.command.annotation.Requirement;
+import org.apache.geronimo.gshell.command.CommandSupport;
+import org.apache.geronimo.gshell.command.Command;
import org.apache.geronimo.gshell.layout.LayoutManager;
import org.apache.geronimo.gshell.model.layout.AliasNode;
import org.apache.geronimo.gshell.model.layout.GroupNode;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java Fri May 30 23:47:30 2008
@@ -27,6 +27,8 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.command.CommandSupport;
+import org.apache.geronimo.gshell.command.Variables;
/**
* Set a variable or property.
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java Fri May 30 23:47:30 2008
@@ -30,6 +30,8 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.command.annotation.Requirement;
+import org.apache.geronimo.gshell.command.CommandSupport;
+import org.apache.geronimo.gshell.command.CommandExecutor;
import org.codehaus.plexus.util.IOUtil;
/**
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java Fri May 30 23:47:30 2008
@@ -25,6 +25,8 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.command.CommandSupport;
+import org.apache.geronimo.gshell.command.Variables;
/**
* Unset a variable or property.
Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/CatCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/CatCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/CatCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/CatCommand.java Fri May 30 23:47:30 2008
@@ -32,6 +32,7 @@
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.command.CommandSupport;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java Fri May 30 23:47:30 2008
@@ -23,6 +23,7 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.common.io.PumpStreamHandler;
/**
Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java Fri May 30 23:47:30 2008
@@ -25,6 +25,7 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.common.Arguments;
/**
Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/SleepCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/SleepCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/SleepCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/SleepCommand.java Fri May 30 23:47:30 2008
@@ -21,6 +21,7 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.command.CommandSupport;
/**
* Sleep... zzzZ
Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/WaitCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/WaitCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/WaitCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/WaitCommand.java Fri May 30 23:47:30 2008
@@ -20,6 +20,7 @@
package org.apache.geronimo.gshell.commands.optional;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.command.CommandSupport;
//
// HACK: This is a temporary to handle shells which need to keep around after running
Modified: geronimo/gshell/trunk/gshell-commands/gshell-repository/src/main/java/org/apache/geronimo/gshell/commands/repository/ResolveCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-repository/src/main/java/org/apache/geronimo/gshell/commands/repository/ResolveCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-repository/src/main/java/org/apache/geronimo/gshell/commands/repository/ResolveCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-repository/src/main/java/org/apache/geronimo/gshell/commands/repository/ResolveCommand.java Fri May 30 23:47:30 2008
@@ -23,6 +23,7 @@
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.command.annotation.Requirement;
+import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/VFSCommandSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/VFSCommandSupport.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/VFSCommandSupport.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/VFSCommandSupport.java Fri May 30 23:47:30 2008
@@ -22,6 +22,7 @@
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.FileSystemManager;
import org.apache.commons.vfs.VFS;
+import org.apache.geronimo.gshell.command.CommandSupport;
/**
* Support for VFS commands.
Modified: geronimo/gshell/trunk/gshell-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/pom.xml?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-plugin/pom.xml Fri May 30 23:47:30 2008
@@ -52,6 +52,11 @@
<groupId>org.apache.geronimo.gshell.api</groupId>
<artifactId>gshell-command</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.api</groupId>
+ <artifactId>gshell-shell</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.gshell</groupId>
Modified: geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/GShellBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/GShellBuilderTest.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/GShellBuilderTest.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/GShellBuilderTest.java Fri May 30 23:47:30 2008
@@ -42,7 +42,7 @@
}
protected void tearDown() throws Exception {
- super.tearDown();
+ builder = null;
}
public void testBuild1() throws Exception {
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java Fri May 30 23:47:30 2008
@@ -24,6 +24,7 @@
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.command.annotation.Requirement;
+import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.io.PromptReader;
import org.apache.geronimo.gshell.remote.client.proxy.RemoteShellProxy;
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java Fri May 30 23:47:30 2008
@@ -25,6 +25,7 @@
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.command.annotation.Requirement;
+import org.apache.geronimo.gshell.command.CommandSupport;
/**
* Command to start a remote shell server.
Modified: geronimo/gshell/trunk/gshell-remote/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/pom.xml?rev=661964&r1=661963&r2=661964&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/pom.xml Fri May 30 23:47:30 2008
@@ -41,6 +41,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.geronimo.gshell.api</groupId>
+ <artifactId>gshell-command-support</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-core</artifactId>
</dependency>