Merge in default

Author: Simon MacMullen

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=::')
 
@@ -36,15 +37,15 @@ javadoc-archive:
 	ant javadoc
 	cp -Rp build/doc/api build/$(JAVADOC_ARCHIVE)
 	(cd build; tar -zcf $(JAVADOC_ARCHIVE).tar.gz $(JAVADOC_ARCHIVE))
-	(cd build; zip -r $(JAVADOC_ARCHIVE).zip $(JAVADOC_ARCHIVE))
+	(cd build; zip -q -r $(JAVADOC_ARCHIVE).zip $(JAVADOC_ARCHIVE))
 	(cd build; rm -rf $(JAVADOC_ARCHIVE))
 
 post-dist:
 	@[ -n "$(TARBALL_NAME)" ] || (echo "Please set TARBALL_NAME."; false)
 	chmod a+x build/$(TARBALL_NAME)/*.sh
 	cp LICENSE* build/$(TARBALL_NAME)
 	(cd build; tar -zcf $(TARBALL_NAME).tar.gz $(TARBALL_NAME))
-	(cd build; zip -r $(TARBALL_NAME).zip $(TARBALL_NAME))
+	(cd build; zip -q -r $(TARBALL_NAME).zip $(TARBALL_NAME))
 	(cd build; rm -rf $(TARBALL_NAME))
 
 srcdist: distclean
@@ -60,10 +61,10 @@ srcdist: distclean
 			>> build/$(SRC_ARCHIVE)/README; \
 	fi
 	(cd build; tar -zcf $(SRC_ARCHIVE).tar.gz $(SRC_ARCHIVE))
-	(cd build; zip -r $(SRC_ARCHIVE).zip $(SRC_ARCHIVE))
+	(cd build; zip -q -r $(SRC_ARCHIVE).zip $(SRC_ARCHIVE))
 	(cd build; rm -rf $(SRC_ARCHIVE))
 
-stage-maven-bundle: maven-bundle
+stage-and-promote-maven-bundle: maven-bundle
 	( \
 	  cd build/bundle; \
 	  NEXUS_USERNAME=`cat $(GNUPG_PATH)/../nexus/username`; \
@@ -77,23 +78,14 @@ stage-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 \
-	    -Dnexus.url=http://oss.sonatype.org \
-	    -Dnexus.username=$$NEXUS_USERNAME \
-	    -Dnexus.password=$$NEXUS_PASSWORD \
-	    -B \
-	    -Dnexus.description="Public release of $$VERSION" \
-	)
-
-promote-maven-bundle:
-	( \
-	  NEXUS_USERNAME=`cat $(GNUPG_PATH)/../nexus/username`; \
-	  NEXUS_PASSWORD=`cat $(GNUPG_PATH)/../nexus/password`; \
-	  mvn 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

@@ -227,8 +227,7 @@
     <java fork="true" classname="${test.main}"
         failonerror="${haltOnFailureJava}" errorproperty="test.failure">
       <jvmarg value="-Xdebug"/>
-      <arg value="${broker.hostname}"/>
-      <arg value="${broker.port}"/>
+      <arg value="amqp://${broker.hostname}:${broker.port}"/>
       <classpath>
         <path refid="test.javac.classpath"/>
         <pathelement path="${javac.out}"/>
@@ -242,8 +241,7 @@
     	failonerror="${haltOnFailureJava}" errorproperty="test.failure">
       <jvmarg value="-Xdebug"/>
       <jvmarg value="-Dsilent=true"/>
-      <arg value="${broker.hostname}"/>
-      <arg value="${broker.port}"/>
+      <arg value="amqp://${broker.hostname}:${broker.port}"/>
       <classpath>
         <path refid="test.javac.classpath"/>
         <pathelement path="${javac.out}"/>
@@ -257,8 +255,7 @@
         failonerror="${haltOnFailureJava}" errorproperty="test.failure">
       <jvmarg value="-Xdebug"/>
       <jvmarg value="-Dsilent=true"/>
-      <arg value="${broker.hostname}"/>
-      <arg value="${broker.port}"/>
+      <arg value="amqp://${broker.hostname}:${broker.port}"/>
       <classpath>
         <path refid="test.javac.classpath"/>
         <pathelement path="${javac.out}"/>
@@ -270,8 +267,7 @@
   <target name="producer" depends="test-build">
     <java fork="true" classname="com.rabbitmq.examples.ProducerMain">
       <jvmarg value="-Xdebug"/>
-      <arg value="${broker.hostname}"/>
-      <arg value="${broker.port}"/>
+      <arg value="amqp://${broker.hostname}:${broker.port}"/>
       <arg value="${test.producer.rate-limit}"/>
       <arg value="${test.producer.message-count}"/>
       <arg value="${test.producer.send-completion}"/>
@@ -288,8 +284,7 @@
   <target name="consumer" depends="test-build">
     <java fork="true" classname="com.rabbitmq.examples.ConsumerMain">
       <jvmarg value="-Xdebug"/>
-      <arg value="${broker.hostname}"/>
-      <arg value="${broker.port}"/>
+      <arg value="amqp://${broker.hostname}:${broker.port}"/>
       <classpath>
         <path refid="test.javac.classpath"/>
         <pathelement path="${javac.out}"/>
@@ -496,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