merge live into bug24543

Author: michaelklishin

LICENSE-MPL-RabbitMQ

@@ -446,8 +446,8 @@ 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.
+     The Initial Developer of the Original Code is GoPivotal, Inc.
+     Copyright (c) 2007-2014 GoPivotal, Inc.  All rights reserved.
 
      Alternatively, the contents of this file may be used under the terms
      of the GNU General Public License version 2 (the  "GPL2"), or

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=::')
 
@@ -21,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:
@@ -63,7 +64,7 @@ srcdist: distclean
 	(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:
 	( \
 	  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

@@ -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}"

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

@@ -10,8 +10,8 @@
 ##
 ##  The Original Code is RabbitMQ.
 ##
-##  The Initial Developer of the Original Code is VMware, Inc.
-##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
+##  The Initial Developer of the Original Code is GoPivotal, Inc.
+##  Copyright (c) 2007-2014 GoPivotal, Inc.  All rights reserved.
 ##
 
 from __future__ import nested_scopes
@@ -142,8 +142,8 @@ 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.
+//  The Initial Developer of the Original Code is GoPivotal, Inc.
+//  Copyright (c) 2007-2014 GoPivotal, Inc.  All rights reserved.
 //
 """
 
@@ -264,12 +264,12 @@ def printWritePropertiesTo(c):
                 print "            if (this.%s != null) writer.write%s(this.%s);" % (jfName, jfClass, jfName)
         print "        }"
 
-    def printAppendArgumentDebugStringTo(c):
+    def printAppendPropertyDebugStringTo(c):
         appendList = [ "%s=\")\n               .append(this.%s)\n               .append(\""
                        % (f.name, java_field_name(f.name))
                        for f in c.fields ]
         print
-        print "        public void appendArgumentDebugStringTo(StringBuilder acc) {"
+        print "        public void appendPropertyDebugStringTo(StringBuilder acc) {"
         print "            acc.append(\"(%s)\");" % (", ".join(appendList))
         print "        }"
 
@@ -386,7 +386,7 @@ def printSetter(fieldType, fieldName):
             printSetter(jType, jName)
 
         printWritePropertiesTo(c)
-        printAppendArgumentDebugStringTo(c)
+        printAppendPropertyDebugStringTo(c)
         printPropertiesBuilderClass(c)
 
         print "    }"

nexus-upload.sh

@@ -8,7 +8,7 @@ set -e
 #   SIGNING_KEY -- the signing key to use
 #   GNUPG_PATH -- the path to the home directory for gnupg
 
-NEXUS_ROOT="http://$CREDS@oss.sonatype.org/service/local/staging/deploy/maven2/com/rabbitmq/amqp-client/$VERSION"
+NEXUS_ROOT="https://$CREDS@oss.sonatype.org/service/local/staging/deploy/maven2/com/rabbitmq/amqp-client/$VERSION"
 unset http_proxy
 unset https_proxy
 unset no_proxy

pom.xml

@@ -29,36 +29,8 @@
 
     <developers>
       <developer>
-        <id>matthias.radestock</id>
-        <name>Matthias Radestock</name>
-        <roles>
-          <role>Developer</role>
-        </roles>
-      </developer>
-     <developer>
-        <id>tonyg</id>
-        <name>Tony Garnock-Jones</name>
-        <roles>
-          <role>Developer</role>
-        </roles>
-      </developer>
-      <developer>
-        <id>matthew.sackman</id>
-        <name>Matthias Sackman</name>
-        <roles>
-          <role>Developer</role>
-        </roles>
-      </developer>
-      <developer>
-        <id>david.maciver</id>
-        <name>David MacIver</name>
-        <roles>
-          <role>Developer</role>
-        </roles>
-      </developer>
-      <developer>
-        <id>paul.jones</id>
-        <name>Paul Jones</name>
+        <id>rabbitmq.team</id>
+        <name>The RabbitMQ Team</name>
         <roles>
           <role>Developer</role>
         </roles>
@@ -71,12 +43,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>

scripts/runjava.sh

@@ -4,4 +4,4 @@ for d in `dirname $0`/*.jar
 do
     RABBIT_JARS="$d:$RABBIT_JARS"
 done
-exec java -cp "$RABBIT_JARS" "$@"
+exec java -cp "$RABBIT_JARS" "$@"