QPID-3734 Commiting patch by Weston Price.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239411 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 20 insertions, 131 deletions

diff --git a/qpid/java/jca/example/conf/ejb-jar.xml b/qpid/java/jca/example/conf/ejb-jar.xml
index 2f513bd3f8..a1aa859d96 100644
--- a/qpid/java/jca/example/conf/ejb-jar.xml
+++ b/qpid/java/jca/example/conf/ejb-jar.xml
@@ -27,40 +27,13 @@
     <enterprise-beans>
         <message-driven>
             <ejb-name>QpidHelloListenerBean</ejb-name>
-            <resource-ref>
-                <res-ref-name>QpidJMSXA</res-ref-name>
-                <res-type>javax.jms.ConnectionFactory</res-type>
-                <res-auth>Container</res-auth>
-                <res-sharing-scope>Shareable</res-sharing-scope>
-            </resource-ref>
         </message-driven>
         <message-driven>
             <ejb-name>QpidHelloSubscriberBean</ejb-name>
-            <resource-ref>
-                <res-ref-name>QpidJMSXA</res-ref-name>
-                <res-type>javax.jms.ConnectionFactory</res-type>
-                <res-auth>Container</res-auth>
-                <res-sharing-scope>Shareable</res-sharing-scope>
-            </resource-ref>
         </message-driven>
         <message-driven>
             <ejb-name>QpidJMSResponderBean</ejb-name>
-            <resource-ref>
-                <res-ref-name>QpidJMSXA</res-ref-name>
-                <res-type>javax.jms.ConnectionFactory</res-type>
-                <res-auth>Container</res-auth>
-                <res-sharing-scope>Shareable</res-sharing-scope>
-            </resource-ref>
         </message-driven>
-        <session>
-            <ejb-name>QpidTestBean</ejb-name>
-            <resource-ref>
-                <res-ref-name>QpidJMSXA</res-ref-name>
-                <res-type>javax.jms.ConnectionFactory</res-type>
-                <res-auth>Container</res-auth>
-                <res-sharing-scope>Shareable</res-sharing-scope>
-            </resource-ref>
-        </session>
     </enterprise-beans>
 
 
diff --git a/qpid/java/jca/example/conf/geronimo-application.xml b/qpid/java/jca/example/conf/geronimo-application.xml
index 832496e76f..a855e0fae8 100644
--- a/qpid/java/jca/example/conf/geronimo-application.xml
+++ b/qpid/java/jca/example/conf/geronimo-application.xml
@@ -58,15 +58,6 @@
 
             <context-root>/qpid-jca-web</context-root>
 
-            <naming:ejb-local-ref>
-              <naming:ref-name>QpidTestBean</naming:ref-name>
-              <naming:ejb-link>QpidTestBean</naming:ejb-link>
-            </naming:ejb-local-ref>
-
-            <naming:resource-ref>
-                <naming:ref-name>QpidJMSXA</naming:ref-name>
-                <naming:resource-link>QpidJMSXA</naming:resource-link>
-            </naming:resource-ref>
         </web-app>
     </module>
 
@@ -91,8 +82,6 @@
                         <sys:type>rar</sys:type>
                     </sys:dependency>
                 </sys:dependencies>
-                <sys:hidden-classes/>
-                <sys:non-overridable-classes/>
             </sys:environment>
 
             <enterprise-beans>
@@ -101,10 +90,6 @@
                     <resource-adapter>
                         <resource-link>QpidResourceAdapter</resource-link>
                     </resource-adapter>
-                      <naming:resource-ref>
-                        <naming:ref-name>QpidJMSXA</naming:ref-name>
-                        <naming:resource-link>QpidJMSXA</naming:resource-link>
-                    </naming:resource-ref>
                 </message-driven>
                 <message-driven>
                     <ejb-name>QpidGoodByeListenerBean</ejb-name>
@@ -117,10 +102,6 @@
                     <resource-adapter>
                         <resource-link>QpidResourceAdapter</resource-link>
                     </resource-adapter>
-                      <naming:resource-ref>
-                        <naming:ref-name>QpidJMSXA</naming:ref-name>
-                        <naming:resource-link>QpidJMSXA</naming:resource-link>
-                    </naming:resource-ref>
                 </message-driven>
                 <message-driven>
                     <ejb-name>QpidGoodByeSubscriberBean</ejb-name>
