Merged bug24114 into default

Author: Emile Joubert

LICENSE-MPL-RabbitMQ

@@ -447,7 +447,7 @@ EXHIBIT A -Mozilla Public License.
      The Original Code is RabbitMQ.
 
      The Initial Developer of the Original Code is VMware, Inc.
-     Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.''
+     Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.''
 
      [NOTE: The text of this Exhibit A may differ slightly from the text of
      the notices in the Source Code files of the Original Code. You should

Makefile

@@ -22,11 +22,11 @@ clean:
 distclean: clean
 	make -C $(AMQP_CODEGEN_DIR) clean
 
-dist: distclean srcdist dist_all
+dist: distclean srcdist dist_all maven-bundle
 
 dist_all: dist1.5 javadoc-archive
 
-maven-bundle: distclean
+maven-bundle:
 	ant -Dimpl.version=$(VERSION) maven-bundle
 
 dist1.5:
@@ -64,7 +64,7 @@ srcdist: distclean
 	(cd build; zip -q -r $(SRC_ARCHIVE).zip $(SRC_ARCHIVE))
 	(cd build; rm -rf $(SRC_ARCHIVE))
 
-stage-and-promote-maven-bundle: maven-bundle
+stage-and-promote-maven-bundle:
 	( \
 	  cd build/bundle; \
 	  NEXUS_USERNAME=`cat $(GNUPG_PATH)/../nexus/username`; \

build.xml

@@ -308,7 +308,7 @@
   	</fail>
   </target>
 
-  <target name="test-suite-run" depends="test-client, test-ssl, test-server, test-functional, test-main-silent"/>
+  <target name="test-suite-run" depends="test-client, test-ssl, test-server, test-functional, test-functional-and-server-with-ha, test-main-silent"/>
 
   <target name="test-client" depends="test-build" description="Run the client test suites.">
     <junit printSummary="withOutAndErr"
@@ -369,6 +369,19 @@
     </junit>
   </target>
 
+  <!-- TODO: merge test-server, test-functional and this into one, once umbrellas have been merged -->
+  <target name="test-functional-and-server-with-ha" depends="detect-umbrella, test-build" if="UMBRELLA_AVAILABLE">
+    <junit printSummary="withOutAndErr"
+        haltOnFailure="${haltOnFailureJunit}"
+        failureproperty="test.failure"
+        fork="yes">
+      <classpath refid="test.classpath"/>
+      <formatter type="plain"/>
+      <formatter type="xml"/>
+      <test todir="${build.out}" name="com.rabbitmq.client.test.server.HATests"/>
+    </junit>
+  </target>
+
   <target name="test-single" depends="test-build">
     <junit printSummary="withOutAndErr"
         haltOnFailure="${haltOnFailureJunit}"
@@ -491,4 +504,3 @@
     </bundlor:bundlor>
   </target>
 </project>
-

codegen.py

@@ -11,7 +11,7 @@
 ##  The Original Code is RabbitMQ.
 ##
 ##  The Initial Developer of the Original Code is VMware, Inc.
-##  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+##  Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.
 ##
 
 from __future__ import nested_scopes
@@ -143,7 +143,7 @@ def printFileHeader():
 //  The Original Code is RabbitMQ.
 //
 //  The Initial Developer of the Original Code is VMware, Inc.
-//  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+//  Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.
 //
 """
 

src/com/rabbitmq/client/Address.java

@@ -11,7 +11,7 @@
 //  The Original Code is RabbitMQ.
 //
 //  The Initial Developer of the Original Code is VMware, Inc.
-//  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+//  Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.
 //
 
 

src/com/rabbitmq/client/AlreadyClosedException.java

@@ -11,7 +11,7 @@
 //  The Original Code is RabbitMQ.
 //
 //  The Initial Developer of the Original Code is VMware, Inc.
-//  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+//  Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.
 //
 
 

src/com/rabbitmq/client/BasicProperties.java

@@ -11,7 +11,7 @@
 //  The Original Code is RabbitMQ.
 //
 //  The Initial Developer of the Original Code is VMware, Inc.
-//  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+//  Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.
 //
 
 package com.rabbitmq.client;

src/com/rabbitmq/client/Channel.java

@@ -11,7 +11,7 @@
 //  The Original Code is RabbitMQ.
 //
 //  The Initial Developer of the Original Code is VMware, Inc.
-//  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+//  Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.
 //
 
 package com.rabbitmq.client;
@@ -45,9 +45,17 @@
  * </ul>
  * <p>
  *
- * While a Channel can be used by multiple threads, it's important to ensure
- * that only one thread executes a command at once. Concurrent execution of
- * commands will likely cause an UnexpectedFrameError to be thrown.
+ * <p>
+ * {@link Channel} instances are safe for use by multiple
+ * threads. Requests into a {@link Channel} are serialized, with only one
+ * thread running commands at a time.
+ * As such, applications may prefer using a {@link Channel} per thread
+ * instead of sharing the same <code>Channel</code> across multiple threads.
+ *
+ * An <b>important caveat</b> to this is that confirms are <b>not</b> handled
+ * properly when a {@link Channel} is shared between multiple threads. In that
+ * scenario, it is therefore important to ensure that the {@link Channel}
+ * instance is <b>not</b> accessed concurrently by multiple threads.
  *
  */
 
@@ -361,9 +369,9 @@ Exchange.DeclareOk exchangeDeclare(String exchange,
      * Bind an exchange to an exchange, with no extra arguments.
      * @see com.rabbitmq.client.AMQP.Exchange.Bind
      * @see com.rabbitmq.client.AMQP.Exchange.BindOk
-     * @param destination: the name of the exchange to which messages flow across the binding
-     * @param source: the name of the exchange from which messages flow across the binding
-     * @param routingKey: the routine key to use for the binding
+     * @param destination the name of the exchange to which messages flow across the binding
+     * @param source the name of the exchange from which messages flow across the binding
+     * @param routingKey the routine key to use for the binding
      * @return a binding-confirm method if the binding was successfully created
      * @throws java.io.IOException if an error is encountered
      */
@@ -373,10 +381,10 @@ Exchange.DeclareOk exchangeDeclare(String exchange,
      * Bind an exchange to an exchange.
      * @see com.rabbitmq.client.AMQP.Exchange.Bind
      * @see com.rabbitmq.client.AMQP.Exchange.BindOk
-     * @param destination: the name of the exchange to which messages flow across the binding
-     * @param source: the name of the exchange from which messages flow across the binding
-     * @param routingKey: the routine key to use for the binding
-     * @param arguments: other properties (binding parameters)
+     * @param destination the name of the exchange to which messages flow across the binding
+     * @param source the name of the exchange from which messages flow across the binding
+     * @param routingKey the routine key to use for the binding
+     * @param arguments other properties (binding parameters)
      * @return a binding-confirm method if the binding was successfully created
      * @throws java.io.IOException if an error is encountered
      */
@@ -386,9 +394,9 @@ Exchange.DeclareOk exchangeDeclare(String exchange,
      * Unbind an exchange from an exchange, with no extra arguments.
      * @see com.rabbitmq.client.AMQP.Exchange.Bind
      * @see com.rabbitmq.client.AMQP.Exchange.BindOk
-     * @param destination: the name of the exchange to which messages flow across the binding
-     * @param source: the name of the exchange from which messages flow across the binding
-     * @param routingKey: the routine key to use for the binding
+     * @param destination the name of the exchange to which messages flow across the binding
+     * @param source the name of the exchange from which messages flow across the binding
+     * @param routingKey the routine key to use for the binding
      * @return a binding-confirm method if the binding was successfully created
      * @throws java.io.IOException if an error is encountered
      */
@@ -398,10 +406,10 @@ Exchange.DeclareOk exchangeDeclare(String exchange,
      * Unbind an exchange from an exchange.
      * @see com.rabbitmq.client.AMQP.Exchange.Bind
      * @see com.rabbitmq.client.AMQP.Exchange.BindOk
-     * @param destination: the name of the exchange to which messages flow across the binding
-     * @param source: the name of the exchange from which messages flow across the binding
-     * @param routingKey: the routine key to use for the binding
-     * @param arguments: other properties (binding parameters)
+     * @param destination the name of the exchange to which messages flow across the binding
+     * @param source the name of the exchange from which messages flow across the binding
+     * @param routingKey the routine key to use for the binding
+     * @param arguments other properties (binding parameters)
      * @return a binding-confirm method if the binding was successfully created
      * @throws java.io.IOException if an error is encountered
      */
@@ -737,34 +745,40 @@ void basicNack(long deliveryTag, boolean multiple, boolean requeue)
     /**
      * Wait until all messages published since the last call have been
      * either ack'd or nack'd by the broker.  Note, when called on a
-     * non-Confirm channel, waitForConfirms returns true immediately.
+     * non-Confirm channel, waitForConfirms throws an IllegalStateException.
      * @return whether all the messages were ack'd (and none were nack'd)
+     * @throws java.lang.IllegalStateException
      */
     boolean waitForConfirms() throws InterruptedException;
 
     /**
      * Wait until all messages published since the last call have been
      * either ack'd or nack'd by the broker; or until timeout elapses.
      * If the timeout expires a TimeoutException is thrown.  When
-     * called on a non-Confirm channel, waitForConfirms returns true
-     * immediately.
+     * called on a non-Confirm channel, waitForConfirms throws an
+     * IllegalStateException.
      * @return whether all the messages were ack'd (and none were nack'd)
+     * @throws java.lang.IllegalStateException
      */
     boolean waitForConfirms(long timeout) throws InterruptedException, TimeoutException;
 
     /** Wait until all messages published since the last call have
      * been either ack'd or nack'd by the broker.  If any of the
      * messages were nack'd, waitForConfirmsOrDie will throw an
      * IOException.  When called on a non-Confirm channel, it will
-     * return immediately. */
-    void waitForConfirmsOrDie() throws IOException, InterruptedException;
+     * throw an IllegalStateException.
+     * @throws java.lang.IllegalStateException
+     */
+     void waitForConfirmsOrDie() throws IOException, InterruptedException;
 
     /** Wait until all messages published since the last call have
      * been either ack'd or nack'd by the broker; or until timeout elapses.
      * If the timeout expires a TimeoutException is thrown.  If any of the
      * messages were nack'd, waitForConfirmsOrDie will throw an
      * IOException.  When called on a non-Confirm channel, it will
-     * return immediately. */
+     * throw an IllegalStateException.
+     * @throws java.lang.IllegalStateException
+     */
     void waitForConfirmsOrDie(long timeout) throws IOException, InterruptedException, TimeoutException;
 
     /**

src/com/rabbitmq/client/Command.java

@@ -11,7 +11,7 @@
 //  The Original Code is RabbitMQ.
 //
 //  The Initial Developer of the Original Code is VMware, Inc.
-//  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+//  Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.
 //
 
 

src/com/rabbitmq/client/ConfirmListener.java

@@ -11,7 +11,7 @@
 //  The Original Code is RabbitMQ.
 //
 //  The Initial Developer of the Original Code is VMware, Inc.
-//  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+//  Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.
 //