Index: src/test/java/org/apache/kitty/test/TestGroovyShell.groovy =================================================================== --- src/test/java/org/apache/kitty/test/TestGroovyShell.groovy (revision 1130203) +++ src/test/java/org/apache/kitty/test/TestGroovyShell.groovy (working copy) @@ -31,7 +31,7 @@ def static final PROMPT = "kitty>" static InputStreamReader inReader; static BufferedReader bReader; - static commands = ["help", "connect", "disconnect", "exit", "ls", "echo"] + static commands = ["help", "connect", "disconnect", "exit", "ls"] /** * @@ -90,9 +90,6 @@ case 4: cmdLs() break; - case 5: - cmdEcho(input) - break; default: break; } @@ -137,10 +134,4 @@ { println "listing files and directories..." } - - static cmdEcho(def input) - { - println input } - -} Index: src/main/java/org/apache/kitty/CmdShell.groovy =================================================================== --- src/main/java/org/apache/kitty/CmdShell.groovy (revision 1130203) +++ src/main/java/org/apache/kitty/CmdShell.groovy (working copy) @@ -57,7 +57,6 @@ "disconnect", "exit", "ls", - "echo", "domains", "cd", "get", @@ -169,12 +168,9 @@ cmdLs() break; case 5: - cmdEcho(params) - break; - case 6: cmdDomains() break; - case 7: + case 6: if (params.length >= 2) { cmdCd(params[1]) } @@ -183,7 +179,7 @@ println "You must enter a path parameter after 'cd'" } break; - case 8: + case 7: if (params.length >= 2) { cmdGet(params[1]) } @@ -192,7 +188,7 @@ println "You must enter at 1 parameter after the command" } break; - case 9: + case 8: if (params.length >= 3) { cmdSet(params[1], params[2]) } @@ -201,7 +197,7 @@ println "You must enter an attribute parameter and a value parameter" } break; - case 10: + case 9: if (params.length >= 3) { cmdInvoke(params[1],params[2]) } @@ -211,10 +207,10 @@ } break; - case 11: + case 10: cmdPwd() break; - case 12: + case 11: if (params.length >= 2) { cmdSetDomain(params[1]) } @@ -318,17 +314,6 @@ } } - /* 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+" " } - } - println() - } - - - static cmdDomains() { def domains = getClient().domains() if (domains) { Index: src/main/java/org/apache/kitty/utils/Help.groovy =================================================================== --- src/main/java/org/apache/kitty/utils/Help.groovy (revision 1130203) +++ src/main/java/org/apache/kitty/utils/Help.groovy (working copy) @@ -50,8 +50,6 @@ 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() }