From 1430d822998d25832fd4c4266859cc2369f56c58 Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Fri, 31 Aug 2012 15:30:55 +0000
Subject: QPID-4267 Committing a patch on behalf of Weston Price.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1379478 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/jca/build.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'qpid/java/jca')

diff --git a/qpid/java/jca/build.xml b/qpid/java/jca/build.xml
index 934514aa52..3f34cc9f41 100644
--- a/qpid/java/jca/build.xml
+++ b/qpid/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"/>
-- 
cgit v1.2.1