svn commit: r699780 - in /geronimo/gshell/trunk/gshell-cli/src/main: java/org/apache/geronimo/gshell/cli/Main.java resources/org/apache/geronimo/gshell/cli/Main.properties

[jd...@apache.org]

Author: jdillon
Date: Sun Sep 28 01:32:56 2008
New Revision: 699780

URL: http://svn.apache.org/viewvc?rev=699780&view=rev
Log:
Use messages for tokens

Modified:
    geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
    geronimo/gshell/trunk/gshell-cli/src/main/resources/org/apache/geronimo/gshell/cli/Main.properties

Modified: geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=699780&r1=699779&r2=699780&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java (original)
+++ geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java Sun Sep 28 01:32:56 2008
@@ -61,6 +61,10 @@
     //       https://issues.apache.org/jira/browse/GSHELL-47
     //
 
+    //
+    // TODO: Add --application and --settings
+    //
+
     @Option(name="-h", aliases={"--help"}, requireOverride=true)
     private boolean help;
 
@@ -113,13 +117,13 @@
         }
     }
 
-    @Option(name="-c", aliases={"--commands"}, token="STRING")
+    @Option(name="-c", aliases={"--commands"})
     private String commands;
 
-    @Argument(token="COMMAND")
+    @Argument
     private List<String> commandArgs = null;
 
-    @Option(name="-D", aliases={"--define"}, token="NAME=VALUE")
+    @Option(name="-D", aliases={"--define"})
     private void setSystemProperty(final String nameValue) {
         assert nameValue != null;
 
@@ -144,7 +148,7 @@
         ANSI.setEnabled(flag);
     }
 
-    @Option(name="-T", aliases={"--terminal"}, token="TYPE", argumentRequired=true)
+    @Option(name="-T", aliases={"--terminal"}, argumentRequired=true)
     private void setTerminalType(String type) {
         type = type.toLowerCase();
 

Modified: geronimo/gshell/trunk/gshell-cli/src/main/resources/org/apache/geronimo/gshell/cli/Main.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/src/main/resources/org/apache/geronimo/gshell/cli/Main.properties?rev=699780&r1=699779&r2=699780&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-cli/src/main/resources/org/apache/geronimo/gshell/cli/Main.properties (original)
+++ geronimo/gshell/trunk/gshell-cli/src/main/resources/org/apache/geronimo/gshell/cli/Main.properties Sun Sep 28 01:32:56 2008
@@ -38,13 +38,17 @@
 option.setQuiet=Limit output to ERROR
 
 option.commands=Parse command line from STRING
+option.commands.token=STRING
 
 argument.commandArgs=Command expression to execute
+argument.commandArgs.token=COMMAND
 
 option.setSystemProperty=Define system properties
+option.setSystemProperty.token=NAME=VALUE
 
 option.enableAnsiColors=Enable or disable use of ANSI colors
 
 option.setTerminalType=Specify the terminal TYPE to use
+option.setTerminalType.token=TYPE
 
 warning.abnormalShutdown=WARNING: Abnormal JVM shutdown detected
\ No newline at end of file