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/30 15:44:34 UTC
svn commit: r661717 - in /geronimo/gshell/trunk: ./
gshell-api/gshell-command-support/
gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/
gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/command/
gshel...
Author: jdillon
Date: Fri May 30 06:44:33 2008
New Revision: 661717
URL: http://svn.apache.org/viewvc?rev=661717&view=rev
Log:
Add gshell-command-support
Added:
geronimo/gshell/trunk/gshell-api/gshell-command-support/
- copied from r661709, geronimo/gshell/trunk/gshell-api/gshell-command/
Removed:
geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/ErrorNotification.java
geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/ExitNotification.java
geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/command/Command.java
geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/command/CommandContext.java
geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/command/CommandException.java
geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/command/CommandExecutor.java
geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/command/CommandInfo.java
geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/command/Variables.java
geronimo/gshell/trunk/gshell-api/gshell-command/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
Modified:
geronimo/gshell/trunk/gshell-api/gshell-command-support/pom.xml
geronimo/gshell/trunk/gshell-api/gshell-command/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-commands/pom.xml
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Node.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/pom.xml
Modified: geronimo/gshell/trunk/gshell-api/gshell-command-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/gshell-command-support/pom.xml?rev=661717&r1=661709&r2=661717&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/gshell-command-support/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-api/gshell-command-support/pom.xml Fri May 30 06:44:33 2008
@@ -30,27 +30,22 @@
<version>1.0-alpha-2-SNAPSHOT</version>
</parent>
- <artifactId>gshell-command</artifactId>
- <name>GShell API :: Command</name>
+ <artifactId>gshell-command-support</artifactId>
+ <name>GShell API :: Command Support</name>
<description>
- Profides the basic interface for GShell commands.
+ Provides support for GShell command implementations.
</description>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-clp</artifactId>
+ <groupId>org.apache.geronimo.gshell.api</groupId>
+ <artifactId>gshell-command</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-io</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.geronimo.gshell.api</groupId>
+ <artifactId>gshell-command-annotation</artifactId>
</dependency>
</dependencies>
Modified: geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml?rev=661717&r1=661716&r2=661717&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml Fri May 30 06:44:33 2008
@@ -34,7 +34,7 @@
<name>GShell API :: Command</name>
<description>
- Profides the basic interface for GShell commands.
+ Provides the basic interface for GShell commands.
</description>
<dependencies>
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -23,8 +23,6 @@
import org.apache.bsf.BSFManager;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.CommandException;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -21,7 +21,6 @@
import jline.ConsoleReader;
import org.apache.geronimo.gshell.ansi.ANSI;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -23,7 +23,6 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
/**
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -19,9 +19,7 @@
package org.apache.geronimo.gshell.commands.builtins;
-import org.apache.geronimo.gshell.ExitNotification;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
/**
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -22,8 +22,6 @@
import org.apache.geronimo.gshell.ansi.Code;
import org.apache.geronimo.gshell.ansi.Renderer;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.Command;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.command.annotation.Requirement;
import org.apache.geronimo.gshell.layout.LayoutManager;
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -26,8 +26,6 @@
import org.apache.geronimo.gshell.DefaultVariables;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.CommandSupport;
-import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
/**
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -28,8 +28,6 @@
import java.net.URL;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.CommandExecutor;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.command.annotation.Requirement;
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -24,8 +24,6 @@
import org.apache.geronimo.gshell.DefaultVariables;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.CommandSupport;
-import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
/**
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -30,7 +30,6 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.codehaus.plexus.util.IOUtil;
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -22,7 +22,6 @@
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -24,7 +24,6 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -20,7 +20,6 @@
package org.apache.geronimo.gshell.commands.optional;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
/**
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -19,7 +19,6 @@
package org.apache.geronimo.gshell.commands.optional;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
//
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -21,7 +21,6 @@
import org.apache.geronimo.gshell.artifact.ArtifactManager;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.command.annotation.Requirement;
import org.apache.maven.artifact.Artifact;
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -22,7 +22,6 @@
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-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/pom.xml?rev=661717&r1=661716&r2=661717&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/pom.xml Fri May 30 06:44:33 2008
@@ -41,8 +41,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-command-api</artifactId>
+ <groupId>org.apache.geronimo.gshell.api</groupId>
+ <artifactId>gshell-command-support</artifactId>
</dependency>
</dependencies>
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Node.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Node.java?rev=661717&r1=661716&r2=661717&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Node.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Node.java Fri May 30 06:44:33 2008
@@ -37,7 +37,7 @@
protected transient Node parent;
- protected Node(final String name) {
+ protected Node(final String name) {
assert name != null;
this.name = name;
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -22,7 +22,6 @@
import org.apache.geronimo.gshell.ExitNotification;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.command.annotation.Requirement;
import org.apache.geronimo.gshell.io.PromptReader;
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=661717&r1=661716&r2=661717&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 06:44:33 2008
@@ -23,7 +23,6 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.CommandSupport;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.command.annotation.Requirement;
Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=661717&r1=661716&r2=661717&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Fri May 30 06:44:33 2008
@@ -342,7 +342,13 @@
<artifactId>gshell-command-annotation</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.api</groupId>
+ <artifactId>gshell-command-support</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.gshell.api</groupId>
<artifactId>gshell-shell</artifactId>
@@ -450,13 +456,6 @@
<artifactId>gshell-diet-log4j</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
-
- <!-- FIXME: Remove me!!!! -->
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-command-api</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </dependency>
</dependencies>
</dependencyManagement>
Re: svn commit: r661717 - in /geronimo/gshell/trunk: ./ gshell-api/gshell-command-support/ gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/ gshell-api/gshell-command-support/src/main/java/org/apache/geronimo/gshell/command/ gshel...
Posted by Jason Dillon <ja...@planet57.com>.
Ugh... don't know how I messed up this commit so badly :-(
--jason
On May 30, 2008, at 8:44 PM, jdillon@apache.org wrote:
> Author: jdillon
> Date: Fri May 30 06:44:33 2008
> New Revision: 661717
>
> URL: http://svn.apache.org/viewvc?rev=661717&view=rev
> Log:
> Add gshell-command-support
>
> Added:
> geronimo/gshell/trunk/gshell-api/gshell-command-support/
> - copied from r661709, geronimo/gshell/trunk/gshell-api/gshell-
> command/
> Removed:
> geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/
> java/org/apache/geronimo/gshell/ErrorNotification.java
> geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/
> java/org/apache/geronimo/gshell/ExitNotification.java
> geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/
> java/org/apache/geronimo/gshell/command/Command.java
> geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/
> java/org/apache/geronimo/gshell/command/CommandContext.java
> geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/
> java/org/apache/geronimo/gshell/command/CommandException.java
> geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/
> java/org/apache/geronimo/gshell/command/CommandExecutor.java
> geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/
> java/org/apache/geronimo/gshell/command/CommandInfo.java
> geronimo/gshell/trunk/gshell-api/gshell-command-support/src/main/
> java/org/apache/geronimo/gshell/command/Variables.java
> geronimo/gshell/trunk/gshell-api/gshell-command/src/main/java/org/
> apache/geronimo/gshell/command/CommandSupport.java
> Modified:
> geronimo/gshell/trunk/gshell-api/gshell-command-support/pom.xml
> geronimo/gshell/trunk/gshell-api/gshell-command/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-commands/pom.xml
> geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/
> geronimo/gshell/model/layout/Node.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/pom.xml
>
> Modified: geronimo/gshell/trunk/gshell-api/gshell-command-support/
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/gshell-command-support/pom.xml?rev=661717&r1=661709&r2=661717&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/gshell/trunk/gshell-api/gshell-command-support/pom.xml
> (original)
> +++ geronimo/gshell/trunk/gshell-api/gshell-command-support/pom.xml
> Fri May 30 06:44:33 2008
> @@ -30,27 +30,22 @@
> <version>1.0-alpha-2-SNAPSHOT</version>
> </parent>
>
> - <artifactId>gshell-command</artifactId>
> - <name>GShell API :: Command</name>
> + <artifactId>gshell-command-support</artifactId>
> + <name>GShell API :: Command Support</name>
>
> <description>
> - Profides the basic interface for GShell commands.
> + Provides support for GShell command implementations.
> </description>
>
> <dependencies>
> <dependency>
> - <groupId>org.apache.geronimo.gshell.support</groupId>
> - <artifactId>gshell-clp</artifactId>
> + <groupId>org.apache.geronimo.gshell.api</groupId>
> + <artifactId>gshell-command</artifactId>
> </dependency>
>
> <dependency>
> - <groupId>org.apache.geronimo.gshell.support</groupId>
> - <artifactId>gshell-io</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.slf4j</groupId>
> - <artifactId>slf4j-api</artifactId>
> + <groupId>org.apache.geronimo.gshell.api</groupId>
> + <artifactId>gshell-command-annotation</artifactId>
> </dependency>
> </dependencies>
>
>
> Modified: geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml?rev=661717&r1=661716&r2=661717&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml (original)
> +++ geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml Fri May
> 30 06:44:33 2008
> @@ -34,7 +34,7 @@
> <name>GShell API :: Command</name>
>
> <description>
> - Profides the basic interface for GShell commands.
> + Provides the basic interface for GShell commands.
> </description>
>
> <dependencies>
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -23,8 +23,6 @@
> import org.apache.bsf.BSFManager;
> import org.apache.geronimo.gshell.clp.Argument;
> import org.apache.geronimo.gshell.clp.Option;
> -import org.apache.geronimo.gshell.command.CommandException;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -21,7 +21,6 @@
>
> import jline.ConsoleReader;
> import org.apache.geronimo.gshell.ansi.ANSI;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -23,7 +23,6 @@
>
> import org.apache.geronimo.gshell.clp.Argument;
> import org.apache.geronimo.gshell.clp.Option;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
>
> /**
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -19,9 +19,7 @@
>
> package org.apache.geronimo.gshell.commands.builtins;
>
> -import org.apache.geronimo.gshell.ExitNotification;
> import org.apache.geronimo.gshell.clp.Argument;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
>
> /**
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -22,8 +22,6 @@
> import org.apache.geronimo.gshell.ansi.Code;
> import org.apache.geronimo.gshell.ansi.Renderer;
> import org.apache.geronimo.gshell.clp.Argument;
> -import org.apache.geronimo.gshell.command.Command;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
> import org.apache.geronimo.gshell.command.annotation.Requirement;
> import org.apache.geronimo.gshell.layout.LayoutManager;
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -26,8 +26,6 @@
> import org.apache.geronimo.gshell.DefaultVariables;
> import org.apache.geronimo.gshell.clp.Argument;
> import org.apache.geronimo.gshell.clp.Option;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> -import org.apache.geronimo.gshell.command.Variables;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
>
> /**
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -28,8 +28,6 @@
> import java.net.URL;
>
> import org.apache.geronimo.gshell.clp.Argument;
> -import org.apache.geronimo.gshell.command.CommandExecutor;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
> import org.apache.geronimo.gshell.command.annotation.Requirement;
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -24,8 +24,6 @@
> import org.apache.geronimo.gshell.DefaultVariables;
> import org.apache.geronimo.gshell.clp.Argument;
> import org.apache.geronimo.gshell.clp.Option;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> -import org.apache.geronimo.gshell.command.Variables;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
>
> /**
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -30,7 +30,6 @@
>
> import org.apache.geronimo.gshell.clp.Argument;
> import org.apache.geronimo.gshell.clp.Option;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.io.IO;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
> import org.codehaus.plexus.util.IOUtil;
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -22,7 +22,6 @@
> import java.util.List;
>
> import org.apache.geronimo.gshell.clp.Argument;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -24,7 +24,6 @@
>
> import org.apache.geronimo.gshell.clp.Argument;
> import org.apache.geronimo.gshell.clp.Option;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -20,7 +20,6 @@
> package org.apache.geronimo.gshell.commands.optional;
>
> import org.apache.geronimo.gshell.clp.Argument;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
>
> /**
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -19,7 +19,6 @@
>
> package org.apache.geronimo.gshell.commands.optional;
>
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
>
> //
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -21,7 +21,6 @@
>
> import org.apache.geronimo.gshell.artifact.ArtifactManager;
> import org.apache.geronimo.gshell.clp.Option;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
> import org.apache.geronimo.gshell.command.annotation.Requirement;
> import org.apache.maven.artifact.Artifact;
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -22,7 +22,6 @@
> 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-commands/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/pom.xml?rev=661717&r1=661716&r2=661717&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/gshell/trunk/gshell-commands/pom.xml (original)
> +++ geronimo/gshell/trunk/gshell-commands/pom.xml Fri May 30
> 06:44:33 2008
> @@ -41,8 +41,8 @@
>
> <dependencies>
> <dependency>
> - <groupId>org.apache.geronimo.gshell</groupId>
> - <artifactId>gshell-command-api</artifactId>
> + <groupId>org.apache.geronimo.gshell.api</groupId>
> + <artifactId>gshell-command-support</artifactId>
> </dependency>
> </dependencies>
>
>
> Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/
> apache/geronimo/gshell/model/layout/Node.java
> URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Node.java?rev=661717&r1=661716&r2=661717&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/
> geronimo/gshell/model/layout/Node.java (original)
> +++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/
> geronimo/gshell/model/layout/Node.java Fri May 30 06:44:33 2008
> @@ -37,7 +37,7 @@
>
> protected transient Node parent;
>
> - protected Node(final String name) {
> + protected Node(final String name) {
> assert name != null;
>
> this.name = name;
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -22,7 +22,6 @@
> import org.apache.geronimo.gshell.ExitNotification;
> import org.apache.geronimo.gshell.clp.Argument;
> import org.apache.geronimo.gshell.clp.Option;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
> import org.apache.geronimo.gshell.command.annotation.Requirement;
> import org.apache.geronimo.gshell.io.PromptReader;
>
> 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=661717&r1=661716&r2=661717&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 06:44:33 2008
> @@ -23,7 +23,6 @@
>
> import org.apache.geronimo.gshell.clp.Argument;
> import org.apache.geronimo.gshell.clp.Option;
> -import org.apache.geronimo.gshell.command.CommandSupport;
> import org.apache.geronimo.gshell.command.annotation.CommandComponent;
> import org.apache.geronimo.gshell.command.annotation.Requirement;
>
>
> Modified: geronimo/gshell/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=661717&r1=661716&r2=661717&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/gshell/trunk/pom.xml (original)
> +++ geronimo/gshell/trunk/pom.xml Fri May 30 06:44:33 2008
> @@ -342,7 +342,13 @@
> <artifactId>gshell-command-annotation</artifactId>
> <version>1.0-alpha-2-SNAPSHOT</version>
> </dependency>
> -
> +
> + <dependency>
> + <groupId>org.apache.geronimo.gshell.api</groupId>
> + <artifactId>gshell-command-support</artifactId>
> + <version>1.0-alpha-2-SNAPSHOT</version>
> + </dependency>
> +
> <dependency>
> <groupId>org.apache.geronimo.gshell.api</groupId>
> <artifactId>gshell-shell</artifactId>
> @@ -450,13 +456,6 @@
> <artifactId>gshell-diet-log4j</artifactId>
> <version>1.0-alpha-2-SNAPSHOT</version>
> </dependency>
> -
> - <!-- FIXME: Remove me!!!! -->
> - <dependency>
> - <groupId>org.apache.geronimo.gshell</groupId>
> - <artifactId>gshell-command-api</artifactId>
> - <version>1.0-alpha-2-SNAPSHOT</version>
> - </dependency>
> </dependencies>
> </dependencyManagement>
>
>
>