You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2012/12/19 18:16:03 UTC
svn commit: r1423964 - in /qpid/branches/0.20/qpid/java: ./ broker/
broker/build.xml common.xml module.xml
Author: robbie
Date: Wed Dec 19 17:16:02 2012
New Revision: 1423964
URL: http://svn.apache.org/viewvc?rev=1423964&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.
merged from trunk r1423829
Modified:
qpid/branches/0.20/qpid/java/ (props changed)
qpid/branches/0.20/qpid/java/broker/ (props changed)
qpid/branches/0.20/qpid/java/broker/build.xml
qpid/branches/0.20/qpid/java/common.xml
qpid/branches/0.20/qpid/java/module.xml
Propchange: qpid/branches/0.20/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1423829
Propchange: qpid/branches/0.20/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1423829
Modified: qpid/branches/0.20/qpid/java/broker/build.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/broker/build.xml?rev=1423964&r1=1423963&r2=1423964&view=diff
==============================================================================
--- qpid/branches/0.20/qpid/java/broker/build.xml (original)
+++ qpid/branches/0.20/qpid/java/broker/build.xml Wed Dec 19 17:16:02 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/branches/0.20/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/common.xml?rev=1423964&r1=1423963&r2=1423964&view=diff
==============================================================================
--- qpid/branches/0.20/qpid/java/common.xml (original)
+++ qpid/branches/0.20/qpid/java/common.xml Wed Dec 19 17:16:02 2012
@@ -42,7 +42,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/branches/0.20/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/module.xml?rev=1423964&r1=1423963&r2=1423964&view=diff
==============================================================================
--- qpid/branches/0.20/qpid/java/module.xml (original)
+++ qpid/branches/0.20/qpid/java/module.xml Wed Dec 19 17:16:02 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