geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r570610 - in /geronimo/sandbox/gshell/trunk: gshell-api/src/main/java/org/apache/geronimo/gshell/command/ gshell-assembly/src/main/assembly/ gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/
Date Wed, 29 Aug 2007 02:31:06 GMT
Author: jdillon
Date: Tue Aug 28 19:31:05 2007
New Revision: 570610

URL: http://svn.apache.org/viewvc?rev=570610&view=rev
Log:
Add description to prevent options/arguments from hiding in help
Fixed auto help bugger

Modified:
    geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/ExitCommand.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SetCommand.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SourceCommand.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/UnsetCommand.java

Modified: geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java?rev=570610&r1=570609&r2=570610&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
Tue Aug 28 19:31:05 2007
@@ -216,7 +216,7 @@
             log.info("Executing w/arguments: " + Arguments.asString(args));
         }
 
-        Object result;
+        Object result = null;
 
         try {
             CommandLineProcessor clp = new CommandLineProcessor(this);
@@ -226,9 +226,10 @@
             if (displayHelp) {
                 displayHelp(clp);
             }
-            
-            // Invoke the command's action
-            result = doExecute();
+            else {
+                // Invoke the command's action
+                result = doExecute();
+            }
         }
         catch (Exception e) {
             log.error(e.getMessage());

Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml?rev=570610&r1=570609&r2=570610&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml Tue Aug 28 19:31:05
2007
@@ -61,6 +61,7 @@
             <outputDirectory>etc</outputDirectory>
         </fileSet>
         
+        <!--
         <fileSet>
             <directory>target</directory>
             <outputDirectory>lib</outputDirectory>
@@ -71,6 +72,7 @@
                 <exclude>gshell-cli-*-sources.jar</exclude>
             </excludes>
         </fileSet>
+        -->
     </fileSets>
     
     <dependencySets>

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/ExitCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/ExitCommand.java?rev=570610&r1=570609&r2=570610&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/ExitCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/ExitCommand.java
Tue Aug 28 19:31:05 2007
@@ -31,7 +31,7 @@
 public class ExitCommand
     extends CommandSupport
 {
-    @Argument
+    @Argument(description="System exit code")
     private int exitCode = 0;
 
     public ExitCommand() {

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java?rev=570610&r1=570609&r2=570610&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java
Tue Aug 28 19:31:05 2007
@@ -37,7 +37,7 @@
 {
     private CommandManager commandManager;
 
-    @Argument
+    @Argument(description="Help topic")
     private String topic = "topics";
 
     public HelpCommand(final CommandManager commandManager) {

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SetCommand.java?rev=570610&r1=570609&r2=570610&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SetCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SetCommand.java
Tue Aug 28 19:31:05 2007
@@ -45,10 +45,10 @@
         PROPERTY
     }
 
-    @Option(name="-m", aliases={"--mode"})
+    @Option(name="-m", aliases={"--mode"}, description="Set mode")
     private Mode mode = Mode.VARIABLE;
 
-    @Argument
+    @Argument(description="Variable definition")
     private List<String> args;
 
     public SetCommand() {

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SourceCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SourceCommand.java?rev=570610&r1=570609&r2=570610&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SourceCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SourceCommand.java
Tue Aug 28 19:31:05 2007
@@ -42,7 +42,7 @@
 {
     private Shell shell;
 
-    @Argument(required=true)
+    @Argument(required=true, description="Source file")
     private File file;
 
     public SourceCommand(final Shell shell) {

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/UnsetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/UnsetCommand.java?rev=570610&r1=570609&r2=570610&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/UnsetCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/UnsetCommand.java
Tue Aug 28 19:31:05 2007
@@ -42,10 +42,10 @@
         PROPERTY
     }
 
-    @Option(name="-m", aliases={"--mode"})
+    @Option(name="-m", aliases={"--mode"}, description="Unset mode")
     private Mode mode = Mode.VARIABLE;
 
-    @Argument(required=true)
+    @Argument(required=true, description="Variable name")
     private List<String> args;
 
     public UnsetCommand() {



Mime
View raw message