From b7414c1f944e92c16576a0907562826d1dfd3d02 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Fri, 4 Jan 2013 11:07:12 +0000
Subject: QPID-4527: update the JCA module to use the standard build target
 implementation, rather than replacing it.

- Overrides the output destinations (to give the filenames 'ra' instead of 'jca' as it was doing) and uses the postbuild target to additionally create the rar and examples.
- Moves the META-INF resources for the rar file to their own directory, removing need to specifically prevent their inclusion in the jar file.

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

(limited to 'qpid/java/jca/build.xml')

diff --git a/qpid/java/jca/build.xml b/qpid/java/jca/build.xml
index 768ff54bff..42a19ff83a 100644
--- a/qpid/java/jca/build.xml
+++ b/qpid/java/jca/build.xml
@@ -25,26 +25,23 @@
   <!-- Hack to make the renamed module jars available on the module test classpath -->
   <property name="module.test.depends" value="ra ra/tests"/>
 
-  <import file="../module.xml"/>
-
-  <property name="module.rar" value="${build.lib}/${project.name}-ra-${project.version}.rar"/>
-
-  <property name="module.resources" value="src/main/resources"/>
+  <!-- Import common.xml to make the properties it defines available before importing module.xml -->
+  <import file="../common.xml"/>
 
-  <target name="rar" depends="jar.nomanifest">
+  <!-- Override the standard output jar names before importing module.xml, to produce
+       artifacts that use ra in the name instead of jca like the module should -->
+  <property name="module.test.jar" value="${build.lib}/${project.name}-ra-tests-${project.version}.jar"/>
+  <property name="module.jar" value="${build.lib}/${project.name}-ra-${project.version}.jar"/>
+  <property name="module.source.jar" value="${build.lib}/${project.name}-ra-${project.version}-sources.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. 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"/>
+  <import file="../module.xml"/>
 
-    <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"/>
+  <property name="module.rar" value="${build.lib}/${project.name}-ra-${project.version}.rar"/>
+  <property name="rar.resources" value="rar/src/main/resources"/>
 
+  <target name="rar" depends="jar" description="creates a rar file containing the module jar, client jars, etc">
     <jar destfile="${module.rar}">
-      <fileset dir="${module.resources}">
+      <fileset dir="${rar.resources}">
         <include name="**/*.xml"/>
       </fileset>
       <fileset dir="${build.lib}">
@@ -78,11 +75,9 @@
 
   <target name="examples" depends="example-properties-file, example-jars"/>
 
-  <target name="build" depends="rar, examples, jar-tests, jar-sources, postbuild"/>
+  <target name="postbuild" depends="rar, examples"/>
 
-  <target name="postbuild">
-     <!-- Hack to make the tests/sources jar names match the renamed main module jar/rar -->
-     <move file="${module.test.jar}" tofile="${build.lib}/${project.name}-ra-tests-${project.version}.jar"/>
-     <move file="${module.source.jar}" tofile="${build.lib}/${project.name}-ra-${project.version}-sources.jar"/>
-  </target>
+  <!-- Override module.xml 'libs' target to avoid copying the jar files dependencies
+       into the 'build/lib' dir, since they will be supplied by the app server -->
+  <target name="libs"/>
 </project>
-- 
cgit v1.2.1