Author: msacks
Date: Wed Feb  9 08:45:53 2011
New Revision: 1068794

URL: http://svn.apache.org/viewvc?rev=1068794&view=rev
Log:
Re-added domains() functionality. The domains command works now and has been 
tested.
Removed unnecessary blab from console output.
Updated help to reflect addition of domains(), and removed echo() from help 
output.

Modified:
    incubator/kitty/trunk/src/main/java/org/apache/kitty/CmdShell.groovy
    incubator/kitty/trunk/src/main/java/org/apache/kitty/client/Client.groovy
    incubator/kitty/trunk/src/main/java/org/apache/kitty/utils/Help.groovy

Modified: incubator/kitty/trunk/src/main/java/org/apache/kitty/CmdShell.groovy
URL: 
http://svn.apache.org/viewvc/incubator/kitty/trunk/src/main/java/org/apache/kitty/CmdShell.groovy?rev=1068794&r1=1068793&r2=1068794&view=diff
==============================================================================
--- incubator/kitty/trunk/src/main/java/org/apache/kitty/CmdShell.groovy 
(original)
+++ incubator/kitty/trunk/src/main/java/org/apache/kitty/CmdShell.groovy Wed 
Feb  9 08:45:53 2011
@@ -291,6 +291,8 @@ class CmdShell {
                }
        }
 
+  /* this command is serving no purpose and needs to be removed in future 
versions */
+
        static cmdEcho(def input) {
                if (input.size() > 1) {
                        input.each { print it+" " }
@@ -298,11 +300,14 @@ class CmdShell {
                println()
        }
 
+
+
        static cmdDomains() {
-               println "getting domains..."
-               def domains = getClient().getDomainList()
+               def domains = getClient().domains()
                if (domains) {
-                       println "A list of domains is available"
+                       println "Domains Detected: "
+            domains.eachWithIndex() { obj, i -> println " ${i}: ${obj}" }
+
                }
                else {
                        println "No domains are available"

Modified: 
incubator/kitty/trunk/src/main/java/org/apache/kitty/client/Client.groovy
URL: 
http://svn.apache.org/viewvc/incubator/kitty/trunk/src/main/java/org/apache/kitty/client/Client.groovy?rev=1068794&r1=1068793&r2=1068794&view=diff
==============================================================================
--- incubator/kitty/trunk/src/main/java/org/apache/kitty/client/Client.groovy 
(original)
+++ incubator/kitty/trunk/src/main/java/org/apache/kitty/client/Client.groovy 
Wed Feb  9 08:45:53 2011
@@ -108,7 +108,6 @@ class Client {
        public domains() {
                if (this.remote) {
                        this.domainList = remote.getDomains()
-                       this.domainList.each { println it }
                }
                else {
                        println "The remote connection is null"

Modified: incubator/kitty/trunk/src/main/java/org/apache/kitty/utils/Help.groovy
URL: 
http://svn.apache.org/viewvc/incubator/kitty/trunk/src/main/java/org/apache/kitty/utils/Help.groovy?rev=1068794&r1=1068793&r2=1068794&view=diff
==============================================================================
--- incubator/kitty/trunk/src/main/java/org/apache/kitty/utils/Help.groovy 
(original)
+++ incubator/kitty/trunk/src/main/java/org/apache/kitty/utils/Help.groovy Wed 
Feb  9 08:45:53 2011
@@ -40,16 +40,17 @@ class Help {
                sb.append "COMMANDS\n\n"
                sb.append "connect <host> <port> - Connect to the remote host\n"
                sb.append "disconnect - Disconnect from remote host\n"
-               sb.append "cd <path> - Change the current path\n"
-               sb.append "echo - Return the text that is entered\n"
+               sb.append "cd <path> - Change the current mbean path\n"
                sb.append "exit - Quit the application and return to the 
command prompt\n"
                sb.append "get <attribute> - Get an attribute from the remote 
host\n"
                sb.append "set <attribute> <value> - Set an attribute on the 
remote host\n"
                sb.append "setdomain <domain> - Set the domain in the current 
session\n"
+        sb.append "domains - List all available MBeanServer domains"
                sb.append "invoke <operation> <parameters...> - Invoke an 
operation on the remote host\n"
-               sb.append "ls - List the managable resources on the remote 
host\n"
-               sb.append "pwd - \n"
-               
+               sb.append "ls - List all objects and attributes in current 
mbean path\n"
+               sb.append "pwd - print working directory of mbean path \n"
+
+        /* echo command removed from help, but still currently functional. 
echo is deprecated */
                
                return sb.toString()
        }


Reply via email to