From 83286c75a7a393bf8dabe311e33bda75124db8a5 Mon Sep 17 00:00:00 2001
From: "Weston M. Price" <wprice@apache.org>
Date: Fri, 4 May 2012 17:38:55 +0000
Subject: NO-JIRA: JCA Cleanup     *Renamed module.name in JCA project to be in
 line with directory     *Removed hack in build.deps to satisfy system tests
 and jca compile     time dependencies     *Added Apache Geronimo servlet jar
 for JCA examples

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

(limited to 'java/jca')

diff --git a/java/jca/build.xml b/java/jca/build.xml
index 3430232003..abb18e1a21 100644
--- a/java/jca/build.xml
+++ b/java/jca/build.xml
@@ -18,18 +18,20 @@
  - under the License.
  -
  -->
-<project name="Qpid JCA RA" default="build">
+<project name="Qpid JCA" default="build">
 
   <property name="module.depends" value="common client"/>
-  <property name="module.name" value="ra"/>
+  <property name="module.name" value="jca"/>
 
   <import file="../module.xml"/>
 
-  <property name="module.rar" value="${build.lib}/${project.name}-${module.name}-${project.version}.rar"/>
-  <property name="module.resources" value="src/main/resources"/>
+  <property name="module.rar" value="${build.lib}/${project.name}-ra-${project.version}.rar"/>
 
+  <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"/>
     <jar destfile="${module.rar}">
       <fileset dir="${module.resources}">
         <include name="**/*.xml"/>
-- 
cgit v1.2.1