make build.xml files backward-compatible with ant 1.6.5, by replacing ant 1.7 specific tasks/extensions

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@640503 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 23 insertions, 18 deletions

diff --git a/qpid/java/broker/build.xml b/qpid/java/broker/build.xml
index bf402af7f7..f2a6a687d5 100644
--- a/qpid/java/broker/build.xml
+++ b/qpid/java/broker/build.xml
@@ -30,9 +30,9 @@
 
   <target name="precompile">
     <mkdir dir="${output.dir}"/>
-    <javacc target="src/main/grammar/SelectorParser.jj"
-            outputdirectory="${output.dir}"
-            javacchome="${project.root}/lib"/>
+    <exec executable="javacc">
+      <arg line="-OUTPUT_DIRECTORY=${output.dir} src/main/grammar/SelectorParser.jj"/>
+    </exec>
   </target>
 
 </project>
diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index 5b00f630d1..90ff32c7f8 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -33,7 +33,7 @@
   <basename property="qpid.jar.name"  file="${qpid.jar}"/>
 
   <map property="release.excludes" value="${modules}">
-    <regexpmapper from="(.*)" to="\1/**"/>
+    <globmapper from="*" to="*/\*\*"/>
   </map>
 
   <property name="release.zip"          location="${release}/${project.namever}.zip"/>
@@ -88,11 +88,16 @@
   </target>
 
   <target name="manifest" depends="check-manifest" unless="manifest.done">
-    <manifestclasspath property="qpid.jar.classpath" jarfile="${qpid.jar}">
-      <classpath>
-        <fileset dir="${build.lib}" includes="**/*.jar" excludes="**/${qpid.jar.name}"/>
-      </classpath>
-    </manifestclasspath>
+    <path id="class.path">
+      <fileset dir="${build.lib}" >
+        <include name="*.jar"/>
+        <exclude name="${qpid.jar.name}"/>
+      </fileset>
+    </path>
+    <pathconvert property="qpid.jar.classpath" pathsep=":" dirsep="/">
+      <path refid="class.path"/>
+      <map from="${basedir}" to="lib/"/>
+    </pathconvert>
 
     <jar destfile="${qpid.jar}">
       <manifest>
diff --git a/qpid/java/client/build.xml b/qpid/java/client/build.xml
index 847c38b3eb..1fb980b908 100644
--- a/qpid/java/client/build.xml
+++ b/qpid/java/client/build.xml
@@ -29,9 +29,9 @@
 
   <target name="precompile">
     <mkdir dir="${output.dir}"/>
-    <javacc target="src/main/grammar/SelectorParser.jj"
-            outputdirectory="${output.dir}"
-            javacchome="${project.root}/lib"/>
+    <exec executable="javacc">
+      <arg line="-OUTPUT_DIRECTORY=${output.dir} src/main/grammar/SelectorParser.jj"/>
+    </exec>
   </target>
 
 </project>
diff --git a/qpid/java/common/build.xml b/qpid/java/common/build.xml
index da5d7a5759..6c8bfbaf0f 100644
--- a/qpid/java/common/build.xml
+++ b/qpid/java/common/build.xml
@@ -94,11 +94,11 @@
 
   <target name="version" depends="check-version" if="version.stale">
     <!-- Write the version.properties out. -->
-    <propertyfile file="${version.file}">
-      <entry key="qpid.svnversion" value="${qpid.svnversion}"/>
-      <entry key="qpid.name" value="${project.name}"/>
-      <entry key="qpid.version" value="${project.version}"/>
-    </propertyfile>
+    <echo file="${version.file}" append="true">
+      qpid.svnversion=${qpid.svnversion}
+      qpid.name=${project.name}
+      qpid.version=${project.version}
+    </echo>
   </target>
 
   <target name="precompile" depends="gentools,jython,version"/>
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index d281937789..670992bff1 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -235,7 +235,7 @@
 
   <target name="libs" description="copy dependencies into build tree">
     <copy todir="${build.lib}" failonerror="false" flatten="true">
-      <path refid="module.libs"/>
+      <fileset dir="${basedir}${file.separator}.." includes="${module.libs}"/>
     </copy>
   </target>