@@ -133,18 +114,7 @@
                     <resource-adapter>
                         <resource-link>QpidResourceAdapter</resource-link>
                     </resource-adapter>
-                      <naming:resource-ref>
-                        <naming:ref-name>QpidJMSXA</naming:ref-name>
-                        <naming:resource-link>QpidJMSXA</naming:resource-link>
-                    </naming:resource-ref>
                 </message-driven>
-                <session>
-                    <ejb-name>QpidTestBean</ejb-name>
-                      <naming:resource-ref>
-                        <naming:ref-name>QpidJMSXA</naming:ref-name>
-                        <naming:resource-link>QpidJMSXA</naming:resource-link>
-                    </naming:resource-ref>
-                </session>
             </enterprise-beans>
         </openejb-jar>
     </module>
diff --git a/qpid/java/jca/example/conf/geronimo-ra.xml b/qpid/java/jca/example/conf/geronimo-ra.xml
index 2943ac0a58..e3e74ebc62 100644
--- a/qpid/java/jca/example/conf/geronimo-ra.xml
+++ b/qpid/java/jca/example/conf/geronimo-ra.xml
@@ -63,65 +63,58 @@
     <!-- Note, do not remove this admin object. There appears to be a bug in Geronimo's deployer that does not correctly create JNDI references
          if an extra admin object is not present -->
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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>Dummy</message-destination-name>
-         <config-property-setting name="destinationType">TOPIC</config-property-setting>
          <config-property-setting name="destinationAddress">amq.topic</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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>
-         <config-property-setting name="destinationType">TOPIC</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.hello.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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>
-         <config-property-setting name="destinationType">TOPIC</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.goodbye.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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>
-         <config-property-setting name="destinationType">TOPIC</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.hellogoodbye.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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>
-         <config-property-setting name="destinationType">QUEUE</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.hello.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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>
-         <config-property-setting name="destinationType">QUEUE</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.goodbye.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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>ResponderQueue</message-destination-name>
-         <config-property-setting name="destinationType">QUEUE</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.responder.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
diff --git a/qpid/java/jca/example/conf/jboss.xml b/qpid/java/jca/example/conf/jboss.xml
index 8b62ca73b0..0f22797789 100644
--- a/qpid/java/jca/example/conf/jboss.xml
+++ b/qpid/java/jca/example/conf/jboss.xml
@@ -30,11 +30,6 @@
         <message-driven>
            <ejb-name>QpidHelloListenerBean</ejb-name>
            <resource-adapter-name>@rar.name@</resource-adapter-name>
-            <resource-ref>
-                <res-ref-name>QpidJMSXA</res-ref-name>
-                <res-type>javax.sql.DataSource</res-type>
-                <jndi-name>java:/QpidJMSXA</jndi-name>
-            </resource-ref>
         </message-driven>
         <message-driven>
            <ejb-name>QpidGoodByeListenerBean</ejb-name>
@@ -43,38 +38,15 @@
         <message-driven>
            <ejb-name>QpidHelloSubscriberBean</ejb-name>
            <resource-adapter-name>@rar.name@</resource-adapter-name>
-            <resource-ref>
-                <res-ref-name>QpidJMSXA</res-ref-name>
-                <res-type>javax.sql.DataSource</res-type>
-                <jndi-name>java:/QpidJMSXA</jndi-name>
-            </resource-ref>
         </message-driven>
         <message-driven>
            <ejb-name>QpidGoodByeSubscriberBean</ejb-name>
            <resource-adapter-name>@rar.name@</resource-adapter-name>
-            <resource-ref>
-                <res-ref-name>QpidJMSXA</res-ref-name>
-                <res-type>javax.sql.DataSource</res-type>
-                <jndi-name>java:/QpidJMSXA</jndi-name>
-            </resource-ref>
         </message-driven>
         <message-driven>
            <ejb-name>QpidJMSResponderBean</ejb-name>
            <resource-adapter-name>@rar.name@</resource-adapter-name>
-            <resource-ref>
-                <res-ref-name>QpidJMSXA</res-ref-name>
-                <res-type>javax.sql.DataSource</res-type>
-                <jndi-name>java:/QpidJMSXA</jndi-name>
-            </resource-ref>
         </message-driven>
