Author: robbie
Date: Thu Jun 28 19:44:05 2012
New Revision: 1355130
URL: http://svn.apache.org/viewvc?rev=1355130&view=rev
Log:
QPID-4093: work around ancient versions of Ant lacking 'erroronmissingdir' in
the metainf element of the jar task by using copying to compose the files for
addition to META-INF.
Also prevents general files in the modules resources dir that arent intended
for inclusion in META-INF from being included there.
Added:
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider
- copied, changed from r1355072,
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/services/org.apache.qpid.server.jmx.MBeanProvider
Removed:
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/services/org.apache.qpid.server.jmx.MBeanProvider
Modified:
qpid/trunk/qpid/java/module.xml
Copied:
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider
(from r1355072,
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/services/org.apache.qpid.server.jmx.MBeanProvider)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider?p2=qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider&p1=qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/services/org.apache.qpid.server.jmx.MBeanProvider&r1=1355072&r2=1355130&rev=1355130&view=diff
==============================================================================
(empty)
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1355130&r1=1355129&r2=1355130&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Thu Jun 28 19:44:05 2012
@@ -52,10 +52,11 @@
<property name="module.results" location="${build.results}/${module}"/>
<property name="module.failed" location="${module.results}/FAILED"/>
<property name="module.src" location="src/main/java"/>
- <property name="module.src.resources" location="src/main/resources"/>
<property name="module.test.src" location="src/test/java"/>
<property name="module.bin" location="bin"/>
<property name="module.etc" location="etc"/>
+ <property name="module.src.resources.metainf"
location="src/main/resources/META-INF"/>
+ <property name="module.metainf" location="${module.build}/META-INF"/>
<property name="module.namever"
value="${project.name}-${module.name}-${project.version}"/>
<property name="module.namever.osgi"
value="${project.name}-${module.name}_${project.version}.0.osgi"/>
@@ -83,6 +84,7 @@
<available property="module.test.src.exists" file="${module.test.src}"/>
<available property="module.etc.exists" file="${module.etc}"/>
<available property="module.bin.exists" file="${module.bin}"/>
+ <available property="module.src.resources.metainf.exists"
file="${module.src.resources.metainf}"/>
<property name="module.source.jar"
location="${build.lib}/${project.name}-${module.name}-${project.version}-sources.jar"/>
@@ -443,21 +445,31 @@
<target name="postbuild" description="run after a build"/>
<target name="build"
depends="jar,jar-tests,jar-sources,libs,copy-bin,copy-etc,postbuild"
description="compile and copy resources into build tree"/>
- <target name="jar.manifest" depends="compile" if="module.manifest">
+
+ <target name="jar.manifest" depends="compile, copy-module-metainf"
if="module.manifest">
<jar destfile="${module.jar}" basedir="${module.classes}"
manifest="${module.manifest}">
- <metainf dir="${project.root}/resources/" />
- <metainf dir="${module.src.resources}" erroronmissingdir="false"/>
+ <metainf dir="${module.metainf}" />
</jar>
</target>
- <target name="jar.nomanifest" depends="compile" unless="module.manifest">
-
+ <target name="jar.nomanifest" depends="compile, copy-module-metainf"
unless="module.manifest">
<jar destfile="${module.jar}" basedir="${module.classes}">
- <metainf dir="${project.root}/resources/" />
- <metainf dir="${module.src.resources}" erroronmissingdir="false"/>
+ <metainf dir="${module.metainf}" />
</jar>
</target>
+ <target name="copy-module-metainf" depends="copy-metainf-resources"
if="module.src.resources.metainf.exists">
+ <copy todir="${module.metainf}" failonerror="true">
+ <fileset dir="${module.src.resources.metainf}"/>
+ </copy>
+ </target>
+
+ <target name="copy-metainf-resources">
+ <copy todir="${module.metainf}" failonerror="true">
+ <fileset dir="${project.root}/resources/"/>
+ </copy>
+ </target>
+
<target name="jar" depends="jar.manifest,jar.nomanifest" description="create
jar"/>
<target name="jar-tests" depends="compile-tests" description="create unit
test jar">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
