diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-09-20 18:59:30 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-09-20 18:59:30 +0000 |
| commit | c70bf3ea28cdf6bafd8571690d3e5c466a0658a2 (patch) | |
| tree | 68b24940e433f3f9c278b054d9ea1622389bd332 /qpid/java/module.xml | |
| parent | fcdf1723c7b5cdf0772054a93edb6e7d97c4bb1e (diff) | |
| download | qpid-python-c70bf3ea28cdf6bafd8571690d3e5c466a0658a2.tar.gz | |
QPID-4984: WIP - Merge from trunk r.1525056
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/linearstore@1525101 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/module.xml')
| -rw-r--r-- | qpid/java/module.xml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/qpid/java/module.xml b/qpid/java/module.xml index ce54e108c5..b3029645e0 100644 --- a/qpid/java/module.xml +++ b/qpid/java/module.xml @@ -74,6 +74,7 @@ <property name="module.genpom.args" value=""/> <property name="module.maven.depends" value=""/> <property name="maven.remote.repo" value="file://${module.release.base}/maven"/> + <property name="eclipse.project.suffix" value=""/> <property name="broker.log.prefix" value="BROKER: "/> <property name="broker.log.interleave" value="true"/> @@ -521,10 +522,15 @@ </jar> </target> - <target name="copy-broker-plugin-jars" if="broker.plugin" description="copy broker plugins for use in release packaging"> + <target name="copy-broker-plugin-jars" depends="copy-broker-plugin-jars-deps" 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> + <!-- Overridden in broker-plugins/amqp-1-0-protocol, bdbstore, and bdbstore/jmx modules --> + <target name="copy-broker-plugin-jars-deps" if="broker.plugin" description="copy broker plugins dependencies for use in release packaging"> + <copylist todir="${build.scratch.broker.plugins.lib}" dir="${project.root}" files="${module.libs}"/> + </target> + <target name="copy-files-to-module-metainf" depends="copy-project-resources-metainf, copy-module-resources-metainf, copy-module-src-resources-metainf"/> <target name="copy-project-resources-metainf"> @@ -909,7 +915,7 @@ qpid.name=${project.name} <map from="${project.root}${file.separator}" to=''/> </pathconvert> <map property="eclipse.required.slashedprojectnames" value="${eclipse.required.projectnames}" join="${path.separator}"> - <globmapper from="*" to="/*"/> + <globmapper from="*" to="/*${eclipse.project.suffix}"/> </map> <echo message="Ant module dependencies : ${module.depends} ${module.test.depends} converted to Eclipse required project(s): ${eclipse.required.slashedprojectnames}"/> @@ -921,7 +927,7 @@ qpid.name=${project.name} <!-- Create the Eclipse .project --> <target name="eclipse-project"> <eclipse updatealways="${eclipse.updatealways}"> - <project name="${module.name}"/> + <project name="${module.name}${eclipse.project.suffix}"/> <!-- If the Eclipse task were to ever support the generation of linked resources, we would configure it to generate |