Merge default into amqp_0_9_1

Author: Simon MacMullen

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -309,7 +309,7 @@ public void start()
         // still in generated code; just pass a dummy value here
         Method res = _channel0.exnWrappingRpc(new AMQImpl.Connection.Open(_virtualHost,
                                                                           "",
-                                                                          true)).getMethod();
+                                                                          false)).getMethod();
         return;
     }
 

test/src/com/rabbitmq/client/test/server/Permissions.java

@@ -86,7 +86,7 @@ protected void addRestrictedAccount()
         runCtl("add_vhost /test");
         runCtl("set_permissions -p /test test configure write read");
         runCtl("set_permissions -p /test testadmin \".*\" \".*\" \".*\"");
-        runCtl("set_permissions -p /test noaccess \"\" \"\" \"\"");
+        runCtl("set_permissions -p /test -s all noaccess \"\" \"\" \"\"");
     }
 
     protected void deleteRestrictedAccount()
@@ -270,6 +270,11 @@ public void with(String _) throws IOException {
                     noAccessCh.queueDeclare("justaqueue", false, false, true, null);
                 }}
         );
+        expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
+                public void with(String _) throws IOException {
+                    noAccessCh.queueDeclare();
+                }}
+        );
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
                     noAccessCh.queueDelete("configure");

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

@@ -176,7 +176,6 @@ private static Options getOptions() {
         options.addOption(new Option("a", "autoack",   false,"auto ack"));
         options.addOption(new Option("q", "qos",       true, "qos prefetch count"));
         options.addOption(new Option("s", "size",      true, "message size"));
-        options.addOption(new Option("d", "redirects", true, "max redirects"));
         options.addOption(new Option("z", "time",      true, "time limit"));
         Option flag =     new Option("f", "flag",      true, "message flag");
         flag.setArgs(Option.UNLIMITED_VALUES);

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

@@ -420,10 +420,10 @@ public void tryTopics() throws IOException {
         String q2 = "tryTopicsQueue2";
         String q3 = "tryTopicsQueue3";
         String x = "tryTopicsExch";
-        _ch1.queueDeclare(q1, false, false, false, null);
-        _ch1.queueDeclare(q2, false, false, false, null);
-        _ch1.queueDeclare(q3, false, false, false, null);
-        _ch1.exchangeDeclare(x, "topic", false, false, null);
+        _ch1.queueDeclare(q1, false, true, true, null);
+        _ch1.queueDeclare(q2, false, true, true, null);
+        _ch1.queueDeclare(q3, false, true, true, null);
+        _ch1.exchangeDeclare(x, "topic", false, true, null);
         _ch1.queueBind(q1, x, "test.#");
         _ch1.queueBind(q2, x, "test.test");
         _ch1.queueBind(q3, x, "*.test.#");
@@ -440,12 +440,6 @@ public void tryTopics() throws IOException {
         expect(1, drain(10, q2, true));
         log("About to drain q3");
         expect(2, drain(10, q3, true));
-
-        _ch1.queueDelete(q3, true, true);
-        _ch1.queueDelete(q2, true, true);
-        _ch1.queueDelete(q1, true, true);
-        // We created the exchange auto_delete - it should be gone by this point.
-        // ch1.exchangeDelete(x);
     }
 
     public void doBasicReturn(BlockingCell cell, int expectedCode) {