svn commit: r1423829 - in /qpid/trunk/qpid/java: broker/build.xml common.xml module.xml

[ro...@apache.org]

Author: robbie
Date: Wed Dec 19 11:27:04 2012
New Revision: 1423829

URL: http://svn.apache.org/viewvc?rev=1423829&view=rev
Log:
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.

Modified:
    qpid/trunk/qpid/java/broker/build.xml
    qpid/trunk/qpid/java/common.xml
    qpid/trunk/qpid/java/module.xml

Modified: qpid/trunk/qpid/java/broker/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/build.xml?rev=1423829&r1=1423828&r2=1423829&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/build.xml (original)
+++ qpid/trunk/qpid/java/broker/build.xml Wed Dec 19 11:27:04 2012
@@ -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>
 

Modified: qpid/trunk/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=1423829&r1=1423828&r2=1423829&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Wed Dec 19 11:27:04 2012
@@ -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"/>

Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1423829&r1=1423828&r2=1423829&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Wed Dec 19 11:27:04 2012
@@ -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">



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org