QPID-1548: Make the CLI depend on management-common, use the login logic there.

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

24 files changed, 114 insertions, 69 deletions

diff --git a/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat b/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat
index e282114d75..452ddb65ee 100755
--- a/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat
+++ b/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat
@@ -19,6 +19,7 @@
 set CLASSPATH=%CLASSPATH%;%QPID_HOME%/lib/jline-0.9.94.jar
 set CLASSPATH=%CLASSPATH%;%QPID_HOME%/lib/junit-4.4.jar
 set CLASSPATH=%CLASSPATH%;%QPID_HOME%/lib/qpid-cli-1.0.jar
+set CLASSPATH=%CLASSPATH%;%QPID_HOME%/lib/qpid-management-common-M4.jar
 set CLASSPATH=%CLASSPATH%;%QPID_HOME%/management/tools/qpid-cli/main/classes/
 java -classpath %CLASSPATH% org.apache.qpid.CommandLineInterpreter %1
 
diff --git a/qpid/java/management/tools/qpid-cli/build.xml b/qpid/java/management/tools/qpid-cli/build.xml
index 1c3c87cac6..7026cd2fd2 100644
--- a/qpid/java/management/tools/qpid-cli/build.xml
+++ b/qpid/java/management/tools/qpid-cli/build.xml
@@ -20,7 +20,7 @@
  -->
 <project name="qpid-cli">
 
-  <property name="module.depends" value="common" />
+  <property name="module.depends" value="common management/common" />
   <property name="module.test.depends" value="common client" />
   <property name="module.src" value="src" />
   <!-- Disable tests as per QPID-1342 -->
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
index bba942a127..713233c92a 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
@@ -96,7 +96,8 @@ public class CommandLineInterpreter {
                     commandlineoptionparser = new CommandLineOptionParser(args);
 
                 JMXConfiguration config = new JMXConfiguration(commandlineoptionparser.getAlloptions());
-                conn = ConnectorFactory.getConnector(config.gethostname(), config.getport());
+                conn = ConnectorFactory.getConnector(config.gethostname(), config.getport(), 
+                                                     config.getUsername(), config.getPassword());
                 jmxc = conn.getConnector();
                 mbsc = conn.getMBeanServerConnection();
                 if (config.checkoptionsetting("r", commandlineoptionparser.getAlloptions())) {
@@ -123,7 +124,7 @@ public class CommandLineInterpreter {
                     }
                 }
             } catch (Exception ex) {
-                connectionrefuse();
+                connectionrefuse(ex);
                 return;
             }
             /* In this point connection has been established */
@@ -183,9 +184,23 @@ public class CommandLineInterpreter {
         return t;
     }
 
