From 5e09be7cc6ed2de1be4db0f8d345e0e4685ba801 Mon Sep 17 00:00:00 2001
From: "Weston M. Price" <wprice@apache.org>
Date: Tue, 17 Apr 2012 21:38:29 +0000
Subject: QPID-3701     -Add support for Glassfish 3.1.1 AS     -Add necessary
 configuration files for Glassfish support     -Reworked JNDI naming
 conventions to be consistent across all     supported app servers     -Fixed
 NPE in QpidConnectionFactoryProxy     -Added necessary documentation files
 for Glassfish support

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1327294 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/jca/example/build-geronimo-properties.xml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 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 7c5bd33cb0..02ecb53134 100644
--- a/qpid/java/jca/example/build-geronimo-properties.xml
+++ b/qpid/java/jca/example/build-geronimo-properties.xml
@@ -22,10 +22,19 @@
 
     <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="jndi.prefix" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/"/>
+
+
+    <property name="qpid.hello.queue.jndi.name" value="HelloQueue"/>
+    <property name="qpid.goodbye.queue.jndi.name" value="GoodByeQueue"/>
+    <property name="qpid.hello.topic.jndi.name" value="HelloTopic"/>
+    <property name="qpid.goodbye.topic.jndi.name" value="GoodByeTopic"/>
+    <property name="qpid.request.queue.jndi.name" value="RequestQueue"/>
+    <property name="qpid.response.queue.jndi.name" value="ResponseQueue"/>
+
+    <!--
     <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"/>
@@ -33,9 +42,11 @@
     <property name="qpid.goodbye.topic.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/GoodByeTopic"/>
     <property name="qpid.request.queue.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/RequestQueue"/>
     <property name="qpid.response.queue.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/ResponseQueue"/>
-
+    -->
     <property name="qpid.ejb.jndi.name" value="name=&quot;QpidTestEJB&quot;"/>
     <property name="qpid.ejb.name" value="QpidTestBeanRemote"/>
+    <property name="qpid.client.cf.jndi.name" value="${jndi.prefix}/QpidConnectionFactory"/>
+    <property name="qpid.client.dest.jndi.name" value="${jndi.prefix}/${qpid.hello.queue.jndi.name}"/>
 
     <property name="jndi.context" value="org.openejb.client.RemoteInitialContextFactory"/>
     <property name="server.host" value="ejbd://localhost:4201"/>
-- 
cgit v1.2.1