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.xml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

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

diff --git a/qpid/java/jca/example/build.xml b/qpid/java/jca/example/build.xml
index ab70ee45fc..60b7f7a0d1 100644
--- a/qpid/java/jca/example/build.xml
+++ b/qpid/java/jca/example/build.xml
@@ -27,7 +27,7 @@
     <property name="qpid.dest_syntax" value="ADDR"/>
 
     <!-- Properties controlling running sample standalone client -->
-    <property name="client.use.ejb" value="true"/> <!-- uses JNDI/JMS or JNDI/RMI -->
+    <property name="client.use.ejb" value="false"/> <!-- uses JNDI/JMS or JNDI/RMI -->
     <property name="client.message" value="Hello Qpid World"/>
     <property name="client.message.count" value="1"/>
     <property name="client.use.topic" value="false"/> <!-- Use topic/queue -->
@@ -72,7 +72,6 @@
                 <filter token="rar.name" value="${rar.name}"/>
                 <filter token="ejb.name" value="${ejb.name}"/>
                 <filter token="war.name" value="${war.name}"/>
-
                 <filter token="broker.url" value="${broker.url}"/>
 
                 <filter token="qpid.hello.topic.dest.address" value="${qpid.hello.topic.dest.address}"/>
@@ -92,12 +91,14 @@
                 <filter token="rar.name" value="${rar.name}"/>
                 <filter token="broker.url" value="${broker.url}"/>
                 <filter token="jndi.scheme" value="${jndi.scheme}"/>
+                <filter token="jndi.prefix" value="${jndi.prefix}"/>
                 <filter token="qpid.xacf.jndi.name" value="${qpid.xacf.jndi.name}"/>
                 <filter token="qpid.hello.topic.jndi.name" value="${qpid.hello.topic.jndi.name}"/>
                 <filter token="qpid.goodbye.topic.jndi.name" value="${qpid.goodbye.topic.jndi.name}"/>
                 <filter token="qpid.hello.queue.jndi.name" value="${qpid.hello.queue.jndi.name}"/>
                 <filter token="qpid.goodbye.queue.jndi.name" value="${qpid.goodbye.queue.jndi.name}"/>
                 <filter token="qpid.request.queue.jndi.name" value="${qpid.request.queue.jndi.name}"/>
+                <filter token="qpid.response.queue.jndi.name" value="${qpid.response.queue.jndi.name}"/>
                 <filter token="qpid.ejb.jndi.name" value="${qpid.ejb.jndi.name}"/>
             </filterset>
         </copy>
@@ -112,6 +113,9 @@
             <classes dir="${build.classes.dir}">
                 <include name="org/apache/qpid/jca/example/web/**"/>
             </classes>
+            <metainf dir="${gen.dir}">
+                <include name="glassfish-web.xml"/>
+            </metainf>
         </war>
     </target>
 
@@ -120,6 +124,7 @@
             <include name="org/apache/qpid/jca/example/ejb/**/*.class"/>
             <metainf dir="${gen.dir}">
                 <include name="jboss.xml"/>
+                <include name="glassfish-ejb-jar.xml"/>
             </metainf>
         </jar>
     </target>
@@ -143,9 +148,9 @@
             <sysproperty key="java.naming.factory.initial" value="${jndi.context}"/>
             <sysproperty key="java.naming.provider.url" value="${server.host}"/>
             <sysproperty key="qpid.ejb.name" value="${qpid.ejb.name}"/>
-            <sysproperty key="qpid.cf.name" value="${qpid.cf.jndi.name}"/>
+            <sysproperty key="qpid.cf.name" value="${qpid.client.cf.jndi.name}"/>
+            <sysproperty key="qpid.dest.name" value="${qpid.client.dest.jndi.name}"/>
             <sysproperty key="qpid.dest_syntax" value="${qpid.dest_syntax}"/>
-            <sysproperty key="qpid.dest.name" value="${qpid.hello.queue.jndi.name}"/>
             <sysproperty key="log4j.configuration" value="file://${conf.dir}/log4j.properties"/>
 
             <sysproperty key="qpid.message" value="${client.message}"/>
@@ -167,8 +172,8 @@
             <sysproperty key="qpid.message" value="Hello, World"/>
             <sysproperty key="message.count" value="1"/>
             <sysproperty key="thread.count" value="5"/>
-            <sysproperty key="qpid.cf.name" value="${qpid.cf.jndi.name}"/>
-            <sysproperty key="qpid.dest.name" value="${qpid.responder.queue.jndi.name}"/>
+            <sysproperty key="qpid.cf.name" value="${qpid.client.cf.jndi.name}"/>
+            <sysproperty key="qpid.dest.name" value="${qpid.client.dest.jndi.name}"/>
             <sysproperty key="log4j.configuration" value="file://${conf.dir}/log4j.properties"/>
             <sysproperty key="qpid.dest_syntax" value="${qpid.dest_syntax}"/>
         </java>
-- 
cgit v1.2.1