Fix packages
git-svn-id: https://svn.apache.org/repos/asf/geronimo/gshell/trunk@722776 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/AboutAction.java
similarity index 97%
rename from gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/AboutAction.java
index cef21e9..2fe9391 100644
--- a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java
+++ b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/AboutAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.builtins;
+package org.apache.geronimo.gshell.commands.builtin;
import org.apache.geronimo.gshell.application.Application;
import org.apache.geronimo.gshell.application.ApplicationManager;
diff --git a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/AliasAction.java
similarity index 98%
rename from gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/AliasAction.java
index f0818de..97e3314 100644
--- a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java
+++ b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/AliasAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.builtins;
+package org.apache.geronimo.gshell.commands.builtin;
import org.apache.geronimo.gshell.ansi.AnsiCode;
import org.apache.geronimo.gshell.ansi.AnsiRenderer;
diff --git a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/ClearAction.java
similarity index 96%
rename from gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/ClearAction.java
index a7e9c4f..77f988e 100644
--- a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java
+++ b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/ClearAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.builtins;
+package org.apache.geronimo.gshell.commands.builtin;
import jline.ConsoleReader;
import org.apache.geronimo.gshell.ansi.Ansi;
diff --git a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/EchoAction.java
similarity index 97%
rename from gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/EchoAction.java
index 8a75166..26cce76 100644
--- a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java
+++ b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/EchoAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.builtins;
+package org.apache.geronimo.gshell.commands.builtin;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
diff --git a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/ExitAction.java
similarity index 96%
rename from gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/ExitAction.java
index 49f1453..fb8986c 100644
--- a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitAction.java
+++ b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/ExitAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.builtins;
+package org.apache.geronimo.gshell.commands.builtin;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.CommandAction;
diff --git a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/HelpAction.java
similarity index 98%
rename from gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/HelpAction.java
index bbdf653..d3323d4 100644
--- a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
+++ b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/HelpAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.builtins;
+package org.apache.geronimo.gshell.commands.builtin;
import org.apache.geronimo.gshell.ansi.AnsiCode;
import org.apache.geronimo.gshell.ansi.AnsiRenderer;
diff --git a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/HistoryAction.java
similarity index 97%
rename from gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/HistoryAction.java
index 940f7b0..0d72a46 100644
--- a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java
+++ b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/HistoryAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.builtins;
+package org.apache.geronimo.gshell.commands.builtin;
import jline.History;
import org.apache.geronimo.gshell.ansi.AnsiCode;
diff --git a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/SetAction.java
similarity index 98%
rename from gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/SetAction.java
index 3855df2..4f3b2bc 100644
--- a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetAction.java
+++ b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/SetAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.builtins;
+package org.apache.geronimo.gshell.commands.builtin;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
diff --git a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/SourceAction.java
similarity index 98%
rename from gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/SourceAction.java
index 0046641..2784145 100644
--- a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java
+++ b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/SourceAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.builtins;
+package org.apache.geronimo.gshell.commands.builtin;
import org.apache.commons.vfs.FileObject;
import org.apache.geronimo.gshell.clp.Argument;
diff --git a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/UnaliasAction.java
similarity index 97%
rename from gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/UnaliasAction.java
index efc122f..b551698 100644
--- a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java
+++ b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/UnaliasAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.builtins;
+package org.apache.geronimo.gshell.commands.builtin;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.CommandAction;
diff --git a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/UnsetAction.java
similarity index 97%
rename from gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/UnsetAction.java
index 6f9780e..52e74b5 100644
--- a/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetAction.java
+++ b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtin/UnsetAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.builtins;
+package org.apache.geronimo.gshell.commands.builtin;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
diff --git a/gshell-commands/gshell-builtin/src/main/resources/META-INF/gshell/components.xml b/gshell-commands/gshell-builtin/src/main/resources/META-INF/gshell/components.xml
index c11190e..f957aa3 100755
--- a/gshell-commands/gshell-builtin/src/main/resources/META-INF/gshell/components.xml
+++ b/gshell-commands/gshell-builtin/src/main/resources/META-INF/gshell/components.xml
@@ -34,13 +34,13 @@
<gshell:plugin name="gshell-builtin">
<gshell:command-bundle name="default">
<gshell:command name="about">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.AboutAction">
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtin.AboutAction">
<constructor-arg ref="applicationManager"/>
</gshell:action>
</gshell:command>
<gshell:command name="help">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.HelpAction">
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtin.HelpAction">
<constructor-arg ref="commandResolver"/>
</gshell:action>
<gshell:completers>
@@ -57,23 +57,23 @@
</gshell:command>
<gshell:command name="exit">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.ExitAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtin.ExitAction"/>
</gshell:command>
<gshell:link name="quit" target="exit"/>
<gshell:command name="echo">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.EchoAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtin.EchoAction"/>
</gshell:command>
<gshell:link name="print" target="echo"/>
<gshell:command name="clear" type="stateless">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.ClearAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtin.ClearAction"/>
</gshell:command>
<gshell:command name="source">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.SourceAction">
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtin.SourceAction">
<constructor-arg ref="commandLineExecutor"/>
<constructor-arg ref="fileSystemAccess"/>
</gshell:action>
@@ -84,11 +84,11 @@
</gshell:command>
<gshell:command name="set">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.SetAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtin.SetAction"/>
</gshell:command>
<gshell:command name="unset">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.UnsetAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtin.UnsetAction"/>
<gshell:completers>
<ref bean="variableNameCompleter"/>
<null/>
@@ -96,13 +96,13 @@
</gshell:command>
<gshell:command name="alias">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.AliasAction">
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtin.AliasAction">
<constructor-arg ref="aliasRegistry"/>
</gshell:action>
</gshell:command>
<gshell:command name="unalias">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.UnaliasAction">
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtin.UnaliasAction">
<constructor-arg ref="aliasRegistry"/>
</gshell:action>
<gshell:completers>
@@ -112,7 +112,7 @@
</gshell:command>
<gshell:command name="history">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.HistoryAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtin.HistoryAction"/>
</gshell:command>
</gshell:command-bundle>
</gshell:plugin>
diff --git a/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AboutAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/AboutAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AboutAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/AboutAction.properties
diff --git a/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AliasAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/AliasAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AliasAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/AliasAction.properties
diff --git a/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ClearAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/ClearAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ClearAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/ClearAction.properties
diff --git a/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/EchoAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/EchoAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/EchoAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/EchoAction.properties
diff --git a/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ExitAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/ExitAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ExitAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/ExitAction.properties
diff --git a/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HelpAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/HelpAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HelpAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/HelpAction.properties
diff --git a/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HistoryAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/HistoryAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HistoryAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/HistoryAction.properties
diff --git a/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SetAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/SetAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SetAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/SetAction.properties
diff --git a/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SourceAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/SourceAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SourceAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/SourceAction.properties
diff --git a/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/UnaliasAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/UnaliasAction.properties
diff --git a/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnsetAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/UnsetAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnsetAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtin/UnsetAction.properties
diff --git a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/ChangeDirectoryAction.java
similarity index 96%
rename from gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/ChangeDirectoryAction.java
index 2941b04..a5df44b 100644
--- a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.java
+++ b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/ChangeDirectoryAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.fileutils;
+package org.apache.geronimo.gshell.commands.file;
import org.apache.commons.vfs.FileObject;
import org.apache.geronimo.gshell.clp.Argument;
diff --git a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CopyAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/CopyAction.java
similarity index 97%
rename from gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CopyAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/CopyAction.java
index 36f73e9..fe579f7 100644
--- a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CopyAction.java
+++ b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/CopyAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.fileutils;
+package org.apache.geronimo.gshell.commands.file;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.Selectors;
diff --git a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/CurrentDirectoryAction.java
similarity index 96%
rename from gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/CurrentDirectoryAction.java
index 024bbf1..a3a7f2a 100644
--- a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.java
+++ b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/CurrentDirectoryAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.fileutils;
+package org.apache.geronimo.gshell.commands.file;
import org.apache.commons.vfs.FileObject;
import org.apache.geronimo.gshell.command.CommandContext;
diff --git a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/FileInfoAction.java
similarity index 98%
rename from gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/FileInfoAction.java
index c1336d4..7265ba4 100644
--- a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.java
+++ b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/FileInfoAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.fileutils;
+package org.apache.geronimo.gshell.commands.file;
import org.apache.commons.vfs.FileContent;
import org.apache.commons.vfs.FileContentInfo;
diff --git a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/ListDirectoryAction.java
similarity index 98%
rename from gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/ListDirectoryAction.java
index 02ed2f5..ed3dcea 100644
--- a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.java
+++ b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/ListDirectoryAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.fileutils;
+package org.apache.geronimo.gshell.commands.file;
import jline.ConsoleReader;
import org.apache.commons.vfs.FileFilter;
diff --git a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/RemoveAction.java
similarity index 96%
rename from gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/RemoveAction.java
index e6ac7ea..66c4766 100644
--- a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.java
+++ b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/RemoveAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.fileutils;
+package org.apache.geronimo.gshell.commands.file;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.Selectors;
diff --git a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/TouchAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/TouchAction.java
similarity index 96%
rename from gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/TouchAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/TouchAction.java
index e1c0f47..5995198 100644
--- a/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/TouchAction.java
+++ b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/file/TouchAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.fileutils;
+package org.apache.geronimo.gshell.commands.file;
import org.apache.commons.vfs.FileObject;
import org.apache.geronimo.gshell.clp.Argument;
diff --git a/gshell-commands/gshell-file/src/main/resources/META-INF/gshell/components.xml b/gshell-commands/gshell-file/src/main/resources/META-INF/gshell/components.xml
index f2c7b4c..6bc33eb 100644
--- a/gshell-commands/gshell-file/src/main/resources/META-INF/gshell/components.xml
+++ b/gshell-commands/gshell-file/src/main/resources/META-INF/gshell/components.xml
@@ -38,7 +38,7 @@
<gshell:plugin name="gshell-file">
<gshell:command-bundle name="default">
<gshell:command name="cd">
- <gshell:action class="org.apache.geronimo.gshell.commands.fileutils.ChangeDirectoryAction" parent="vfsCommandActionTemplate"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.file.ChangeDirectoryAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -46,11 +46,11 @@
</gshell:command>
<gshell:command name="pwd" type="stateless">
- <gshell:action class="org.apache.geronimo.gshell.commands.fileutils.CurrentDirectoryAction" parent="vfsCommandActionTemplate"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.file.CurrentDirectoryAction" parent="vfsCommandActionTemplate"/>
</gshell:command>
<gshell:command name="ls">
- <gshell:action class="org.apache.geronimo.gshell.commands.fileutils.ListDirectoryAction" parent="vfsCommandActionTemplate"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.file.ListDirectoryAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -60,7 +60,7 @@
<gshell:link name="dir" target="ls"/>
<gshell:command name="cp">
- <gshell:action class="org.apache.geronimo.gshell.commands.fileutils.CopyAction" parent="vfsCommandActionTemplate"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.file.CopyAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<ref bean="fileObjectNameCompleter"/>
@@ -71,7 +71,7 @@
<gshell:link name="copy" target="cp"/>
<gshell:command name="rm">
- <gshell:action class="org.apache.geronimo.gshell.commands.fileutils.RemoveAction" parent="vfsCommandActionTemplate"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.file.RemoveAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -81,7 +81,7 @@
<gshell:link name="del" target="rm"/>
<gshell:command name="fileinfo">
- <gshell:action class="org.apache.geronimo.gshell.commands.fileutils.FileInfoAction" parent="vfsCommandActionTemplate"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.file.FileInfoAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -89,7 +89,7 @@
</gshell:command>
<gshell:command name="touch">
- <gshell:action class="org.apache.geronimo.gshell.commands.fileutils.TouchAction" parent="vfsCommandActionTemplate"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.file.TouchAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
diff --git a/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/ChangeDirectoryAction.properties
similarity index 100%
rename from gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/ChangeDirectoryAction.properties
diff --git a/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CopyAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/CopyAction.properties
similarity index 100%
rename from gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CopyAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/CopyAction.properties
diff --git a/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/CurrentDirectoryAction.properties
similarity index 100%
rename from gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/CurrentDirectoryAction.properties
diff --git a/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/FileInfoAction.properties
similarity index 100%
rename from gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/FileInfoAction.properties
diff --git a/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/ListDirectoryAction.properties
similarity index 100%
rename from gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/ListDirectoryAction.properties
diff --git a/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/RemoveAction.properties
similarity index 100%
rename from gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/RemoveAction.properties
diff --git a/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/TouchAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/TouchAction.properties
similarity index 100%
rename from gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/TouchAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/file/TouchAction.properties
diff --git a/gshell-commands/gshell-network/src/main/java/org/apache/geronimo/gshell/commands/netutils/HostnameAction.java b/gshell-commands/gshell-network/src/main/java/org/apache/geronimo/gshell/commands/network/HostnameAction.java
similarity index 96%
rename from gshell-commands/gshell-network/src/main/java/org/apache/geronimo/gshell/commands/netutils/HostnameAction.java
rename to gshell-commands/gshell-network/src/main/java/org/apache/geronimo/gshell/commands/network/HostnameAction.java
index 4f72e2f..2d0f5ad 100644
--- a/gshell-commands/gshell-network/src/main/java/org/apache/geronimo/gshell/commands/netutils/HostnameAction.java
+++ b/gshell-commands/gshell-network/src/main/java/org/apache/geronimo/gshell/commands/network/HostnameAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.netutils;
+package org.apache.geronimo.gshell.commands.network;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
diff --git a/gshell-commands/gshell-network/src/main/resources/META-INF/gshell/components.xml b/gshell-commands/gshell-network/src/main/resources/META-INF/gshell/components.xml
index ab4e009..c0f9b5e 100644
--- a/gshell-commands/gshell-network/src/main/resources/META-INF/gshell/components.xml
+++ b/gshell-commands/gshell-network/src/main/resources/META-INF/gshell/components.xml
@@ -34,7 +34,7 @@
<gshell:plugin name="gshell-network">
<gshell:command-bundle name="default">
<gshell:command name="hostname">
- <gshell:action class="org.apache.geronimo.gshell.commands.netutils.HostnameAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.network.HostnameAction"/>
</gshell:command>
</gshell:command-bundle>
</gshell:plugin>
diff --git a/gshell-commands/gshell-network/src/main/resources/org/apache/geronimo/gshell/commands/netutils/HostnameAction.properties b/gshell-commands/gshell-network/src/main/resources/org/apache/geronimo/gshell/commands/network/HostnameAction.properties
similarity index 100%
rename from gshell-commands/gshell-network/src/main/resources/org/apache/geronimo/gshell/commands/netutils/HostnameAction.properties
rename to gshell-commands/gshell-network/src/main/resources/org/apache/geronimo/gshell/commands/network/HostnameAction.properties
diff --git a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/DateAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/DateAction.java
similarity index 95%
rename from gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/DateAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/DateAction.java
index 97251d9..7844c3e 100644
--- a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/DateAction.java
+++ b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/DateAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.shellutils;
+package org.apache.geronimo.gshell.commands.shell;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
diff --git a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/EditAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/EditAction.java
similarity index 98%
rename from gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/EditAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/EditAction.java
index 438e405..7a0f36c 100644
--- a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/EditAction.java
+++ b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/EditAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.shellutils;
+package org.apache.geronimo.gshell.commands.shell;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.Selectors;
diff --git a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/ExecuteAction.java
similarity index 97%
rename from gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/ExecuteAction.java
index ec8ae76..3767ddb 100644
--- a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.java
+++ b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/ExecuteAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.shellutils;
+package org.apache.geronimo.gshell.commands.shell;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.CommandAction;
diff --git a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/FindAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java
similarity index 98%
rename from gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/FindAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java
index 6e9305e..3c5e630 100644
--- a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/FindAction.java
+++ b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.shellutils;
+package org.apache.geronimo.gshell.commands.shell;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSelectInfo;
diff --git a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/JavaAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/JavaAction.java
similarity index 97%
rename from gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/JavaAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/JavaAction.java
index 13f5924..739ad33 100644
--- a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/JavaAction.java
+++ b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/JavaAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.shellutils;
+package org.apache.geronimo.gshell.commands.shell;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
diff --git a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/SleepAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/SleepAction.java
similarity index 96%
rename from gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/SleepAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/SleepAction.java
index 72a26dc..024d280 100644
--- a/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/SleepAction.java
+++ b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shell/SleepAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.shellutils;
+package org.apache.geronimo.gshell.commands.shell;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.CommandAction;
diff --git a/gshell-commands/gshell-shell/src/main/resources/META-INF/gshell/components.xml b/gshell-commands/gshell-shell/src/main/resources/META-INF/gshell/components.xml
index 3c5880b..1520529 100644
--- a/gshell-commands/gshell-shell/src/main/resources/META-INF/gshell/components.xml
+++ b/gshell-commands/gshell-shell/src/main/resources/META-INF/gshell/components.xml
@@ -38,23 +38,23 @@
<gshell:plugin name="gshell-shell">
<gshell:command-bundle name="default">
<gshell:command name="exec">
- <gshell:action class="org.apache.geronimo.gshell.commands.shellutils.ExecuteAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.shell.ExecuteAction"/>
</gshell:command>
<gshell:command name="java">
- <gshell:action class="org.apache.geronimo.gshell.commands.shellutils.JavaAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.shell.JavaAction"/>
</gshell:command>
<gshell:command name="sleep">
- <gshell:action class="org.apache.geronimo.gshell.commands.shellutils.SleepAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.shell.SleepAction"/>
</gshell:command>
<gshell:command name="date">
- <gshell:action class="org.apache.geronimo.gshell.commands.shellutils.DateAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.shell.DateAction"/>
</gshell:command>
<gshell:command name="edit">
- <gshell:action class="org.apache.geronimo.gshell.commands.shellutils.EditAction" parent="vfsCommandActionTemplate"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.shell.EditAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -62,7 +62,7 @@
</gshell:command>
<gshell:command name="find">
- <gshell:action class="org.apache.geronimo.gshell.commands.shellutils.FindAction" parent="vfsCommandActionTemplate"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.shell.FindAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
diff --git a/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/DateAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/DateAction.properties
similarity index 100%
rename from gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/DateAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/DateAction.properties
diff --git a/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/EditAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/EditAction.properties
similarity index 100%
rename from gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/EditAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/EditAction.properties
diff --git a/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/ExecuteAction.properties
similarity index 100%
rename from gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/ExecuteAction.properties
diff --git a/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/FindAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/FindAction.properties
similarity index 100%
rename from gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/FindAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/FindAction.properties
diff --git a/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/JavaAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/JavaAction.properties
similarity index 100%
rename from gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/JavaAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/JavaAction.properties
diff --git a/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/SleepAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/SleepAction.properties
similarity index 100%
rename from gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/SleepAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shell/SleepAction.properties
diff --git a/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/CatAction.java b/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/text/CatAction.java
similarity index 98%
rename from gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/CatAction.java
rename to gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/text/CatAction.java
index 50d2876..afbcb97 100644
--- a/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/CatAction.java
+++ b/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/text/CatAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.textutils;
+package org.apache.geronimo.gshell.commands.text;
import org.apache.commons.vfs.FileContent;
import org.apache.commons.vfs.FileContentInfo;
diff --git a/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/GrepAction.java b/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/text/GrepAction.java
similarity index 99%
rename from gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/GrepAction.java
rename to gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/text/GrepAction.java
index bae3a5d..07b64cb 100644
--- a/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/GrepAction.java
+++ b/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/text/GrepAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.textutils;
+package org.apache.geronimo.gshell.commands.text;
import org.apache.commons.vfs.FileObject;
import org.apache.geronimo.gshell.clp.Argument;
diff --git a/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/PrintfAction.java b/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/text/PrintfAction.java
similarity index 96%
rename from gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/PrintfAction.java
rename to gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/text/PrintfAction.java
index 57809ef..2dc631f 100644
--- a/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/PrintfAction.java
+++ b/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/text/PrintfAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.commands.textutils;
+package org.apache.geronimo.gshell.commands.text;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.command.CommandAction;
diff --git a/gshell-commands/gshell-text/src/main/resources/META-INF/gshell/components.xml b/gshell-commands/gshell-text/src/main/resources/META-INF/gshell/components.xml
index 719618c..9fc3518 100644
--- a/gshell-commands/gshell-text/src/main/resources/META-INF/gshell/components.xml
+++ b/gshell-commands/gshell-text/src/main/resources/META-INF/gshell/components.xml
@@ -38,11 +38,11 @@
<gshell:plugin name="gshell-text">
<gshell:command-bundle name="default">
<gshell:command name="printf">
- <gshell:action class="org.apache.geronimo.gshell.commands.textutils.PrintfAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.text.PrintfAction"/>
</gshell:command>
<gshell:command name="cat">
- <gshell:action class="org.apache.geronimo.gshell.commands.textutils.CatAction" parent="vfsCommandActionTemplate"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.text.CatAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -50,7 +50,7 @@
</gshell:command>
<gshell:command name="grep">
- <gshell:action class="org.apache.geronimo.gshell.commands.textutils.GrepAction" parent="vfsCommandActionTemplate"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.text.GrepAction" parent="vfsCommandActionTemplate"/>
</gshell:command>
</gshell:command-bundle>
</gshell:plugin>
diff --git a/gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/CatAction.properties b/gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/text/CatAction.properties
similarity index 100%
rename from gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/CatAction.properties
rename to gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/text/CatAction.properties
diff --git a/gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/GrepAction.properties b/gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/text/GrepAction.properties
similarity index 100%
rename from gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/GrepAction.properties
rename to gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/text/GrepAction.properties
diff --git a/gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/PrintfAction.properties b/gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/text/PrintfAction.properties
similarity index 100%
rename from gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/PrintfAction.properties
rename to gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/text/PrintfAction.properties
