geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r703511 - in /geronimo/gshell/trunk: gshell-api/src/main/java/org/apache/geronimo/gshell/command/ gshell-commands/gshell-admin/src/main/resources/org/apache/geronimo/gshell/commands/admin/ gshell-commands/gshell-bsf/src/main/resources/org/a...
Date Fri, 10 Oct 2008 16:07:38 GMT
Author: jdillon
Date: Fri Oct 10 09:07:36 2008
New Revision: 703511

URL: http://svn.apache.org/viewvc?rev=703511&view=rev
Log:
Added CommandLocation intf which allows command instances to know there name/path
Dropped getName() stuff from documenters and the command.name i18n message for commands

Added:
    geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandLocation.java   (with props)
Modified:
    geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java
    geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandDocumenter.java
    geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/org/apache/geronimo/gshell/commands/admin/ListPluginsAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/org/apache/geronimo/gshell/commands/bsf/ScriptAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AboutAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AliasAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ClearAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/EchoAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ExitAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HelpAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HistoryAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/PrintfAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SetAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SourceAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnsetAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/org/apache/geronimo/gshell/commands/log4j/LoggerAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/DateAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/ExecuteAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/HostnameAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/JavaAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/SleepAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshServerAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-repository/src/main/resources/org/apache/geronimo/gshell/commands/repository/ResolveAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CatAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/ChangeDirectoryAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CopyAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CurrentDirectoryAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/EditAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/FindAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/GrepAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/ListDirectoryAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/RemoveAction.properties
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/TouchAction.properties
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasCommand.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterSupport.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupCommand.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/LinkCommand.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/MessageSourceCommandDocumenter.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandRegistryImpl.java

