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

5 files changed, 181 insertions, 9 deletions

diff --git a/qpid/java/jca/example/conf/geronimo-application.xml b/qpid/java/jca/example/conf/geronimo-application.xml
index a855e0fae8..384f6b2e75 100644
--- a/qpid/java/jca/example/conf/geronimo-application.xml
+++ b/qpid/java/jca/example/conf/geronimo-application.xml
@@ -21,7 +21,7 @@
  -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+    xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2"
     application-name="QpidJCAExampleApplication">
 
     <sys:environment>
diff --git a/qpid/java/jca/example/conf/geronimo-ra.xml b/qpid/java/jca/example/conf/geronimo-ra.xml
index 926c73baf1..a7511f647f 100644
--- a/qpid/java/jca/example/conf/geronimo-ra.xml
+++ b/qpid/java/jca/example/conf/geronimo-ra.xml
@@ -74,7 +74,7 @@
       <adminobject-interface>org.apache.qpid.ra.admin.QpidTopic</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidTopicImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>HelloTopic</message-destination-name>
+          <message-destination-name>HelloTopic</message-destination-name>
          <config-property-setting name="DestinationAddress">@qpid.hello.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
@@ -82,23 +82,25 @@
       <adminobject-interface>org.apache.qpid.ra.admin.QpidTopic</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidTopicImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>GoodByeTopic</message-destination-name>
+          <message-destination-name>GoodByeTopic</message-destination-name>
          <config-property-setting name="DestinationAddress">@qpid.goodbye.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
+    <!--
     <adminobject>
       <adminobject-interface>org.apache.qpid.ra.admin.QpidTopic</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidTopicImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>HelloGoodByeTopic</message-destination-name>
+          <message-destination-name>jms/HelloGoodByeTopic</message-destination-name>
          <config-property-setting name="DestinationAddress">@qpid.hellogoodbye.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
+    -->
     <adminobject>
       <adminobject-interface>org.apache.qpid.ra.admin.QpidQueue</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidQueueImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>HelloQueue</message-destination-name>
+          <message-destination-name>HelloQueue</message-destination-name>
          <config-property-setting name="DestinationAddress">@qpid.hello.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
@@ -106,7 +108,7 @@
       <adminobject-interface>org.apache.qpid.ra.admin.QpidQueue</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidQueueImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>GoodByeQueue</message-destination-name>
+          <message-destination-name>GoodByeQueue</message-destination-name>
          <config-property-setting name="DestinationAddress">@qpid.goodbye.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
@@ -114,7 +116,7 @@
       <adminobject-interface>org.apache.qpid.ra.admin.QpidQueue</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidQueueImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>RequestQueue</message-destination-name>
+          <message-destination-name>RequestQueue</message-destination-name>
          <config-property-setting name="DestinationAddress">@qpid.request.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
@@ -122,7 +124,7 @@
       <adminobject-interface>org.apache.qpid.ra.admin.QpidQueue</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidQueueImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>ResponseQueue</message-destination-name>
+          <message-destination-name>ResponseQueue</message-destination-name>
          <config-property-setting name="DestinationAddress">@qpid.response.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
@@ -130,7 +132,7 @@
       <adminobject-interface>javax.jms.ConnectionFactory</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidConnectionFactoryProxy</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>QpidConnectionFactory</message-destination-name>
+          <message-destination-name>QpidConnectionFactory</message-destination-name>
          <config-property-setting name="ConnectionURL">@broker.url@</config-property-setting>
       </adminobject-instance>
     </adminobject>
