geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r355916 - in /geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli: CommandDeploy.java CommandDistribute.java CommandLogin.java CommandPackage.java
Date Sun, 11 Dec 2005 05:17:16 GMT
Author: ammulder
Date: Sat Dec 10 21:17:13 2005
New Revision: 355916

URL: http://svn.apache.org/viewcvs?rev=355916&view=rev
Log:
Merge doc,etc. changes from HEAD

Removed:
    geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandPackage.java
Modified:
    geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
    geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
    geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandLogin.java

Modified: geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java?rev=355916&r1=355915&r2=355916&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
(original)
+++ geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java
Sat Dec 10 21:17:13 2005
@@ -38,8 +38,6 @@
                 "the plan may be omitted.  Sometimes the plan references a module already
" +
                 "deployed in the Geronimo server environment, in which case a module does
" +
                 "not need to be provided.\n" +
-                "If the server is not currently running, the module will be marked " +
-                "to start next time the server is started.\n" +
                 "If no targets are provided, the module is deployed to all available " +
                 "targets.  Geronimo only provides one target (ever), so this is primarily
" +
                 "useful when using a different driver.");

Modified: geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java?rev=355916&r1=355915&r2=355916&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
(original)
+++ geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java
Sat Dec 10 21:17:13 2005
@@ -46,9 +46,7 @@
                 "not need to be provided.\n" +
                 "If no targets are provided, the module is distributed to all available "
+
                 "targets.  Geronimo only provides one target (ever), so this is primarily
" +
-                "useful when using a different driver.\n" +
-                "If the server is not running when this command is invoked, no targets may
be " +
-                "specified.");
+                "useful when using a different driver.");
     }
 
     protected CommandDistribute(String command, String group, String helpArgumentList, String
helpText) {

Modified: geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandLogin.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandLogin.java?rev=355916&r1=355915&r2=355916&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandLogin.java
(original)
+++ geronimo/branches/1.0/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandLogin.java
Sat Dec 10 21:17:13 2005
@@ -44,13 +44,13 @@
                 "Future connections to the same server will try to use this "+
                 "saved authentication information instead of prompting where " +
                 "possible.  This information is saved separately per connection " +
-                "URL, so you can specify --url on the command line to save a" +
-                "login to a different server.\n" +
+                "URL, so you can specify --url or --host and/or --port on the command " +
+                "line to save a login to a different server.\n" +
                 "WARNING: while the login information is not saved in " +
                 "clear text, it is not secure either.  If you want to " +
                 "save the authentication securely, you should change the " +
-                ".geronimo-deployer file so that nobody else can read or " +
-                "write it.");
+                ".geronimo-deployer file in your home directory so that nobody " +
+                "else can read or write it.");
     }
 
     public CommandLogin(String command, String group, String helpArgumentList, String helpText)
{



Mime
View raw message