geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r698857 - in /geronimo/gshell/trunk/gshell-remote: gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/ gshell-remote-client/src/main/resources/org/apache/geronimo/gshell/remote/client/ gshell-remote-server/src/main/...
Date Thu, 25 Sep 2008 08:17:33 GMT
Author: jdillon
Date: Thu Sep 25 01:17:32 2008
New Revision: 698857

URL: http://svn.apache.org/viewvc?rev=698857&view=rev
Log:
Externalize token for i18n

Modified:
    geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java
    geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/org/apache/geronimo/gshell/remote/client/RshCommand.properties
    geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java
    geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/org/apache/geronimo/gshell/remote/server/RshServerCommand.properties

Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java?rev=698857&r1=698856&r2=698857&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java
Thu Sep 25 01:17:32 2008
@@ -46,19 +46,19 @@
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
     
-    @Option(name="-b", aliases={"--bind"}, token="URI")
+    @Option(name="-b", aliases={"--bind"})
     private URI local;
 
-    @Option(name="-u", aliases={"--username"}, token="USERNAME")
+    @Option(name="-u", aliases={"--username"})
     private String username;
 
-    @Option(name="-p", aliases={"--password"}, token="PASSWORD")
+    @Option(name="-p", aliases={"--password"})
     private String password;
     
-    @Argument(token="URI", required=true, index=0)
+    @Argument(required=true, index=0)
     private URI remote;
 
-    @Argument(token="COMMAND", index=1, multiValued=true)
+    @Argument(index=1, multiValued=true)
     private List<String> command = new ArrayList<String>();
 
     private BeanContainer container;
@@ -75,6 +75,9 @@
         io.info("Connecting to: {}", remote);
 
         RshClient client = container.getBean(RshClient.class);
+
+        log.debug("Created client: {}", client);
+        
         client.connect(remote, local);
 
         io.info("Connected");

Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/org/apache/geronimo/gshell/remote/client/RshCommand.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/org/apache/geronimo/gshell/remote/client/RshCommand.properties?rev=698857&r1=698856&r2=698857&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/org/apache/geronimo/gshell/remote/client/RshCommand.properties
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/org/apache/geronimo/gshell/remote/client/RshCommand.properties
Thu Sep 25 01:17:32 2008
@@ -26,14 +26,19 @@
 command.description=Connect to a remote GShell server.
 
 command.option.local=Bind local address to URI
+command.option.local.token=URI
 
 command.option.username=Remote user name
+command.option.username.token=USERNAME
 
 command.option.password=Remote user password
+command.option.password.token=PASSWORD
 
 command.argument.remote=Connect to remote server at URI
+command.argument.remote.token=URI
 
 command.argument.command=Execute COMMAND in remote shell
+command.argument.command.token=COMMAND
 
 command.manual=\
   TODO: rsh manual
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java?rev=698857&r1=698856&r2=698857&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServerCommand.java
Thu Sep 25 01:17:32 2008
@@ -44,7 +44,7 @@
     @Option(name="-b", aliases={ "--background"})
     private boolean background;
 
-    @Argument(token="URI", required=true)
+    @Argument(required=true)
     private URI location;
 
     private BeanContainer container;

Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/org/apache/geronimo/gshell/remote/server/RshServerCommand.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/org/apache/geronimo/gshell/remote/server/RshServerCommand.properties?rev=698857&r1=698856&r2=698857&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/org/apache/geronimo/gshell/remote/server/RshServerCommand.properties
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/org/apache/geronimo/gshell/remote/server/RshServerCommand.properties
Thu Sep 25 01:17:32 2008
@@ -28,6 +28,7 @@
 command.option.background=Run in background
 
 command.argument.location=Listen for connections on URI
+command.argument.location.token=URI
 
 command.manual=\
   TODO: rsh-server manual
\ No newline at end of file



Mime
View raw message