QPID-1522: Move command line constants to individual command files. Centralise list of commands in CommandLineInterpreter. Make CommandExecutionEngine look up command from registered list rather than use a big if().

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@732310 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 9 insertions, 9 deletions

diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecutionEngine.java b/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecutionEngine.java
index 923f34678a..278c56a417 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecutionEngine.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecutionEngine.java
@@ -69,7 +69,7 @@ public class TestCommandExecutionEngine {
 
     }
     @Test
-    public void TestCommandSelector()
+    public void TestCommandSelector() throws Exception
     {
         line = "list -o queue";
         command = line.split(" ");
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandLineInterpreter.java b/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandLineInterpreter.java
index 36a2d29dfd..7d61e1c73c 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandLineInterpreter.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandLineInterpreter.java
@@ -80,7 +80,7 @@ public class TestCommandLineInterpreter {
 
     }
     @Test
-    public void TestSetQueryString()
+    public void TestSetQueryString() throws Exception
     {
         CommandLineInterpreter.oneshotmode(args,parser,jmxc,mbsc);
         Assert.assertEquals(args[0],"info");
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
index 833ad0478e..1504893355 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
@@ -75,7 +75,7 @@ public class TestCommand{
         parser = new CommandLineOptionParser(list);
         test = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT);
         info = new JMXinfo(test.getConnector(),parser,test.getMBeanServerConnection());
-        cmd = new Commandinfo(info,"list");
+        cmd = new Commandinfo(info);
 
     }
     @Test
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
index 971c088fe1..224874910a 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
@@ -70,7 +70,7 @@ public class TestCommanddelete {
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
         info = new JMXinfo(jmxc,parser,mbsc);
-        delete = new Commanddelete(info,"delete");
+        delete = new Commanddelete(info);
 
 
 
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
index 5f0e8959a5..2d332fb13d 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
@@ -70,7 +70,7 @@ public class TestCommandinfo {
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
         info = new JMXinfo(jmxc,parser,mbsc);
-        infocommand = new Commandinfo(info,"list");
+        infocommand = new Commandinfo(info);
 
     }
     @Test
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
index 0af6f236f6..fd1063d24f 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
@@ -74,7 +74,7 @@ public class TestCommandlist {
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
         info = new JMXinfo(jmxc,parser,mbsc);
-        list = new Commandlist(info,"list");
+        list = new Commandlist(info);
 
     }
     @Test
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
index 3a5d55c8dd..a91a5b3c78 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
@@ -70,7 +70,7 @@ public class TestCommandmove {
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
         info = new JMXinfo(jmxc,parser,mbsc);
-        move = new Commandmove(info,"move");
+        move = new Commandmove(info);
 
 
 
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
index 6867cf0d01..f6c86734ec 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
@@ -70,7 +70,7 @@ public class TestCommandview {
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
         info = new JMXinfo(jmxc,parser,mbsc);
-        view = new Commandview(info,"view");
+        view = new Commandview(info);
     }
     @Test
     public void TestSetQueryString()
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
index 5ea6273561..aa8e6fffdc 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
@@ -70,7 +70,7 @@ public class TestCommandviewcontent {
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
         info = new JMXinfo(jmxc,parser,mbsc);
-        viewcontent = new Commandviewcontent(info,"viewcontent");
+        viewcontent = new Commandviewcontent(info);