Merge with default

Author: Rob Harrop

build.properties

@@ -1,17 +1,20 @@
+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
 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>