svn commit: r1379478 - /qpid/trunk/qpid/java/jca/build.xml

[ra...@apache.org]

Author: rajith
Date: Fri Aug 31 15:30:55 2012
New Revision: 1379478

URL: http://svn.apache.org/viewvc?rev=1379478&view=rev
Log:
QPID-4267 Committing a patch on behalf of Weston Price.

Modified:
    qpid/trunk/qpid/java/jca/build.xml

Modified: qpid/trunk/qpid/java/jca/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/build.xml?rev=1379478&r1=1379477&r2=1379478&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/build.xml (original)
+++ qpid/trunk/qpid/java/jca/build.xml Fri Aug 31 15:30:55 2012
@@ -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"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org