-        <session>
-            <ejb-name>QpidTestBean</ejb-name>
-            <resource-ref>
-                <res-ref-name>QpidJMSXA</res-ref-name>
-                <res-type>javax.sql.DataSource</res-type>
-                <jndi-name>java:/QpidJMSXA</jndi-name>
-            </resource-ref>
-        </session>
     </enterprise-beans>
 
 </jboss>
diff --git a/qpid/java/jca/example/conf/qpid-jca-ds.xml b/qpid/java/jca/example/conf/qpid-jca-ds.xml
index 9e589169e3..80fb828b55 100644
--- a/qpid/java/jca/example/conf/qpid-jca-ds.xml
+++ b/qpid/java/jca/example/conf/qpid-jca-ds.xml
@@ -25,9 +25,8 @@
          name="qpid.jca:name=HelloTopic">
      <attribute name="JNDIName">HelloTopic</attribute>
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
-     <attribute name="Type">javax.jms.Destination</attribute>
+     <attribute name="Type">org.apache.qpid.ra.admin.QpidTopic</attribute>
      <attribute name="Properties">
-        destinationType=TOPIC
         destinationAddress=@qpid.hello.topic.dest.address@
      </attribute>
   </mbean>
@@ -36,9 +35,8 @@
          name="qpid.jca:name=GoodByeTopic">
      <attribute name="JNDIName">GoodByeTopic</attribute>
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
-     <attribute name="Type">javax.jms.Destination</attribute>
+     <attribute name="Type">org.apache.qpid.ra.admin.QpidTopic</attribute>
      <attribute name="Properties">
-        destinationType=TOPIC
         destinationAddress=@qpid.goodbye.topic.dest.address@
      </attribute>
   </mbean>
@@ -47,9 +45,8 @@
          name="qpid.jca:name=HelloGoodByeTopic">
      <attribute name="JNDIName">HelloGoodByeTopic</attribute>
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
-     <attribute name="Type">javax.jms.Destination</attribute>
+     <attribute name="Type">org.apache.qpid.ra.admin.QpidTopic</attribute>
      <attribute name="Properties">
-        destinationType=TOPIC
         destinationAddress=@qpid.hellogoodbye.topic.dest.address@
      </attribute>
   </mbean>
@@ -58,9 +55,8 @@
          name="qpid.jca:name=HelloQueue">
      <attribute name="JNDIName">HelloQueue</attribute>
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
-     <attribute name="Type">javax.jms.Destination</attribute>
+     <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue</attribute>
      <attribute name="Properties">
-        destinationType=QUEUE
         destinationAddress=@qpid.hello.queue.dest.address@
      </attribute>
   </mbean>
@@ -69,9 +65,8 @@
          name="qpid.jca:name=GoodByeQueue">
      <attribute name="JNDIName">GoodByeQueue</attribute>
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
-     <attribute name="Type">javax.jms.Destination</attribute>
+     <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue</attribute>
      <attribute name="Properties">
-        destinationType=QUEUE
         destinationAddress=@qpid.goodbye.queue.dest.address@
      </attribute>
   </mbean>
@@ -80,9 +75,8 @@
          name="qpid.jca:name=QpidResponderQueue">
      <attribute name="JNDIName">QpidResponderQueue</attribute>
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
-     <attribute name="Type">javax.jms.Destination</attribute>
+     <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue</attribute>
      <attribute name="Properties">
-        destinationType=QUEUE
         destinationAddress=@qpid.responder.queue.dest.address@
      </attribute>
   </mbean>
diff --git a/qpid/java/jca/example/conf/web.xml b/qpid/java/jca/example/conf/web.xml
index 509612dc90..d87c578606 100644
--- a/qpid/java/jca/example/conf/web.xml
+++ b/qpid/java/jca/example/conf/web.xml
@@ -22,19 +22,6 @@
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
-    <resource-ref>
-        <res-ref-name>QpidJMSXA</res-ref-name>
-        <res-type>javax.jms.ConnectionFactory</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-
-    <ejb-local-ref>
-        <ejb-ref-name>QpidTestBean</ejb-ref-name>
-        <ejb-ref-type>Session</ejb-ref-type>
-        <local>org.apache.qpid.jca.example.ejb.QpidTestLocal</local>
-    </ejb-local-ref>
-
     <servlet>
         <display-name>QpidTestServlet</display-name>
         <servlet-name>QpidTestServlet</servlet-name>