change the option name for URIs in MCM; add URIs to LogTail

Author: Alexandru Scvortov

test/src/com/rabbitmq/examples/LogTail.java

@@ -26,15 +26,13 @@
 public class LogTail {
     public static void main(String[] args) {
         try {
-            String hostName = (args.length > 0) ? args[0] : "localhost";
-            int portNumber = (args.length > 1) ? Integer.parseInt(args[1]) : AMQP.PROTOCOL.PORT;
-            String exchange = (args.length > 2) ? args[2] : "amq.rabbitmq.log";
+            ConnectionFactory cfconn = new ConnectionFactory();
+            if (args.length > 0) {
+                cfconn.setUri(args[0]);
+            }
+            String exchange = (args.length > 1) ? args[1] : "amq.rabbitmq.log";
 
-            ConnectionFactory cfconn = new ConnectionFactory(); 
-            cfconn.setHost(hostName); 
-            cfconn.setPort(portNumber);
             Connection conn = cfconn.newConnection();
-
             Channel ch1 = conn.createChannel();
 
             String queueName = ch1.queueDeclare().getQueue();

test/src/com/rabbitmq/examples/MulticastMain.java

@@ -64,8 +64,6 @@ public static void main(String[] args) {
                 System.exit(0);
             }
 
-            String hostName      = strArg(cmd, 'h', "localhost");
-            int portNumber       = intArg(cmd, 'p', AMQP.PROTOCOL.PORT);
             String exchangeType  = strArg(cmd, 't', "direct");
             String exchangeName  = strArg(cmd, 'e', exchangeType);
             String queueName     = strArg(cmd, 'u', "");
@@ -83,7 +81,7 @@ public static void main(String[] args) {
             List<?> flags        = lstArg(cmd, 'f');
             int frameMax         = intArg(cmd, 'M', 0);
             int heartbeat        = intArg(cmd, 'b', 0);
-            String uri           = strArg(cmd, 'u', null);
+            String uri           = strArg(cmd, 'h', "amqp://localhost");
 
             boolean exclusive  = "".equals(queueName);
             boolean autoDelete = !exclusive;
@@ -92,12 +90,7 @@ public static void main(String[] args) {
             String id = UUID.randomUUID().toString();
             Stats stats = new Stats(1000L * samplingInterval);
             ConnectionFactory factory = new ConnectionFactory();
-            if (uri != null) {
-                factory.setUri(uri);
-            } else {
-                factory.setHost(hostName);
-                factory.setPort(portNumber);
-            }
+            factory.setUri(uri);
             factory.setRequestedFrameMax(frameMax);
             factory.setRequestedHeartbeat(heartbeat);
 
@@ -181,8 +174,7 @@ private static void usage(Options options) {
     private static Options getOptions() {
         Options options = new Options();
         options.addOption(new Option("?", "help",      false,"show usage"));
-        options.addOption(new Option("h", "host",      true, "broker host"));
-        options.addOption(new Option("p", "port",      true, "broker port"));
+        options.addOption(new Option("h", "uri",       true, "AMQP URI"));
         options.addOption(new Option("t", "type",      true, "exchange type"));
         options.addOption(new Option("e", "exchange",  true, "exchange name"));
         options.addOption(new Option("u", "queue",     true, "queue name"));
@@ -202,7 +194,6 @@ private static Options getOptions() {
         options.addOption(flag);
         options.addOption(new Option("M", "framemax",  true, "frame max"));
         options.addOption(new Option("b", "heartbeat", true, "heartbeat interval"));
-        options.addOption(new Option("u", "uri",       true, "AMQP URI"));
         return options;
     }