-    private static void connectionrefuse() {
-        System.out.println("Cannot connect with the broker in given host with given port");
-        System.out.println("Please check the host name and the port given");
+    private static void connectionrefuse(Exception e) {
+        String message = e.getLocalizedMessage();
+        if (e instanceof SecurityException)
+        {
+            message = " authentication failed, please check username and password";
+        }
+        else
+        {
+            Throwable cause = e.getCause();
+            while (cause != null)
+            {
+                message = cause.getMessage();
+                cause = cause.getCause();
+            }
+        }
+
+        System.out.println("Cannot connect with the broker: " + message);
     }
 
     public static String[] oneshotmode(String[] args,CommandLineOptionParser commandlineoptionparser,JMXConnector jmxc,MBeanServerConnection mbsc) throws Exception
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Connector.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Connector.java
index d3357e31b7..c649390d97 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Connector.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Connector.java
@@ -45,25 +45,18 @@ import java.io.IOException;
 
 
 public class Connector {
-    private JMXServiceURL url = null;
     private JMXConnector jmxc = null;
     private MBeanServerConnection mbsc = null;
 
 
-    public Connector(JMXServiceURL url, JMXConnector jmxc, MBeanServerConnection mbsc) {
+    public Connector(JMXConnector jmxc, MBeanServerConnection mbsc) {
 
-
-        this.url = url;
         this.jmxc = jmxc;
         this.mbsc = mbsc;
 
 
     }
 
-    public JMXServiceURL getURL() {
-        return url;
-    }
-
     public JMXConnector getConnector() {
         return jmxc;
     }
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java
index a94003dc45..f9de1e8768 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java
@@ -37,12 +37,13 @@
  */
 package org.apache.qpid;
 
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-import javax.management.remote.JMXConnector;
-import javax.management.MBeanServerConnection;
 import java.io.IOException;
 
+import javax.management.MBeanServerConnection;
+import javax.management.remote.JMXConnector;
+
+import org.apache.qpid.management.common.JMXConnnectionFactory;
+
 /**
  * Created by IntelliJ IDEA.
  * User: lahiru
@@ -52,20 +53,21 @@ import java.io.IOException;
  */
 public class ConnectorFactory {
 
-    public static Connector getConnector(String host, String port) {
+    private static final long TIMEOUT = 30 * 1000;
 
-        String url_string = "service:jmx:rmi:///jndi/rmi://" + host + ":" + port + "/jmxrmi";
-        JMXServiceURL url;
-        JMXConnector jmxc;
-        MBeanServerConnection mbsc;
+    public static Connector getConnector(String host, String port, String username, String password) throws Exception {
+
+        JMXConnector jmxc = null;
+        MBeanServerConnection mbsc = null;
         try {
-            url = new JMXServiceURL(url_string);
-            jmxc = JMXConnectorFactory.connect(url, null);
+            jmxc = JMXConnnectionFactory.getJMXConnection(TIMEOUT, host, Integer.parseInt(port), username, password);
             mbsc = jmxc.getMBeanServerConnection();
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+        } 
+        catch (NumberFormatException e)
+        {
+            System.out.println("Illegal port entered:"+port);
+            System.exit(1);
         }
-        return new Connector(url, jmxc, mbsc);
+        return new Connector(jmxc, mbsc);
     }
 }
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOptionConstants.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOptionConstants.java
index fe84e2ebd2..da21c7663c 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOptionConstants.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOptionConstants.java
@@ -46,6 +46,8 @@ public interface CommandLineOptionConstants {
         String PORT_OPTION = "p";
         String INTERVAL_OPTION = "i";
         String REPORT_OPTION = "r";
+        String USER_OPTION = "u";
+        String PASSWORD_OPTION = "w";
 
     }
 
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXConfiguration.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXConfiguration.java
index 622f9d78bd..20c6c28291 100644
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXConfiguration.java
+++ b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXConfiguration.java
@@ -49,6 +49,8 @@ public class JMXConfiguration {
     private String outputpath = ".";
     private String report_file = "report.output";
     private boolean isreport_mode = false;
+    private String username = null;
+    private String password = null;
 
     public JMXConfiguration(Map map) {
         if (checkoptionsetting(CommandLineOptionConstants.JMXCommandLineOptionConstants.HOST_OPTION, map)) {
@@ -61,6 +63,14 @@ public class JMXConfiguration {
 
             this.report_file = optionchecker(CommandLineOptionConstants.JMXCommandLineOptionConstants.REPORT_OPTION, map);
         }
+        if (checkoptionsetting(CommandLineOptionConstants.JMXCommandLineOptionConstants.USER_OPTION, map)) {
+
+            this.setUsername(optionchecker(CommandLineOptionConstants.JMXCommandLineOptionConstants.USER_OPTION, map));
+        }
+
+        if (checkoptionsetting(CommandLineOptionConstants.JMXCommandLineOptionConstants.PASSWORD_OPTION, map)) {
+            this.setPassword(optionchecker(CommandLineOptionConstants.JMXCommandLineOptionConstants.PASSWORD_OPTION, map));
+        }
 
     }
 
@@ -145,4 +155,24 @@ public class JMXConfiguration {
             return false;
     }
 
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
 }
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/ConnectionConstants.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/ConnectionConstants.java
index 58953e1693..5ed8b29c0e 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/ConnectionConstants.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/ConnectionConstants.java
@@ -48,4 +48,6 @@ package org.apache.qpid;
 public interface ConnectionConstants {
     String BROKER_HOSTNAME="localhost";
     String BROKER_PORT="8999";
+    String USERNAME = "guest";
+    String PASSWORD = "guest";
 }
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecutionEngine.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecutionEngine.java
index 278c56a417..4f553ce74d 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecutionEngine.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandExecutionEngine.java
@@ -62,9 +62,9 @@ public class TestCommandExecutionEngine {
     CommandExecutionEngine engine;
     Connector connector;
     @Before
-    public void setup(){
+    public void setup() throws Exception{
 
-        connector = ConnectorFactory.getConnector("localhost","8999");
+        connector = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
 
 
     }
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandLineInterpreter.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandLineInterpreter.java
index 7d61e1c73c..1b2d93808e 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandLineInterpreter.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestCommandLineInterpreter.java
@@ -69,11 +69,11 @@ public class TestCommandLineInterpreter {
 
     String [] args = null;
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
         args = command.split(" ");
 //        System.out.println(args[0]);
-        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME, ConnectionConstants.BROKER_PORT);
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         jmxc = conn.getConnector();
         mbsc = conn.getMBeanServerConnection();
         parser = new CommandLineOptionParser(args,args[0]);
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestConnector.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestConnector.java
index e6b80aae66..ea1325a6a8 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestConnector.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/TestConnector.java
@@ -65,20 +65,13 @@ public class TestConnector {
     MBeanServerConnection mbsc;
 
     @Before
-    public void setup()
+    public void setup() throws Exception
     {
-        test = ConnectorFactory.getConnector("localhost","8999");
+        test = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         String url = "service:jmx:rmi:///jndi/rmi://localhost:8999/jmxrmi";
 
     }
-    @Test
-    public void testGetURL()
-    {
-
-
-//        Assert.assertNotNull(test);
-        Assert.assertEquals(test.getURL(),test.getURL());
-    }
+    
     @Test
     public void testGetConnector()
     {
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
index 1504893355..1fab7106e7 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
@@ -69,11 +69,11 @@ public class TestCommand{
     CommandLineOptionParser parser;
     Command cmd;
     @Before
-    public void setup()
+    public void setup() throws Exception
     {
         list = command.split(" ");
         parser = new CommandLineOptionParser(list);
-        test = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT);
+        test = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         info = new JMXinfo(test.getConnector(),parser,test.getMBeanServerConnection());
         cmd = new Commandinfo(info);
 
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
index 224874910a..0ebd401c60 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
@@ -63,9 +63,9 @@ public class TestCommanddelete {
     Commanddelete delete = null;
     Connector conn;
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME, ConnectionConstants.BROKER_PORT);
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         JMXConnector jmxc = conn.getConnector();
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
index 2d332fb13d..fa0bd6cecc 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
@@ -63,9 +63,9 @@ public class TestCommandinfo {
     CommandImpl infocommand = null;
     Connector conn = null;
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME, ConnectionConstants.BROKER_PORT);
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         JMXConnector jmxc = conn.getConnector();
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
index fd1063d24f..4252959155 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
@@ -67,9 +67,9 @@ public class TestCommandlist {
     Commandlist list = null;
     Connector conn = null;
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME, ConnectionConstants.BROKER_PORT);
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         JMXConnector jmxc = conn.getConnector();
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
index a91a5b3c78..0d810f8444 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
@@ -63,9 +63,9 @@ public class TestCommandmove {
     Commandmove move = null;
     Connector conn=null;
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME, ConnectionConstants.BROKER_PORT);
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         JMXConnector jmxc = conn.getConnector();
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
index f6c86734ec..5038f79821 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
@@ -63,9 +63,9 @@ public class TestCommandview {
     Commandview view =null;
     Connector conn=null;
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME, ConnectionConstants.BROKER_PORT);
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         JMXConnector jmxc = conn.getConnector();
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
index aa8e6fffdc..a70389aa54 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
@@ -63,9 +63,9 @@ public class TestCommandviewcontent {
     Commandviewcontent viewcontent =null;
     Connector conn = null;
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME, ConnectionConstants.BROKER_PORT);
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         JMXConnector jmxc = conn.getConnector();
         MBeanServerConnection mbsc = conn.getMBeanServerConnection();
         CommandLineOptionParser parser = new CommandLineOptionParser(command.split(" "));
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestAllObject.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestAllObject.java
index 25069e6dbb..1a9b0f5fc3 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestAllObject.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestAllObject.java
@@ -42,6 +42,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.After;
 import org.junit.Assert;
+import org.apache.qpid.ConnectionConstants;
 import org.apache.qpid.ConnectorFactory;
 import org.apache.qpid.Connector;
 
@@ -61,9 +62,9 @@ public class TestAllObject {
     String test1,test2;
 
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn  = ConnectorFactory.getConnector("localhost", "8999");
+        conn  = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         mbsc = conn.getMBeanServerConnection();
         test = new AllObjects(mbsc);
         test1 = "empty input1";
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestConnectionObject.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestConnectionObject.java
index 8f98d1ac37..10e04800e5 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestConnectionObject.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestConnectionObject.java
@@ -38,6 +38,8 @@
 package org.apache.qpid.commands.objects;
 
 import junit.framework.TestCase;
+
+import org.apache.qpid.ConnectionConstants;
 import org.apache.qpid.ConnectorFactory;
 import org.apache.qpid.Connector;
 import org.junit.After;
@@ -61,9 +63,9 @@ public class TestConnectionObject {
     String test1,test2,test3;
 
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn  = ConnectorFactory.getConnector("localhost", "8999");
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         mbsc = conn.getMBeanServerConnection();
         test = new ConnectionObject(mbsc);
         test1 = "ping";
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestExchangeObject.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestExchangeObject.java
index 64f2bef79a..b7bcb6f7d3 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestExchangeObject.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestExchangeObject.java
@@ -42,6 +42,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.After;
 import org.junit.Before;
+import org.apache.qpid.ConnectionConstants;
 import org.apache.qpid.Connector;
 import org.apache.qpid.ConnectorFactory;
 
@@ -61,9 +62,9 @@ public class TestExchangeObject {
     String test1,test2,test3;
 
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn  = ConnectorFactory.getConnector("localhost", "8999");
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         mbsc = conn.getMBeanServerConnection();
         test = new ExchangeObject(mbsc);
         test1 = "ping";
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestQueueObject.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestQueueObject.java
index 96b153f65d..ccae0c6266 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestQueueObject.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestQueueObject.java
@@ -42,6 +42,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.After;
 import org.junit.Before;
+import org.apache.qpid.ConnectionConstants;
 import org.apache.qpid.Connector;
 import org.apache.qpid.ConnectorFactory;
 
@@ -61,9 +62,9 @@ public class TestQueueObject{
     String test1,test2,test3;
 
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn  = ConnectorFactory.getConnector("localhost", "8999");
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         mbsc = conn.getMBeanServerConnection();
         test = new QueueObject(mbsc);
         test1 = "ping";
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestUserManagementObject.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestUserManagementObject.java
index a9123eb604..930e544c08 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestUserManagementObject.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestUserManagementObject.java
@@ -42,6 +42,7 @@ import org.junit.Assert;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.Before;
+import org.apache.qpid.ConnectionConstants;
 import org.apache.qpid.Connector;
 import org.apache.qpid.ConnectorFactory;
 
@@ -64,9 +65,9 @@ public class TestUserManagementObject{
     String test1,test2,test3;
 
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn  = ConnectorFactory.getConnector("localhost", "8999");
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         mbsc = conn.getMBeanServerConnection();
         test = new UserManagementObject(mbsc);
         test1 = "ping";
diff --git a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestVirtualHostObject.java b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestVirtualHostObject.java
index 29a233733d..d1699fdb9c 100644
--- a/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestVirtualHostObject.java
+++ b/qpid/java/management/tools/qpid-cli/test/org/apache/qpid/commands/objects/TestVirtualHostObject.java
@@ -25,6 +25,7 @@ import org.junit.Assert;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.Before;
+import org.apache.qpid.ConnectionConstants;
 import org.apache.qpid.Connector;
 import org.apache.qpid.ConnectorFactory;
 
@@ -44,9 +45,9 @@ public class TestVirtualHostObject{
     String test1,test2,test3;
 
     @Before
-    public void startup()
+    public void startup() throws Exception
     {
-        conn  = ConnectorFactory.getConnector("localhost", "8999");
+        conn = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT, ConnectionConstants.USERNAME, ConnectionConstants.PASSWORD);
         mbsc = conn.getMBeanServerConnection();
         test = new VirtualHostObject(mbsc);
         test1 = "ping";