Merging bug23637 to default

Author: Matthew Sackman

README-TESTS

@@ -12,32 +12,26 @@ The suites are:
   Server tests
   SSL tests
 
-All the tests require a conforming server listening on localhost:5672
-(the default settings).  For details on running specific tests, see
-below.
+The Server test suite cannot be launched from the public umbrella
+( http://hg.rabbitmq.com/rabbitmq-public-umbrella ). Attempting to launch
+this suite by executing the "test-server" ant target will fail, because
+test necessary prerequisites are not present in the public umbrella.
 
-All the test suites can be run with the command ant test-suite. To run
-specific test suites see the instructions below.
+All other tests require a conforming server listening on localhost:5672
+(the default settings). SSL tests require a broker listening on the default
+SSL port. For details on running specific tests, see below.
 
 
 Running a Specific Test Suite
 =============================
 
-To run a specific test suite, but not the others, you should execute
-one of the following in the top-level directory of the source tree:
+To run a specific test suite you should execute one of the following in the
+top-level directory of the source tree:
 
   ant test-client
   ant test-functional
-  ant test-server
   ant test-ssl
 
-Note that to run the SSL tests, the RabbitMQ server should be
-configured to use SSL as per the SSL with RabbitMQ guide.
-
-The server tests are meant to test a RabbitMQ broker.  Broadly, they
-require a running RabbitMQ broker on the default host/port, the source
-code for rabbitmq-server in ../rabbitmq-server, and a test directory
-../rabbitmq-test.  Running them manually is a tricky business.
 
 For example, to run the client tests:
 
@@ -66,3 +60,39 @@ BUILD SUCCESSFUL
 
 If any tests are broken details can be found by viewing this file:
 	build/TEST-com.rabbitmq.client.test.ClientTests.txt
+
+
+SSL Test Setup
+--------------
+
+To run the SSL tests, the RabbitMQ server and Java client should be configured
+as per the SSL instructions on the RabbitMQ website. The SSL_CERTS_DIR
+environment variable must point to a certificate folder with the following
+minimal structure:
+
+   $SSL_CERTS_DIR
+   |-- client
+   |   |-- keycert.p12
+   |   |-- cert.pem
+   |   \-- key.pem
+   |-- server
+   |   |-- cert.pem
+   |   \-- key.pem
+   \-- testca
+       \-- cacert.pem
+
+The PASSWORD environment variable must be set to the password of the keycert.p12
+PKCS12 keystore. The broker must be configured to validate client certificates.
+This will become minimal broker configuration file if $SSL_CERTS_DIR is replaced
+with the certificate folder:
+
+%%%%% begin sample test broker configuration
+[{rabbit, [{ssl_listeners, [5671]},
+           {ssl_options,   [{cacertfile,"$SSL_CERTS_DIR/testca/cacert.pem"},
+                            {certfile,"$SSL_CERTS_DIR/server/cert.pem"},
+                            {keyfile,"$SSL_CERTS_DIR/server/key.pem"},
+                            {verify,verify_peer},
+                            {fail_if_no_peer_cert, false}]}]}].
+%%%%% end sample test broker configuration
+
+

build.properties

@@ -1,17 +1,21 @@
+alt.javac.source=1.6
+alt.javac.target=1.6
 build.out=build
-lib.out=${build.out}/lib
+bundle.name=RabbitMQ Java AMQP client library
+bundle.out=${build.out}/bundle
+bundle.symbolicName=com.rabbitmq.client
+bundlor.home=bundlor
 dist.out=${build.out}/dist
-src.generated=${build.out}/gensrc
+impl.version=0.0.0
 javac.debug=true
+javac.out=${build.out}/classes
+javadoc.out=build/doc/api
+lib.out=${build.out}/lib
+python.bin=python
+sibling.codegen.dir=../rabbitmq-codegen/
+spec.version=0.9.1
+src.generated=${build.out}/gensrc
 standard.javac.source=1.5
 standard.javac.target=1.5
-alt.javac.source=1.6
-alt.javac.target=1.6
-javac.out=${build.out}/classes
 test.javac.out=${build.out}/test/classes
 test.src.home=test/src
-sibling.codegen.dir=../rabbitmq-codegen/
-spec.version=0.9.1
-bundle.out=${build.out}/bundle
-javadoc.out=build/doc/api
-python.bin=python

build.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<project name="RabbitMQ Java client" default="build">
+<project name="RabbitMQ Java client" default="build"
+    xmlns:bundlor="antlib:com.springsource.bundlor.ant">
 
   <property file="build.properties"/>
   <property file="config.properties"/>
@@ -386,7 +387,7 @@
     </junit>
   </target>
 
-  <target name="jar" depends="build">
+  <target name="jar" depends="build, bundlor.do">
     <mkdir dir="${lib.out}"/>
     <antcall target="doJarWithTags">
        <param name="jar.name" value="rabbitmq-client"/>
@@ -410,7 +411,7 @@
              token="VERSION" value="${impl.version}"/>
   </target>
 
-  <target name="test-jar" depends="test-build">
+  <target name="test-jar" depends="test-build, test-bundlor.do">
     <mkdir dir="${lib.out}"/>
       <antcall target="doJarWithTags">
          <param name="jar.name" value="rabbitmq-client-tests"/>
@@ -420,7 +421,8 @@
 
     <target name="doJarWithTags">
         <jar destfile="${lib.out}/${jar.name}.jar"
-             basedir="${base}">
+             basedir="${base}"
+             filesetmanifest="merge">
             <manifest>
               <section name="${jar.name}">
                  <attribute name="Specification-Title" value="AMQP"/>
@@ -461,4 +463,36 @@
   <target name="clean-tests">
     <delete dir="build/test"/>
   </target>
+
+  <target name="bundlor.init">
+      <taskdef resource="com/springsource/bundlor/ant/antlib.xml"
+          uri="antlib:com.springsource.bundlor.ant">
+          <classpath id="bundlor.classpath">
+              <fileset dir="${bundlor.home}/dist"/>
+              <fileset dir="${bundlor.home}/lib"/>
+          </classpath>
+      </taskdef>
+  </target>
+
+  <target name="bundlor.do" depends="bundlor.init">
+    <bundlor:bundlor
+        inputPath="${javac.out}"
+        outputPath="${javac.out}"
+        manifestTemplatePath="bundlorTemplate.mf">
+      <propertyset>
+        <propertyref builtin="all"/>
+      </propertyset>
+    </bundlor:bundlor>
+  </target>
+
+  <target name="test-bundlor.do" depends="bundlor.init">
+    <bundlor:bundlor
+        inputPath="${test.javac.out}"
+        outputPath="${test.javac.out}"
+        manifestTemplatePath="bundlorTestTemplate.mf">
+      <propertyset>
+        <propertyref builtin="all"/>
+      </propertyset>
+    </bundlor:bundlor>
+  </target>
 </project>