diff --git a/qpid/java/jca/example/conf/glassfish-ejb-jar.xml b/qpid/java/jca/example/conf/glassfish-ejb-jar.xml
new file mode 100644
index 0000000000..e3ea140472
--- /dev/null
+++ b/qpid/java/jca/example/conf/glassfish-ejb-jar.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glassfish-ejb-jar PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 EJB 3.1//EN" "http://glassfish.org/dtds/glassfish-ejb-jar_3_1-1.dtd">
+<glassfish-ejb-jar>
+   <enterprise-beans>
+   <ejb>
+     <ejb-name>QpidHelloListenerBean</ejb-name>
+     <jndi-name>HelloQueue</jndi-name>
+     <mdb-resource-adapter>
+        <resource-adapter-mid>qpid-ra-@rar.ver@</resource-adapter-mid>
+     </mdb-resource-adapter>
+     <resource-ref>
+       <res-ref-name>QpidJMSXA</res-ref-name>
+       <jndi-name>QpidJMSXA</jndi-name>
+     </resource-ref>
+   </ejb>
+   <ejb>
+     <ejb-name>QpidGoodByeListenerBean</ejb-name>
+     <jndi-name>GoodByeQueue</jndi-name>
+     <mdb-resource-adapter>
+        <resource-adapter-mid>qpid-ra-@rar.ver@</resource-adapter-mid>
+     </mdb-resource-adapter>
+     <resource-ref>
+       <res-ref-name>QpidJMSXA</res-ref-name>
+       <jndi-name>QpidJMSXA</jndi-name>
+     </resource-ref>
+   </ejb>
+   <ejb>
+     <ejb-name>QpidHelloSubscriberBean</ejb-name>
+     <jndi-name>HelloTopic</jndi-name>
+     <mdb-resource-adapter>
+        <resource-adapter-mid>qpid-ra-@rar.ver@</resource-adapter-mid>
+     </mdb-resource-adapter>
+     <resource-ref>
+       <res-ref-name>QpidJMSXA</res-ref-name>
+       <jndi-name>QpidJMSXA</jndi-name>
+     </resource-ref>
+   </ejb>
+   <ejb>
+     <ejb-name>QpidGoodByeSubscriberBean</ejb-name>
+     <jndi-name>GoodByeTopic</jndi-name>
+     <mdb-resource-adapter>
+        <resource-adapter-mid>qpid-ra-@rar.ver@</resource-adapter-mid>
+     </mdb-resource-adapter>
+     <resource-ref>
+       <res-ref-name>QpidJMSXA</res-ref-name>
+       <jndi-name>QpidJMSXA</jndi-name>
+     </resource-ref>
+   </ejb>
+   <ejb>
+     <ejb-name>QpidJMSResponderBean</ejb-name>
+     <jndi-name>QpidResponderQueue</jndi-name>
+     <mdb-resource-adapter>
+        <resource-adapter-mid>qpid-ra-@rar.ver@</resource-adapter-mid>
+     </mdb-resource-adapter>
+     <resource-ref>
+       <res-ref-name>QpidJMSXA</res-ref-name>
+       <jndi-name>QpidJMSXA</jndi-name>
+     </resource-ref>
+   </ejb>
+   <ejb>
+     <ejb-name>QpidTestBean</ejb-name>
+     <jndi-name>QpidTestBean</jndi-name>
+     <resource-ref>
+       <res-ref-name>QpidJMSXA</res-ref-name>
+       <jndi-name>QpidJMSXA</jndi-name>
+     </resource-ref>
+   </ejb>
+   </enterprise-beans>
+</glassfish-ejb-jar>
+
diff --git a/qpid/java/jca/example/conf/glassfish-resources.xml b/qpid/java/jca/example/conf/glassfish-resources.xml
new file mode 100644
index 0000000000..9eab4302d5
--- /dev/null
+++ b/qpid/java/jca/example/conf/glassfish-resources.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE resources PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Resource Definitions//EN" "http://glassfish.org/dtds/glassfish-resources_1_5.dtd">
+<resources>
+
+
+    <resource-adapter-config name="QpidResourceAdapter" resource-adapter-name="qpid-ra-@rar.ver@" thread-pool-ids="thread-pool-1">
+       <property name="TransactionManagerLocatorClass" value="org.apache.qpid.ra.tm.GlassfishTransactionManagerLocator"/>
+       <property name="TransactionManagerLocatorMethod" value="getTm"/>
+    </resource-adapter-config>
+
+    <!--XAConnectionFactory-->
+    <connector-connection-pool
+        name="QpidJMSXAPool"
+        resource-adapter-name="qpid-ra-@rar.ver@"
+        connection-definition-name="org.apache.qpid.ra.QpidRAConnectionFactory"
+        transaction-support="XATransaction"
+        ping="true">
+        <property name="connectionURL" value="@broker.url@"/>
+        <property name="SessionDefaultType" value="javax.jms.Queue"/>
+   </connector-connection-pool>
+
+    <connector-resource jndi-name="QpidJMSXA" pool-name="QpidJMSXAPool"/>
+
+    <!--LocalTransaction ConnectionFactory
+    <connector-connection-pool
+        name="QpidJMSPool"
+        resource-adapter-name="qpid-ra-@rar.ver@"
+        connection-definition-name="org.apache.qpid.ra.QpidRAConnectionFactory"
+        transaction-support="LocalTransaction"
+        ping="true">
+        <property name="connectionURL" value="@broker.url@"/>
+        <property name="SessionDefaultType" value="javax.jms.Queue"/>
+        <property name="UseLocalTx" value="true"/>
+    </connector-connection-pool>
+
+
+    <connector-resource jndi-name="QpidJMS" pool-name="QpidJMSPool"/>
+
+    -->
+    <!--Destinations-->
+    <admin-object-resource jndi-name="HelloQueue" res-adapter="qpid-ra-@rar.ver@" res-type="org.apache.qpid.ra.admin.QpidQueue" class-name="org.apache.qpid.ra.admin.QpidQueueImpl">
+        <property name="DestinationAddress" value="@qpid.hello.queue.dest.address@"/>
+    </admin-object-resource>
+
+    <admin-object-resource jndi-name="GoodByeQueue" res-adapter="qpid-ra-@rar.ver@" res-type="org.apache.qpid.ra.admin.QpidQueue" class-name="org.apache.qpid.ra.admin.QpidQueueImpl">
+        <property name="DestinationAddress" value="@qpid.goodbye.queue.dest.address@"/>
+    </admin-object-resource>
+
+    <admin-object-resource jndi-name="HelloTopic" res-adapter="qpid-ra-@rar.ver@" res-type="org.apache.qpid.ra.admin.QpidTopic" class-name="org.apache.qpid.ra.admin.QpidTopicImpl">
+        <property name="DestinationAddress" value="@qpid.hello.topic.dest.address@"/>
+    </admin-object-resource>
+
+    <admin-object-resource jndi-name="GoodByeTopic" res-adapter="qpid-ra-@rar.ver@" res-type="org.apache.qpid.ra.admin.QpidTopic" class-name="org.apache.qpid.ra.admin.QpidTopicImpl">
+        <property name="DestinationAddress" value="@qpid.goodbye.topic.dest.address@"/>
+    </admin-object-resource>
+
+    <!--
+    <admin-object-resource jndi-name="HelloGoodByeTopic" res-adapter="qpid-ra-@rar.ver@" res-type="org.apache.qpid.ra.admin.QpidTopic" class-name="org.apache.qpid.ra.admin.QpidTopicImpl">
+        <property name="DestinationAddress" value="@qpid.hellogoodbye.topic.dest.address@"/>
+    </admin-object-resource>
+    -->
+    <admin-object-resource jndi-name="QpidRequestQueue" res-adapter="qpid-ra-@rar.ver@" res-type="org.apache.qpid.ra.admin.QpidQueue" class-name="org.apache.qpid.ra.admin.QpidQueueImpl">
+        <property name="DestinationAddress" value="@qpid.request.queue.dest.address@"/>
+    </admin-object-resource>
+
+    <admin-object-resource jndi-name="QpidResponseQueue" res-adapter="qpid-ra-@rar.ver@" res-type="org.apache.qpid.ra.admin.QpidQueue" class-name="org.apache.qpid.ra.admin.QpidQueueImpl">
+        <property name="DestinationAddress" value="@qpid.response.queue.dest.address@"/>
+    </admin-object-resource>
+
+    <admin-object-resource jndi-name="QpidConnectionFactory" res-adapter="qpid-ra-@rar.ver@" res-type="javax.jms.ConnectionFactory" class-name="org.apache.qpid.ra.admin.QpidConnectionFactoryProxy">
+        <property name="ConnectionURL" value="@broker.url@"/>
+    </admin-object-resource>
+
+</resources>
diff --git a/qpid/java/jca/example/conf/glassfish-web.xml b/qpid/java/jca/example/conf/glassfish-web.xml
new file mode 100644
index 0000000000..950ee73d51
--- /dev/null
+++ b/qpid/java/jca/example/conf/glassfish-web.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
+<glassfish-web-app>
+
+    <context-root>qpid-jca-web</context-root>
+
+    <ejb-ref>
+        <ejb-ref-name>QpidTestBean</ejb-ref-name>
+        <jndi-name>QpidTestBean</jndi-name>
+    </ejb-ref>
+
+    <resource-ref>
+      <res-ref-name>QpidJMSXA</res-ref-name>
+      <jndi-name>QpidJMSXA</jndi-name>
+    </resource-ref>
+    <resource-env-ref>
+      <res-env-ref-name>HelloQueue</res-env-ref-name>
+      <jndi-name>HelloQueue</jndi-name>
+    </resource-env-ref>
+    <resource-ref>
+      <res-ref-name>HelloTopic</res-ref-name>
+      <jndi-name>HelloTopic</jndi-name>
+    </resource-ref>
+
+
+</glassfish-web-app>