summaryrefslogtreecommitdiff
path: root/java/jca
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2012-08-31 15:30:55 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2012-08-31 15:30:55 +0000
commit659145c47ebabefa95dd1fd405474153e2263b33 (patch)
tree361b82b6f79f8297fd6617f409fe51169284eb16 /java/jca
parentd074ede9a23f688622f8f839dbdd9742bf907d44 (diff)
downloadqpid-python-659145c47ebabefa95dd1fd405474153e2263b33.tar.gz
QPID-4267 Committing a patch on behalf of Weston Price.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1379478 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/jca')
-rw-r--r--java/jca/build.xml13
1 files changed, 11 insertions, 2 deletions
diff --git a/java/jca/build.xml b/java/jca/build.xml
index 934514aa52..3f34cc9f41 100644
--- a/java/jca/build.xml
+++ b/java/jca/build.xml
@@ -29,9 +29,18 @@
<property name="module.resources" value="src/main/resources"/>
- <target name="rar" depends="jar">
- <!--Note we need to do this as we need to keep the ra in the name of the artificats but we can't override the module.jar property which is based on the directory name-->
+ <target name="rar" depends="jar.nomanifest">
+
+ <!--Note we need to do this as we need to keep the ra in the name of the artificats but we can't override the module.jar property which is based on the directory name. Also, we re-jar to avoid duplicate *.xml files in the jar and the rar which is causing EAP deployment issues in later versions.-->
+ <delete file="${build.lib}/${project.name}-${module.name}-${project.version}.jar"/>
+
+ <jar destfile="${module.jar}" basedir="${module.classes}">
+ <metainf dir="${module.metainf}" >
+ <exclude name="**/*.xml"/>
+ </metainf>
+ </jar>
<move file="${build.lib}/${project.name}-${module.name}-${project.version}.jar" tofile="${build.lib}/${project.name}-ra-${project.version}.jar"/>
+
<jar destfile="${module.rar}">
<fileset dir="${module.resources}">
<include name="**/*.xml"/>