From 0e030a0ea4f92b588a93f530313f922493888b77 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Wed, 19 Dec 2012 11:27:04 +0000
Subject: QPID-4511: move the broker-plugins lib dir under build/scratch to
 prevent it being included in the binary produced by 'ant release'.

Updates the 'if' conditional on the copy target for compatibility with Ant versions < 1.7.1.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1423829 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/build.xml | 2 +-
 java/common.xml       | 2 +-
 java/module.xml       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'java')

diff --git a/java/broker/build.xml b/java/broker/build.xml
index 3c4a7d81c6..8581b7c639 100644
--- a/java/broker/build.xml
+++ b/java/broker/build.xml
@@ -56,7 +56,7 @@
 
     <target name="release-bin-copy-broker-plugins" description="copy broker-plugins into module release">
         <copy todir="${module.release}/lib/plugins" failonerror="true">
-            <fileset dir="${build.lib.broker.plugins}"/>
+            <fileset dir="${build.scratch.broker.plugins.lib}"/>
         </copy>
     </target>
 
diff --git a/java/common.xml b/java/common.xml
index 8a4e0b81a7..ce5693fd28 100644
--- a/java/common.xml
+++ b/java/common.xml
@@ -45,7 +45,7 @@
   <property name="build.report"          location="${build}/report"/>
   <property name="build.release"         location="${build}/release"/>
   <property name="build.release.prepare" location="${build.release}/prepare"/>
-  <property name="build.lib.broker.plugins"  location="${build}/lib/broker-plugins"/>
+  <property name="build.scratch.broker.plugins.lib"  location="${build.scratch}/broker-plugins/lib"/>
   <property name="build.coverage.report" location="${build}/coverage/report"/>
   <property name="build.coverage.src"    location="${build}/coverage/src"/>
   <property name="build.findbugs"        location="${build}/findbugs"/>
diff --git a/java/module.xml b/java/module.xml
index a8dbf96ebc..0725f714a8 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -240,7 +240,7 @@
     <mkdir dir="${build.etc}"/>
     <mkdir dir="${build.lib}"/>
     <mkdir dir="${build.results}"/>
-    <mkdir dir="${build.lib.broker.plugins}"/>
+    <mkdir dir="${build.scratch.broker.plugins.lib}"/>
     <mkdir dir="${module.classes}"/>
     <mkdir dir="${module.precompiled}"/>
     <mkdir dir="${module.api}"/>
@@ -508,8 +508,8 @@
     </jar>
   </target>
 
-  <target name="copy-broker-plugin-jars" if="${broker.plugin}" description="copy broker plugins for use in release packaging">
-    <copy file="${module.jar}" todir="${build.lib.broker.plugins}" failonerror="true"/>
+  <target name="copy-broker-plugin-jars" if="broker.plugin" description="copy broker plugins for use in release packaging">
+    <copy file="${module.jar}" todir="${build.scratch.broker.plugins.lib}" failonerror="true"/>
   </target>
 
   <target name="copy-module-metainf" depends="copy-metainf-resources" if="module.src.resources.metainf.exists">
-- 
cgit v1.2.1