Modified: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java Fri Oct 10 09:07:36 2008
@@ -29,7 +29,7 @@
  */
 public interface Command
 {
-    // TODO: Add getName():String or getLocation():CommandLocation
+    CommandLocation getLocation();
 
     /**
      * Returns the action of the command.

Modified: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandDocumenter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandDocumenter.java?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandDocumenter.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandDocumenter.java Fri Oct 10 09:07:36 2008
@@ -28,17 +28,6 @@
  */
 public interface CommandDocumenter
 {
-    //
-    // FIXME: Need to drop this from this interface, and provide some configuration to expose it via Command.getName()
-    //
-
-    /**
-     * Get the name of the command.
-     *
-     * @return The name of the command.
-     */
-    String getName();
-
     /**
      * Get the terse description of the command.
      *

Added: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandLocation.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandLocation.java?rev=703511&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandLocation.java (added)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandLocation.java Fri Oct 10 09:07:36 2008
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.command;
+
+import org.apache.geronimo.gshell.i18n.MessageSource;
+import org.apache.geronimo.gshell.shell.ShellContext;
+
+/**
+ * Provides information about the location of a {@link Command}.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface CommandLocation
+{
+    String getName();
+
+    String getPath();
+}
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandLocation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandLocation.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandLocation.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=install-plugin
-
 command.description=Install a GShell plugin.
 
 command.option.groupId=Specify the groupId

Modified: geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/org/apache/geronimo/gshell/commands/admin/ListPluginsAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/org/apache/geronimo/gshell/commands/admin/ListPluginsAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/org/apache/geronimo/gshell/commands/admin/ListPluginsAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/org/apache/geronimo/gshell/commands/admin/ListPluginsAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=list-plugins
-
 command.description=List installed GShell plugins.
 
 command.manual=\

Modified: geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/org/apache/geronimo/gshell/commands/bsf/ScriptAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/org/apache/geronimo/gshell/commands/bsf/ScriptAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/org/apache/geronimo/gshell/commands/bsf/ScriptAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/org/apache/geronimo/gshell/commands/bsf/ScriptAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=script
-
 command.description=Scripting language support.
 
 command.option.setLanguage=Specify the scripting language

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java Fri Oct 10 09:07:36 2008
@@ -87,7 +87,7 @@
         // Determine the maximun name length
         int maxNameLen = 0;
         for (Command command : commands) {
-            int len = command.getDocumenter().getName().length();
+            int len = command.getLocation().getName().length();
             maxNameLen = Math.max(len, maxNameLen);
         }
 
@@ -96,7 +96,7 @@
         for (Command command : commands) {
             CommandDocumenter documenter = command.getDocumenter();
 
-            String formattedName = String.format("%-" + maxNameLen + "s", documenter.getName());
+            String formattedName = String.format("%-" + maxNameLen + "s", command.getLocation().getName());
             String desc = documenter.getDescription();
 
             io.out.print("  ");

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AboutAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AboutAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AboutAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AboutAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=about
-
 command.description=Display information about the current GShell application.
 
 command.manual=\

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AliasAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AliasAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AliasAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AliasAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=alias
-
 command.description=Define an alias.
 
 command.argument.name=Name of the alias to define.

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ClearAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ClearAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ClearAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ClearAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=clear
-
 command.description=Clear the terminal screen.
 
 command.manual=\

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/EchoAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/EchoAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/EchoAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/EchoAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=echo
-
 command.description=Print arguments to standard output.
 
 command.option.trailingNewline=Do not print the trailing newline character

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ExitAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ExitAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ExitAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ExitAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=exit
-
 command.description=Exit the current shell.
 
 command.argument.exitCode=System exit code

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HelpAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HelpAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HelpAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HelpAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=help
-
 command.description=Display help for the current context.
 
 command.argument.commandName=Display the manual for COMMAND

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HistoryAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HistoryAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HistoryAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HistoryAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=history
-
 command.description=Display history.
 
 command.manual=\

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/PrintfAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/PrintfAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/PrintfAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/PrintfAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=printf
-
 command.description=Print formatted output
 
 command.argument.format=Output format

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SetAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SetAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SetAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SetAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=set
-
 command.description=Set a variable or property.
 
 command.option.mode=Set mode

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SourceAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SourceAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SourceAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SourceAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=source
-
 command.description=Read and execute commands from a file in the current shell environment.
 
 command.argument.path=Path to file to be sourced

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=unalias
-
 command.description=Undefine an alias.
 
 command.argument.name=Name of the alias to undefine.

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnsetAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnsetAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnsetAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnsetAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=unset
-
 command.description=Unset a variable or property.
 
 command.option.mode=Unset mode

Modified: geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/org/apache/geronimo/gshell/commands/log4j/LoggerAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/org/apache/geronimo/gshell/commands/log4j/LoggerAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/org/apache/geronimo/gshell/commands/log4j/LoggerAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/org/apache/geronimo/gshell/commands/log4j/LoggerAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=logger
-
 command.description=Get or set a loggers level.
 
 command.argument.loggerName=Logger name to query/modify

Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/DateAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/DateAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/DateAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/DateAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=date
-
 command.description=Displays the current time and date.
 
 command.manual=\

Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/ExecuteAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/ExecuteAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/ExecuteAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/ExecuteAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=exec
-
 command.description=Execute system processes.
 
 command.argument.args=Process arguments

Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/HostnameAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/HostnameAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/HostnameAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/HostnameAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=hostname
-
 command.description=Displays the name of the current host.
 
 command.manual=\

Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/JavaAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/JavaAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/JavaAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/JavaAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=java
-
 command.description=Execute a Java standard application.
 
 command.option.methodName=Invoke a named method

Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/SleepAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/SleepAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/SleepAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/org/apache/geronimo/gshell/commands/optional/SleepAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=sleep
-
 command.description=Sleep for a bit then wake up.
 
 command.argument.time=Time in milliseconds

Modified: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=rsh
-
 command.description=Connect to a remote GShell server.
 
 command.option.local=Bind local address to URI

Modified: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshServerAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshServerAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshServerAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/org/apache/geronimo/gshell/commands/remote/RshServerAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=rsh-server
-
 command.description=Start a GShell server.
 
 command.option.background=Run in background

Modified: geronimo/gshell/trunk/gshell-commands/gshell-repository/src/main/resources/org/apache/geronimo/gshell/commands/repository/ResolveAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-repository/src/main/resources/org/apache/geronimo/gshell/commands/repository/ResolveAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-repository/src/main/resources/org/apache/geronimo/gshell/commands/repository/ResolveAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-repository/src/main/resources/org/apache/geronimo/gshell/commands/repository/ResolveAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=resolve
-
 command.description=Resolve repository artifacts.
 
 command.option.groupId=Specify the groupId

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CatAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CatAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CatAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CatAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=cat
-
 command.description=Displays the contents of a file.
 
 command.argument.path=Path of file to display

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/ChangeDirectoryAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/ChangeDirectoryAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/ChangeDirectoryAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/ChangeDirectoryAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=cd
-
 command.description=Changes the current directory.
 
 command.argument.path=The path of the directory to change to

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CopyAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CopyAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CopyAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CopyAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=copy
-
 command.description=Copies a file or directory.
 
 command.argument.sourcePath=Source file or directory path

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CurrentDirectoryAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CurrentDirectoryAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CurrentDirectoryAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/CurrentDirectoryAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=pwd
-
 command.description=Displays the current directory.
 
 command.manual=\

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/EditAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/EditAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/EditAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/EditAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=edit
-
 command.description=Edit a file with an external editor.
 
 command.option.editor=Path to external editor command

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=fileinfo
-
 command.description=Displays information about a file.
 
 command.argument.path=Path of file to display

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/FindAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/FindAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/FindAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/FindAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=find
-
 command.description=Find files in a hierarchy.
 
 command.option.addNameFilter=Include files with names matching GLOB

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/GrepAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/GrepAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/GrepAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/GrepAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=grep
-
 command.description=Displays lines matching a pattern.
 
 command.argument.pattern=Pattern to match

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/ListDirectoryAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/ListDirectoryAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/ListDirectoryAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/ListDirectoryAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=ls
-
 command.description=List the contents of a file or directory.
 
 command.argument.path=The file or directory path to list.

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/RemoveAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/RemoveAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/RemoveAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/RemoveAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=rm
-
 command.description=Remove a file or directory.
 
 command.argument.path=File or directory PATH to be removed.

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/TouchAction.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/TouchAction.properties?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/TouchAction.properties (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/org/apache/geronimo/gshell/commands/vfs/TouchAction.properties Fri Oct 10 09:07:36 2008
@@ -21,8 +21,6 @@
 ## $Rev$ $Date$
 ##
 
-command.name=touch
-
 command.description=Sets the last-modified time of a file.
 
 command.argument.path=The path of the file to modify.

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasCommand.java?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasCommand.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasCommand.java Fri Oct 10 09:07:36 2008
@@ -23,6 +23,7 @@
 import org.apache.geronimo.gshell.command.CommandAction;
 import org.apache.geronimo.gshell.command.CommandContext;
 import org.apache.geronimo.gshell.command.Variables;
+import org.apache.geronimo.gshell.command.CommandLocation;
 import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
 import org.apache.geronimo.gshell.i18n.MessageSource;
 import org.apache.geronimo.gshell.i18n.ResourceBundleMessageSource;
@@ -59,6 +60,15 @@
         setDocumenter(new AliasCommandDocumenter());
         setCompleter(new NullCommandCompleter());
         setMessages(new AliasCommandMessageSource());
+        setLocation(new CommandLocation() {
+            public String getName() {
+                return name;
+            }
+
+            public String getPath() {
+                return null;
+            }
+        });
     }
 
     public AliasCommand() {
@@ -155,11 +165,6 @@
         extends MessageSourceCommandDocumenter
     {
         @Override
-        public String getName() {
-            return AliasCommand.this.getName();
-        }
-
-        @Override
         public String getDescription() {
             return getMessages().format(COMMAND_DESCRIPTION, getAlias());
         }

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterSupport.java?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterSupport.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterSupport.java Fri Oct 10 09:07:36 2008
@@ -86,7 +86,7 @@
 
         Printer printer = new Printer(clp);
         printer.setMessageSource(new PrefixingMessageSource(getCommand().getMessages(), "command."));
-        printer.printUsage(out, getName());
+        printer.printUsage(out, getCommand().getLocation().getName());
     }
 
     protected abstract String getManual();
@@ -100,7 +100,7 @@
         
         out.println(renderer.render(Renderer.encode("NAME", Code.BOLD)));
         out.print("  ");
-        out.println(getName());
+        out.println(getCommand().getLocation().getName());
         out.println();
 
         out.println(renderer.render(Renderer.encode("DESCRIPTION", Code.BOLD)));

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java Fri Oct 10 09:07:36 2008
@@ -29,6 +29,7 @@
 import org.apache.geronimo.gshell.command.CommandDocumenter;
 import org.apache.geronimo.gshell.command.CommandResult;
 import org.apache.geronimo.gshell.command.Variables;
+import org.apache.geronimo.gshell.command.CommandLocation;
 import org.apache.geronimo.gshell.i18n.MessageSource;
 import org.apache.geronimo.gshell.io.IO;
 import org.apache.geronimo.gshell.notification.Notification;
@@ -51,6 +52,8 @@
 {
     protected final Logger log = LoggerFactory.getLogger(getClass());
 
+    private CommandLocation location;
+
     private CommandAction action;
 
     private CommandDocumenter documenter;
@@ -59,6 +62,23 @@
 
     private MessageSource messages;
 
+    public CommandLocation getLocation() {
+        if (location == null) {
+            throw new IllegalStateException("Missing required property: location");
+        }
+        return location;
+    }
+
+    public void setLocation(final CommandLocation location) {
+        assert location != null;
+
+        handleCommandAware(location);
+
+        log.trace("Location: {}", location);
+        
+        this.location = location;
+    }
+
     public CommandAction getAction() {
         if (action == null) {
             throw new IllegalStateException("Missing required property: action");

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupCommand.java?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupCommand.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupCommand.java Fri Oct 10 09:07:36 2008
@@ -22,6 +22,7 @@
 import org.apache.commons.vfs.FileObject;
 import org.apache.geronimo.gshell.command.CommandAction;
 import org.apache.geronimo.gshell.command.CommandContext;
+import org.apache.geronimo.gshell.command.CommandLocation;
 import org.apache.geronimo.gshell.i18n.MessageSource;
 import org.apache.geronimo.gshell.i18n.ResourceBundleMessageSource;
 import org.apache.geronimo.gshell.registry.CommandResolver;
@@ -45,6 +46,16 @@
         setDocumenter(new GroupCommandDocumenter());
         setCompleter(new NullCommandCompleter());
         setMessages(new GroupCommandMessageSource());
+        setLocation(new CommandLocation() {
+            public String getName() {
+                return getFile().getName().getBaseName();
+            }
+
+            public String getPath() {
+                // FIXME: This isn't going to be correct, need to strip off the /commands stuff.
+                return getFile().getName().getPath();
+            }
+        });
     }
 
     public GroupCommand() {
@@ -88,11 +99,6 @@
         extends MessageSourceCommandDocumenter
     {
         @Override
-        public String getName() {
-            return getFile().getName().getBaseName();
-        }
-
-        @Override
         public String getDescription() {
             return getMessages().format(COMMAND_DESCRIPTION, getFile().getName().getBaseName());
         }

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/LinkCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/LinkCommand.java?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/LinkCommand.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/LinkCommand.java Fri Oct 10 09:07:36 2008
@@ -79,13 +79,6 @@
         final CommandDocumenter delegate = getCommand().getDocumenter();
 
         return new CommandDocumenter() {
-            public String getName() {
-                //
-                // FIXME: This is not correct, need to fix this... help listing shows up bunk.
-                //
-                return delegate.getName();
-            }
-
             public String getDescription() {
                 // TODO: i18n
                 return "Link to: " + target;

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/MessageSourceCommandDocumenter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/MessageSourceCommandDocumenter.java?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/MessageSourceCommandDocumenter.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/MessageSourceCommandDocumenter.java Fri Oct 10 09:07:36 2008
@@ -30,8 +30,6 @@
 public class MessageSourceCommandDocumenter
     extends CommandDocumenterSupport
 {
-    public static final String COMMAND_NAME = "command.name";
-
     public static final String COMMAND_DESCRIPTION = "command.description";
 
     public static final String COMMAND_MANUAL = "command.manual";
@@ -42,10 +40,6 @@
         return messages;
     }
 
-    public String getName() {
-        return getMessages().getMessage(COMMAND_NAME);
-    }
-
     public String getDescription() {
         return getMessages().getMessage(COMMAND_DESCRIPTION);
     }

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandRegistryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandRegistryImpl.java?rev=703511&r1=703510&r2=703511&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandRegistryImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandRegistryImpl.java Fri Oct 10 09:07:36 2008
@@ -20,10 +20,12 @@
 package org.apache.geronimo.gshell.wisdom.registry;
 
 import org.apache.geronimo.gshell.command.Command;
+import org.apache.geronimo.gshell.command.CommandLocation;
 import org.apache.geronimo.gshell.event.EventPublisher;
 import org.apache.geronimo.gshell.registry.CommandRegistry;
 import org.apache.geronimo.gshell.registry.DuplicateCommandException;
 import org.apache.geronimo.gshell.registry.NoSuchCommandException;
+import org.apache.geronimo.gshell.wisdom.command.CommandSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +60,10 @@
             throw new DuplicateCommandException(name);
         }
 
+        if (command instanceof CommandSupport) {
+            ((CommandSupport)command).setLocation(new CommandLocationImpl(name));
+        }
+
         commands.put(name, command);
 
         eventPublisher.publish(new CommandRegisteredEvent(name, command));
@@ -96,4 +102,45 @@
     public Collection<String> getCommandNames() {
         return Collections.unmodifiableSet(commands.keySet());
     }
+
+    //
+    // CommandLocationImpl
+    //
+
+    private class CommandLocationImpl
+        implements CommandLocation
+    {
+        private final String name;
+
+        private final String path;
+
+        public CommandLocationImpl(final String name) {
+            assert name != null;
+
+            int i = name.lastIndexOf("/");
+            if (i != -1) {
+                this.name = name.substring(i + 1, name.length());
+                this.path = name.substring(0, i);
+            }
+            else {
+                this.name = name;
+                this.path = null;
+            }
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getPath() {
+            return path;
+        }
+
+        public String toString() {
+            if (path != null) {
+                return path + "/" + name;
+            }
+            return name;
+        }
+    }
 }
\ No newline at end of file



Mime
View raw message