Merging bug23760 to default

Author: Matthew Sackman

Makefile

@@ -23,7 +23,7 @@ distclean: clean
 
 dist: distclean srcdist dist_all
 
-dist_all: dist1.5 dist1.4 javadoc-archive
+dist_all: dist1.5 javadoc-archive
 
 maven-bundle: distclean
 	ant -Dimpl.version=$(VERSION) maven-bundle
@@ -32,10 +32,6 @@ dist1.5:
 	ant -Ddist.out=build/$(PACKAGE_NAME)-bin-$(VERSION) -Dimpl.version=$(VERSION) dist
 	$(MAKE) post-dist TARBALL_NAME=$(PACKAGE_NAME)-bin-$(VERSION)
 
-dist1.4:
-	ant -Ddist.out=build/$(PACKAGE_NAME)-java1.4bin-$(VERSION) -Dimpl.version=$(VERSION) dist1.4
-	$(MAKE) post-dist TARBALL_NAME=$(PACKAGE_NAME)-java1.4bin-$(VERSION)
-
 javadoc-archive:
 	ant javadoc
 	cp -Rp build/doc/api build/$(JAVADOC_ARCHIVE)

build.properties

@@ -1,5 +1,4 @@
 build.out=build
-retrotranslator=retrotranslator
 lib.out=${build.out}/lib
 dist.out=${build.out}/dist
 src.generated=${build.out}/gensrc
@@ -11,7 +10,6 @@ alt.javac.target=1.6
 javac.out=${build.out}/classes
 test.javac.out=${build.out}/test/classes
 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.9.1
 bundle.out=${build.out}/bundle

build.xml

@@ -251,25 +251,6 @@
     </java>
   </target>
 
-  <!-- Alternate version that runs using Java 1.4 as a compatibility test -->
-  <target name="test-main-silent-1.4" depends="dist1.4">
-    <java fork="true" classname="${test.main}"
-        jvm="${java-jvm-1.4}" failonerror="${haltOnFailureJava}"
-    	errorproperty="test.failure">
-      <jvmarg value="-Xdebug"/>
-      <jvmarg value="-Dsilent=true"/>
-      <arg value="${broker.hostname}"/>
-      <arg value="${broker.port}"/>
-      <classpath>
-	<fileset dir="${dist.out}">
-	  <include name="**/*.jar"/>
-	</fileset>
-	<pathelement path="${retrotranslator}/retrotranslator-runtime-1.2.1.jar"/>
-	<pathelement path="${retrotranslator}/backport-util-concurrent-3.0.jar"/>
-      </classpath>
-    </java>
-  </target>
-
   <target name="test-main-silent-alt" depends="test-build-alt">
     <java fork="true" classname="${test.main}"
         failonerror="${haltOnFailureJava}" errorproperty="test.failure">
@@ -473,36 +454,6 @@
     </copy>
   </target>
 
-  <!-- Build the Java1.4 version by running Retrotranslator on a copy of our jars -->
-  <target name="dist1.4" depends="jar, test-jar">
-    <mkdir dir="${dist.out}"/>
-    <copy todir="${dist.out}">
-      <fileset dir="lib">
-        <include name="**/*.jar"/>
-      </fileset>
-
-      <fileset dir="${lib.out}">
-        <include name="**/*.jar"/>
-      </fileset>
-
-      <fileset dir="scripts">
-        <include name="**/*.sh"/>
-        <include name="**/*.bat"/>
-      </fileset>
-
-      <fileset file="${retrotranslator}/retrotranslator-runtime-1.2.1.jar"/>
-      <fileset file="${retrotranslator}/backport-util-concurrent-3.0.jar"/>
-    </copy>
-    <java fork="true" jar="${retrotranslator}/retrotranslator-transformer-1.2.1.jar">
-      <arg value="-srcjar"/>
-      <arg value="${dist.out}/rabbitmq-client.jar"/>
-    </java>
-    <java fork="true" jar="${retrotranslator}/retrotranslator-transformer-1.2.1.jar">
-      <arg value="-srcjar"/>
-      <arg value="${dist.out}/rabbitmq-client-tests.jar"/>
-    </java>
-  </target>
-
   <target name="clean">
     <delete dir="build"/>
   </target>