From 0dcfedb9a055a5ec9175a13cdce8667104cd799a Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Wed, 1 Feb 2012 23:56:28 +0000
Subject: QPID-3734 Commiting patch by Weston Price.

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

(limited to 'qpid/java/jca/example/build-geronimo-properties.xml')

diff --git a/qpid/java/jca/example/build-geronimo-properties.xml b/qpid/java/jca/example/build-geronimo-properties.xml
index 79cf5adc74..2251b7a2df 100644
--- a/qpid/java/jca/example/build-geronimo-properties.xml
+++ b/qpid/java/jca/example/build-geronimo-properties.xml
@@ -20,8 +20,12 @@
  -->
 <project name="qpid-jca-example-geronimo-properties" basedir="." default="">
 
-    <property name="geronimo.jndi.scheme" value="name"/>
+    <property name="jndi.scheme" value="name"/>
+
+    <!--
     <property name="qpid.xacf.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAManagedConnectionFactory/QpidJMSXA"/>
+    -->
+    <property name="qpid.xacf.jndi.name" value="QpidJMSXA"/>
     <property name="qpid.cf.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/QpidConnectionFactory"/>
     <property name="qpid.hello.queue.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/HelloQueue"/>
     <property name="qpid.goodbye.queue.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/GoodByeQueue"/>
@@ -64,16 +68,25 @@
     <property name="geronimo.rar.plan" value="${gen.dir}/geronimo-ra.xml"/>
     <property name="geronimo.ear.plan" value="${gen.dir}/geronimo-application.xml"/>
 
+    <available file="${geronimo.home}/bin/deploy" value="deploy" property="geronimo.deploy.exec"/>
+    <property name="geronimo.deploy.exec" value="deploy.sh"/>
+
     <path id="compile.classpath">
         <fileset dir="${geronimo.home}/repository/org/apache/geronimo/specs">
             <include name="geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar"/>
             <include name="geronimo-servlet_2.5_spec/1.2/geronimo-servlet_2.5_spec-1.2.jar"/>
             <include name="geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar"/>
             <include name="geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar"/>
+
+            <!--Geronimo 3.x-->
+            <include name="geronimo-servlet_3.0_spec/1.0/geronimo-servlet_3.0_spec-1.0.jar"/>
+            <include name="geronimo-ejb_3.1_spec/1.0.2/geronimo-ejb_3.1_spec-1.0.2.jar"/>
         </fileset>
-        <fileset dir="${geronimo.home}/lib/">
+
+        <fileset dir="${qpid.jca.dir}">
             <include name="slf4j-api-*.jar"/>
         </fileset>
+
     </path>
 
     <path id="run.classpath">
@@ -119,7 +132,7 @@
         <attribute name="module"/>
         <attribute name="plan" default=""/>
         <sequential>
-            <exec executable="${geronimo.home}/bin/deploy.sh">
+            <exec executable="${geronimo.home}/bin/${geronimo.deploy.exec}">
                 <arg line="-u @{user} -p @{password} @{action} @{module} @{plan}"/>
             </exec>
         </sequential>
-- 
cgit v1.2.1