Merge in default

Author: Steve Powell

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-2011 VMware, Inc.  All rights reserved.''
+     Copyright (c) 2007-2012 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

@@ -7,6 +7,7 @@ GNUPG_PATH=~
 
 WEB_URL=http://www.rabbitmq.com/
 NEXUS_STAGE_URL=http://oss.sonatype.org/service/local/staging/deploy/maven2
+MAVEN_NEXUS_VERSION=1.7
 
 AMQP_CODEGEN_DIR=$(shell fgrep sibling.codegen.dir build.properties | sed -e 's:sibling\.codegen\.dir=::')
 
@@ -77,12 +78,13 @@ stage-and-promote-maven-bundle: maven-bundle
 	    amqp-client-$(VERSION).jar \
 	    amqp-client-$(VERSION)-javadoc.jar \
 	    amqp-client-$(VERSION)-sources.jar && \
-	  mvn org.sonatype.plugins:nexus-maven-plugin:staging-close \
-	      org.sonatype.plugins:nexus-maven-plugin:staging-promote \
+	  mvn org.sonatype.plugins:nexus-maven-plugin:$(MAVEN_NEXUS_VERSION):staging-close \
+	      org.sonatype.plugins:nexus-maven-plugin:$(MAVEN_NEXUS_VERSION):staging-promote \
 	    -Dnexus.url=http://oss.sonatype.org \
 	    -Dnexus.username=$$NEXUS_USERNAME \
 	    -Dnexus.password=$$NEXUS_PASSWORD \
 	    -Dnexus.promote.autoSelectOverride=true \
+	    -DtargetRepositoryId=releases \
 	    -B \
 	    -Dnexus.description="Public release of $$VERSION" \
 	)

README-EXAMPLES

@@ -63,7 +63,7 @@ HelloServer - Acts as an RPC server over AMQP.
 HelloJsonClient - Performs a simple JSON-RPC call over AMQP.
 HelloJsonServer - Acts as a JSON-RPC server over AMQP.
 LogTail - Tails the server logs.
-SendString - Sends a user supplied message over AMQP.
+SendString - Sends a user-supplied message over AMQP.
 
 
 More Complex Examples

build.xml

@@ -491,3 +491,4 @@
     </bundlor:bundlor>
   </target>
 </project>
+

bundlorTemplate.mf

@@ -4,5 +4,4 @@ Bundle-Name: ${bundle.name}
 Bundle-Vendor: SpringSource
 Bundle-Version: ${impl.version}
 Import-Template: 
- org.apache.commons.io.*;version="[1.4,2)",
  javax.*;version=0

bundlorTestTemplate.mf

@@ -4,8 +4,8 @@ Bundle-Name: ${bundle.name}
 Bundle-Vendor: SpringSource
 Bundle-Version: ${impl.version}
 Import-Template: 
- org.apache.commons.io.*;version="[1.4,2)",
- org.apache.commons.cli.*;version="[1.2,2)",
+ org.apache.commons.io.*;version="[1.2,2)",
+ org.apache.commons.cli.*;version="[1.1,2)",
  com.rabbitmq.*;version="${impl.version:[=.=.=,=.+1)}",
  junit.*;version="[4,5)",
  javax.*;version=0

codegen.py

@@ -11,7 +11,7 @@
 ##  The Original Code is RabbitMQ.
 ##
 ##  The Initial Developer of the Original Code is VMware, Inc.
-##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
+##  Copyright (c) 2007-2012 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-2011 VMware, Inc.  All rights reserved.
+//  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
 //
 """
 

pom.xml

@@ -71,12 +71,14 @@
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
             <version>1.1</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>1.2</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

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-2011 VMware, Inc.  All rights reserved.
+//  Copyright (c) 2007-2012 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-2011 VMware, Inc.  All rights reserved.
+//  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
 //