From 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kpvdr@apache.org>
Date: Thu, 28 Feb 2013 16:14:30 +0000
Subject: Update from trunk r1375509 through r1450773

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68
---
 java/jca/build.xml | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

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

diff --git a/java/jca/build.xml b/java/jca/build.xml
index 934514aa52..42a19ff83a 100644
--- a/java/jca/build.xml
+++ b/java/jca/build.xml
@@ -22,18 +22,26 @@
 
   <property name="module.depends" value="common client"/>
   <property name="module.name" value="jca"/>
+  <!-- Hack to make the renamed module jars available on the module test classpath -->
+  <property name="module.test.depends" value="ra ra/tests"/>
+
+  <!-- Import common.xml to make the properties it defines available before importing module.xml -->
+  <import file="../common.xml"/>
+
+  <!-- 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"/>
 
   <import file="../module.xml"/>
 
   <property name="module.rar" value="${build.lib}/${project.name}-ra-${project.version}.rar"/>
+  <property name="rar.resources" value="rar/src/main/resources"/>
 
-  <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-->
-    <move file="${build.lib}/${project.name}-${module.name}-${project.version}.jar" tofile="${build.lib}/${project.name}-ra-${project.version}.jar"/>
+  <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}">
@@ -67,6 +75,9 @@
 
   <target name="examples" depends="example-properties-file, example-jars"/>
 
-  <target name="build" depends="rar, examples"/>
+  <target name="postbuild" depends="rar, examples"/>
 
+  <!-- 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