Merge bug17538 into default

Author: tonyg

Makefile

@@ -20,6 +20,9 @@ distclean: clean
 
 dist: distclean srcdist dist1.5 dist1.4 javadoc-archive
 
+maven-bundle: distclean
+	ant -Dimpl.version=$(VERSION) maven-bundle
+
 dist1.5:
 	ant -Ddist.out=build/$(PACKAGE_NAME)-bin-$(VERSION) -Dimpl.version=$(VERSION) dist
 	$(MAKE) post-dist TARBALL_NAME=$(PACKAGE_NAME)-bin-$(VERSION)
@@ -30,7 +33,7 @@ dist1.4:
 
 javadoc-archive:
 	ant javadoc
-	cp -a build/doc/api build/$(JAVADOC_ARCHIVE)
+	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; rm -rf $(JAVADOC_ARCHIVE))
@@ -45,7 +48,7 @@ post-dist:
 
 srcdist: distclean
 	mkdir -p build/$(SRC_ARCHIVE)
-	cp -a `ls | grep -v '^\(build\|BUILD.in\)$$'` build/$(SRC_ARCHIVE)
+	cp -Rp `ls | grep -v '^\(build\|BUILD.in\)$$'` build/$(SRC_ARCHIVE)
 
 	mkdir -p build/$(SRC_ARCHIVE)/codegen
 	cp -r $(AMQP_CODEGEN_DIR)/* build/$(SRC_ARCHIVE)/codegen/.
@@ -58,3 +61,6 @@ srcdist: distclean
 	(cd build; tar -zcf $(SRC_ARCHIVE).tar.gz $(SRC_ARCHIVE))
 	(cd build; zip -r $(SRC_ARCHIVE).zip $(SRC_ARCHIVE))
 	(cd build; rm -rf $(SRC_ARCHIVE))
+
+deploy-maven-bundle: maven-bundle
+	rsync -r build/bundle/* maven@195.224.125.254:/home/maven/rabbitmq-java-client/

build.properties

@@ -14,3 +14,5 @@ test.src.home=test/src
 java-jvm-1.4=c:/Program Files/java/j2re1.4.2_14/bin/java
 sibling.codegen.dir=../rabbitmq-codegen/
 spec.version=0.8
+bundle.out=${build.out}/bundle/com/rabbitmq/amqp-client/${impl.version}/
+javadoc.out=build/doc/api

build.xml

@@ -243,6 +243,21 @@
      </antcall>
   </target>
 
+  <target name="maven-bundle" depends="jar,javadoc" description="This creates a bundle to upload to the central maven repo">
+    <mkdir dir="${bundle.out}"/>
+    <copy file="${lib.out}/rabbitmq-client.jar"
+          tofile="${bundle.out}/amqp-client-${impl.version}.jar"/>
+    <jar destfile="${bundle.out}/amqp-client-sources-${impl.version}.jar">
+        <fileset dir="src"/>
+    </jar>
+    <jar destfile="${bundle.out}/amqp-client-javadoc-${impl.version}.jar">
+        <fileset dir="${javadoc.out}"/>
+    </jar>
+    <copy file="pom.xml" tofile="${bundle.out}/amqp-client-${impl.version}.pom"/>
+    <replace file="${bundle.out}/amqp-client-${impl.version}.pom"
+             token="VERSION" value="${impl.version}"/>
+  </target>
+
   <target name="test-jar" depends="test-build">
     <mkdir dir="${lib.out}"/>
       <antcall target="doJarWithTags">

pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.rabbitmq</groupId>
+    <artifactId>amqp-client</artifactId>
+    <version>VERSION</version>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>