geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r941434 - in /geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy: DisconnectCommand.java LoginCommand.java
Date Wed, 05 May 2010 19:18:13 GMT
Author: gawor
Date: Wed May  5 19:18:13 2010
New Revision: 941434

URL: http://svn.apache.org/viewvc?rev=941434&view=rev
Log:
GERONIMO-5213: Fixed the disconnect command and updated the login command to work better in
embedded mode

Modified:
    geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/DisconnectCommand.java
    geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/LoginCommand.java

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/DisconnectCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/DisconnectCommand.java?rev=941434&r1=941433&r2=941434&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/DisconnectCommand.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/DisconnectCommand.java
Wed May  5 19:18:13 2010
@@ -41,7 +41,7 @@ public class DisconnectCommand extends C
                 // ignore
             }
 
-            // session.close();
+            session.put(SERVER_CONNECTION, null);
 
             println("Connection ended");
         } else {

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/LoginCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/LoginCommand.java?rev=941434&r1=941433&r2=941434&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/LoginCommand.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/LoginCommand.java
Wed May  5 19:18:13 2010
@@ -33,6 +33,11 @@ public class LoginCommand extends Connec
 
     @Override
     protected Object doExecute() throws Exception {
+        if (isEmbedded()) {
+            println("No credentials to save in embedded mode.");
+            return null;
+        }
+        
         ServerConnection connection = connect();
 
         AbstractCommand command = new CommandLogin();



Mime
View raw message