QPID-3858: Updated branch - merged from trunk r.1333987

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

11 files changed, 682 insertions, 25 deletions

diff --git a/java/jca/example/conf/geronimo-application.xml b/java/jca/example/conf/geronimo-application.xml
index a855e0fae8..384f6b2e75 100644
--- a/java/jca/example/conf/geronimo-application.xml
+++ b/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/java/jca/example/conf/geronimo-ra.xml b/java/jca/example/conf/geronimo-ra.xml
index e3e74ebc62..a7511f647f 100644
--- a/java/jca/example/conf/geronimo-ra.xml
+++ b/java/jca/example/conf/geronimo-ra.xml
@@ -67,63 +67,73 @@
       <adminobject-class>org.apache.qpid.ra.admin.QpidTopicImpl</adminobject-class>
       <adminobject-instance>
          <message-destination-name>Dummy</message-destination-name>
-         <config-property-setting name="destinationAddress">amq.topic</config-property-setting>
+         <config-property-setting name="DestinationAddress">amq.topic</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>HelloTopic</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.hello.topic.dest.address@</config-property-setting>
+          <message-destination-name>HelloTopic</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.hello.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>GoodByeTopic</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.goodbye.topic.dest.address@</config-property-setting>
+          <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>
-         <config-property-setting name="destinationAddress">@qpid.hellogoodbye.topic.dest.address@</config-property-setting>
+          <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>
-         <config-property-setting name="destinationAddress">@qpid.hello.queue.dest.address@</config-property-setting>
+          <message-destination-name>HelloQueue</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.hello.queue.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>GoodByeQueue</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.goodbye.queue.dest.address@</config-property-setting>
+          <message-destination-name>GoodByeQueue</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.goodbye.queue.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>ResponderQueue</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.responder.queue.dest.address@</config-property-setting>
+          <message-destination-name>RequestQueue</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.request.queue.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>ResponseQueue</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.response.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
       <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>
-         <config-property-setting name="connectionURL">@broker.url@</config-property-setting>
+          <message-destination-name>QpidConnectionFactory</message-destination-name>
+         <config-property-setting name="ConnectionURL">@broker.url@</config-property-setting>
       </adminobject-instance>
     </adminobject>
   </resourceadapter>
diff --git a/java/jca/example/conf/glassfish-ejb-jar.xml b/java/jca/example/conf/glassfish-ejb-jar.xml
new file mode 100644
index 0000000000..e3ea140472
--- /dev/null
+++ b/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/java/jca/example/conf/glassfish-resources.xml b/java/jca/example/conf/glassfish-resources.xml
new file mode 100644
index 0000000000..9eab4302d5
--- /dev/null
+++ b/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/java/jca/example/conf/glassfish-web.xml b/java/jca/example/conf/glassfish-web.xml
new file mode 100644
index 0000000000..950ee73d51
--- /dev/null
+++ b/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>
diff --git a/java/jca/example/conf/jboss-ejb-client.properties b/java/jca/example/conf/jboss-ejb-client.properties
new file mode 100644
index 0000000000..8bf1075c14
--- /dev/null
+++ b/java/jca/example/conf/jboss-ejb-client.properties
@@ -0,0 +1,12 @@
+endpoint.name=client-endpoint
+remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
+
+remote.connections=default
+
+remote.connection.default.host=localhost
+remote.connection.default.port = 4447
+remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
+
+remote.connection.default.username=wmprice
+remote.connection.default.password=72whtu78
+
diff --git a/java/jca/example/conf/jboss-web.xml b/java/jca/example/conf/jboss-web.xml
index edacf8d418..32a97d1c35 100644
--- a/java/jca/example/conf/jboss-web.xml
+++ b/java/jca/example/conf/jboss-web.xml
@@ -25,6 +25,11 @@
         <res-type>javax.jms.ConnectionFactory</res-type>
         <jndi-name>java:/QpidJMSXA</jndi-name>
     </resource-ref>
+    <resource-ref>
+        <res-ref-name>QpidJMS</res-ref-name>
+        <res-type>javax.jms.ConnectionFactory</res-type>
+        <jndi-name>java:/QpidJMS</jndi-name>
+    </resource-ref>
     <ejb-local-ref>
         <ejb-ref-name>QpidTestBean</ejb-ref-name>
         <jndi-name>qpid-jcaex/QpidTestBean/local</jndi-name>
diff --git a/java/jca/example/conf/log4j.properties b/java/jca/example/conf/log4j.properties
index f1847f4418..1139ab9e85 100644
--- a/java/jca/example/conf/log4j.properties
+++ b/java/jca/example/conf/log4j.properties
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 log4j.rootLogger=DEBUG, CONSOLE, FILE
 
 #Console Appender
diff --git a/java/jca/example/conf/qpid-jca-ds.xml b/java/jca/example/conf/qpid-jca-ds.xml
index 80fb828b55..ad75876808 100644
--- a/java/jca/example/conf/qpid-jca-ds.xml
+++ b/java/jca/example/conf/qpid-jca-ds.xml
@@ -27,7 +27,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidTopic</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.hello.topic.dest.address@
+        DestinationAddress=@qpid.hello.topic.dest.address@
      </attribute>
   </mbean>
 
@@ -37,7 +37,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidTopic</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.goodbye.topic.dest.address@
+        DestinationAddress=@qpid.goodbye.topic.dest.address@
      </attribute>
   </mbean>
 
@@ -47,7 +47,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidTopic</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.hellogoodbye.topic.dest.address@
+        DestinationAddress=@qpid.hellogoodbye.topic.dest.address@
      </attribute>
   </mbean>
 
@@ -57,7 +57,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.hello.queue.dest.address@
+        DestinationAddress=@qpid.hello.queue.dest.address@
      </attribute>
   </mbean>
 
@@ -67,27 +67,36 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.goodbye.queue.dest.address@
+        DestinationAddress=@qpid.goodbye.queue.dest.address@
      </attribute>
   </mbean>
 
   <mbean code="org.jboss.resource.deployment.AdminObject"
-         name="qpid.jca:name=QpidResponderQueue">
-     <attribute name="JNDIName">QpidResponderQueue</attribute>
+         name="qpid.jca:name=QpidRequestQueue">
+     <attribute name="JNDIName">QpidRequestQueue</attribute>
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.responder.queue.dest.address@
+        DestinationAddress=@qpid.request.queue.dest.address@
      </attribute>
   </mbean>
 
   <mbean code="org.jboss.resource.deployment.AdminObject"
+         name="qpid.jca:name=QpidResponseQueue">
+     <attribute name="JNDIName">QpidResponseQueue</attribute>
+     <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
+     <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue</attribute>
+     <attribute name="Properties">
+        DestinationAddress=@qpid.response.queue.dest.address@
+     </attribute>
+  </mbean>
+  <mbean code="org.jboss.resource.deployment.AdminObject"
          name="qpid.jca:name=QpidConnectionFactory">
      <attribute name="JNDIName">QpidConnectionFactory</attribute>
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">javax.jms.ConnectionFactory</attribute>
      <attribute name="Properties">
-        connectionURL=@broker.url@
+        ConnectionURL=@broker.url@
      </attribute>
   </mbean>
 
diff --git a/java/jca/example/conf/qpid-standalone.xml b/java/jca/example/conf/qpid-standalone.xml
new file mode 100644
index 0000000000..8d6137aea7
--- /dev/null
+++ b/java/jca/example/conf/qpid-standalone.xml
@@ -0,0 +1,422 @@
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements.  See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership.  The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License.  You may obtain a copy of the License at
+ -
+ -   http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied.  See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+-->
+<?xml version='1.0' encoding='UTF-8'?>
+
+<server xmlns="urn:jboss:domain:1.1" xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance">
+
+    <extensions>
+        <extension module="org.jboss.as.clustering.infinispan"/>
+        <extension module="org.jboss.as.connector"/>
+        <extension module="org.jboss.as.configadmin"/>
+        <extension module="org.jboss.as.deployment-scanner"/>
+        <extension module="org.jboss.as.ee"/>
+        <extension module="org.jboss.as.ejb3"/>
+        <extension module="org.jboss.as.jaxr"/>
+        <extension module="org.jboss.as.jaxrs"/>
+        <extension module="org.jboss.as.jdr"/>
+        <extension module="org.jboss.as.jmx"/>
+        <extension module="org.jboss.as.jpa"/>
+        <extension module="org.jboss.as.logging"/>
+        <extension module="org.jboss.as.mail"/>
+        <extension module="org.jboss.as.naming"/>
+        <extension module="org.jboss.as.osgi"/>
+        <extension module="org.jboss.as.pojo"/>
+        <extension module="org.jboss.as.remoting"/>
+        <extension module="org.jboss.as.sar"/>
+        <extension module="org.jboss.as.security"/>
+        <extension module="org.jboss.as.threads"/>
+        <extension module="org.jboss.as.transactions"/>
+        <extension module="org.jboss.as.web"/>
+        <extension module="org.jboss.as.webservices"/>
+        <extension module="org.jboss.as.weld"/>
+    </extensions>
+
+    <management>
+        <security-realms>
+            <security-realm name="ManagementRealm">
+                <authentication>
+                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+            </security-realm>
+        </security-realms>
+        <management-interfaces>
+            <native-interface security-realm="ManagementRealm">
+                <socket-binding native="management-native"/>
+            </native-interface>
+            <http-interface security-realm="ManagementRealm">
+                <socket-binding http="management-http"/>
+            </http-interface>
+        </management-interfaces>
+    </management>
+
+    <profile>
+        <subsystem xmlns="urn:jboss:domain:logging:1.1">
+            <console-handler name="CONSOLE">
+                <level name="INFO"/>
+                <formatter>
+                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                </formatter>
+            </console-handler>
+            <periodic-rotating-file-handler name="FILE">
+                <formatter>
+                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="server.log"/>
+                <suffix value=".yyyy-MM-dd"/>
+                <append value="true"/>
+            </periodic-rotating-file-handler>
+            <logger category="com.arjuna">
+                <level name="WARN"/>
+            </logger>
+            <logger category="org.apache.tomcat.util.modeler">
+                <level name="WARN"/>
+            </logger>
+            <logger category="sun.rmi">
+                <level name="WARN"/>
+            </logger>
+            <logger category="jacorb">
+                <level name="WARN"/>
+            </logger>
+            <logger category="jacorb.config">
+                <level name="ERROR"/>
+            </logger>
+            <root-logger>
+                <level name="DEBUG"/>
+                <handlers>
+                    <handler name="CONSOLE"/>
+                    <handler name="FILE"/>
+                </handlers>
+            </root-logger>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:datasources:1.0">
+            <datasources>
+                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
+                    <connection-url>
+                        jdbc:h2:mem:test;DB_CLOSE_DELAY=-1
+                    </connection-url>
+                    <driver>
+                        h2
+                    </driver>
+                    <security>
+                        <user-name>
+                            sa
+                        </user-name>
+                        <password>
+                            sa
+                        </password>
+                    </security>
+                </datasource>
+                <drivers>
+                    <driver name="h2" module="com.h2database.h2">
+                        <xa-datasource-class>
+                            org.h2.jdbcx.JdbcDataSource
+                        </xa-datasource-class>
+                    </driver>
+                </drivers>
+            </datasources>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
+            <deployment-scanner name="default" path="deployments" scan-interval="5000" relative-to="jboss.server.base.dir"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ee:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:ejb3:1.2">
+            <session-bean>
+                <stateless>
+                    <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+                </stateless>
+                <stateful default-access-timeout="5000" cache-ref="simple"/>
+                <singleton default-access-timeout="5000"/>
+            </session-bean>
+            <mdb>
+                <resource-adapter-ref resource-adapter-name="@rar.name@"/>
+                <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+            </mdb>
+            <pools>
+                <bean-instance-pools>
+                    <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                </bean-instance-pools>
+            </pools>
+            <caches>
+                <cache name="simple" aliases="NoPassivationCache"/>
+                <cache name="passivating" passivation-store-ref="file" aliases="SimpleStatefulCache"/>
+            </caches>
+            <passivation-stores>
+                <file-passivation-store name="file"/>
+            </passivation-stores>
+            <async thread-pool-name="default"/>
+            <timer-service thread-pool-name="default">
+                <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+            </timer-service>
+            <remote connector-ref="remoting-connector" thread-pool-name="default"/>
+            <thread-pools>
+                <thread-pool name="default">
+                    <max-threads count="10"/>
+                    <keepalive-time time="100" unit="milliseconds"/>
+                </thread-pool>
+            </thread-pools>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="hibernate">
+            <cache-container name="hibernate" default-cache="local-query">
+                <local-cache name="entity">
+                    <transaction mode="NON_XA"/>
+                    <eviction strategy="LRU" max-entries="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="local-query">
+                    <transaction mode="NONE"/>
+                    <eviction strategy="LRU" max-entries="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="timestamps">
+                    <transaction mode="NONE"/>
+                    <eviction strategy="NONE"/>
+                </local-cache>
+            </cache-container>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jaxr:1.0">
+            <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/>
+            <juddi-server publish-url="http://localhost:8080/juddi/publish" query-url="http://localhost:8080/juddi/query"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jca:1.1">
+            <archive-validation enabled="false"/>
+            <bean-validation enabled="false"/>
+            <default-workmanager>
+                <short-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </short-running-threads>
+                <long-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </long-running-threads>
+            </default-workmanager>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jmx:1.1">
+            <show-model value="true"/>
+            <remoting-connector/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+            <jpa default-datasource=""/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:mail:1.0">
+            <mail-session jndi-name="java:jboss/mail/Default">
+                <smtp-server outbound-socket-binding-ref="mail-smtp"/>
+            </mail-session>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:naming:1.1"/>
+        <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy">
+            <properties>
+                <property name="org.osgi.framework.startlevel.beginning">
+                    1
+                </property>
+            </properties>
+            <capabilities>
+                <capability name="javax.servlet.api"/>
+                <capability name="javax.transaction.api"/>
+                <capability name="org.apache.felix.log" startlevel="1"/>
+                <capability name="org.jboss.osgi.logging" startlevel="1"/>
+                <capability name="org.apache.felix.configadmin" startlevel="1"/>
+                <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
+                <capability name="org.jboss.osgi.repository" startlevel="1"/>
+            </capabilities>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:remoting:1.1">
+            <connector name="remoting-connector" socket-binding="remoting"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0">
+            <resource-adapters>
+                <resource-adapter>
+                    <archive>
+                        @rar.name@
+                    </archive>
+                    <transaction-support>
+                        XATransaction
+                    </transaction-support>
+                    <config-property name="connectionURL">
+                        @broker.url@
+                    </config-property>
+                    <config-property name="TransactionManagerLocatorClass">
+                        org.apache.qpid.ra.tm.JBoss7TransactionManagerLocator
+                    </config-property>
+                    <config-property name="TransactionManagerLocatorMethod">
+                        getTm
+                    </config-property>
+                    <connection-definitions>
+                        <connection-definition class-name="org.apache.qpid.ra.QpidRAManagedConnectionFactory" jndi-name="QpidJMSXA" pool-name="QpidJMSXA">
+                            <config-property name="connectionURL">
+                                @broker.url@
+                            </config-property>
+                            <config-property name="SessionDefaultType">
+                                javax.jms.Queue
+                            </config-property>
+                        </connection-definition>
+                    </connection-definitions>
+                    <admin-objects>
+                        <admin-object class-name="org.apache.qpid.ra.admin.QpidConnectionFactoryProxy" jndi-name="java:jboss/exported/QpidConnectionFactory" use-java-context="false">
+                            <config-property name="ConnectionURL">
+                                @broker.url@
+                            </config-property>
+                        </admin-object>
+                        <admin-object class-name="org.apache.qpid.ra.admin.QpidTopicImpl" jndi-name="java:jboss/exported/GoodByeTopic" use-java-context="false" pool-name="GoodByeTopic">
+                            <config-property name="DestinationAddress">
+                                @qpid.hello.topic.dest.address@
+                            </config-property>
+                        </admin-object>
+                        <admin-object class-name="org.apache.qpid.ra.admin.QpidTopicImpl" jndi-name="java:jboss/exported/HelloTopic" use-java-context="false" pool-name="HelloTopic">
+                            <config-property name="DestinationAddress">
+                                @qpid.goodbye.topic.dest.address@
+                            </config-property>
+                        </admin-object>
+                        <admin-object class-name="org.apache.qpid.ra.admin.QpidQueueImpl" jndi-name="java:jboss/exported/GoodByeQueue" use-java-context="false" pool-name="GoodByeQueue">
+                            <config-property name="DestinationAddress">
+                                @qpid.goodbye.queue.dest.address@
+                            </config-property>
+                        </admin-object>
+                        <admin-object class-name="org.apache.qpid.ra.admin.QpidQueueImpl" jndi-name="java:jboss/exported/HelloQueue" use-java-context="false" pool-name="HelloQueue">
+                            <config-property name="DestinationAddress">
+                                @qpid.hello.queue.dest.address@
+                            </config-property>
+                        </admin-object>
+                        <admin-object class-name="org.apache.qpid.ra.admin.QpidQueueImpl" jndi-name="java:jboss/exported/QpidRequestQueue" use-java-context="false" pool-name="QpidRequestQueue">
+                            <config-property name="DestinationAddress">
+                                @qpid.request.queue.dest.address@
+                            </config-property>
+                        </admin-object>
+                        <admin-object class-name="org.apache.qpid.ra.admin.QpidQueueImpl" jndi-name="java:jboss/exported/QpidResponseQueue" use-java-context="false" pool-name="QpidResponseQueue">
+                            <config-property name="DestinationAddress">
+                                @qpid.response.queue.dest.address@
+                            </config-property>
+                        </admin-object>
+                    </admin-objects>
+                </resource-adapter>
+            </resource-adapters>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:security:1.1">
+            <security-domains>
+                <security-domain name="other" cache-type="default">
+                    <authentication>
+                        <login-module code="UsersRoles" flag="required"/>
+                    </authentication>
+                </security-domain>
+                <security-domain name="jboss-web-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+                <security-domain name="jboss-ejb-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+            </security-domains>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
+        <subsystem xmlns="urn:jboss:domain:transactions:1.1">
+            <core-environment>
+                <process-id>
+                    <uuid/>
+                </process-id>
+            </core-environment>
+            <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+            <coordinator-environment default-timeout="300"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host">
+            <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
+            <virtual-server name="default-host" enable-welcome-root="true">
+                <alias name="localhost"/>
+                <alias name="example.com"/>
+            </virtual-server>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:webservices:1.0" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:jaxwsconfig="urn:jboss:jbossws-jaxws-config:4.0">
+            <modify-wsdl-address>
+                true
+            </modify-wsdl-address>
+            <wsdl-host>
+                ${jboss.bind.address:127.0.0.1}
+            </wsdl-host>
+            <endpoint-config>
+                <jaxwsconfig:config-name>
+                    Standard-Endpoint-Config
+                </jaxwsconfig:config-name>
+            </endpoint-config>
+            <endpoint-config>
+                <jaxwsconfig:config-name>
+                    Recording-Endpoint-Config
+                </jaxwsconfig:config-name>
+                <jaxwsconfig:pre-handler-chains>
+                    <javaee:handler-chain id="recording-handlers">
+                        <javaee:protocol-bindings>
+                            ##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM
+                        </javaee:protocol-bindings>
+                        <javaee:handler>
+                            <javaee:handler-name>
+                                RecordingHandler
+                            </javaee:handler-name>
+                            <javaee:handler-class>
+                                org.jboss.ws.common.invocation.RecordingServerHandler
+                            </javaee:handler-class>
+                        </javaee:handler>
+                    </javaee:handler-chain>
+                </jaxwsconfig:pre-handler-chains>
+            </endpoint-config>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+    </profile>
+
+    <interfaces>
+        <interface name="management">
+            <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+        </interface>
+        <interface name="public">
+            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+        </interface>
+    </interfaces>
+
+    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
+        <socket-binding name="http" port="8080"/>
+        <socket-binding name="https" port="8443"/>
+        <socket-binding name="jacorb" port="3528"/>
+        <socket-binding name="jacorb-ssl" port="3529"/>
+        <socket-binding name="management-native" interface="management" port="${jboss.management.native.port:9999}"/>
+        <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
+        <socket-binding name="messaging" port="5445"/>
+        <socket-binding name="messaging-throughput" port="5455"/>
+        <socket-binding name="osgi-http" interface="management" port="8090"/>
+        <socket-binding name="remoting" port="4447"/>
+        <socket-binding name="txn-recovery-environment" port="4712"/>
+        <socket-binding name="txn-status-manager" port="4713"/>
+        <outbound-socket-binding name="mail-smtp">
+            <remote-destination host="localhost" port="25"/>
+        </outbound-socket-binding>
+    </socket-binding-group>
+
+
+</server>
diff --git a/java/jca/example/conf/web.xml b/java/jca/example/conf/web.xml
index d87c578606..6e53d7beba 100644
--- a/java/jca/example/conf/web.xml
+++ b/java/jca/example/conf/web.xml
@@ -29,11 +29,22 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
 
+    <servlet>
+        <display-name>QpidRequestResponseServlet</display-name>
+        <servlet-name>QpidRequestResponseServlet</servlet-name>
+        <servlet-class>org.apache.qpid.jca.example.web.QpidRequestResponseServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
     <servlet-mapping>
         <servlet-name>QpidTestServlet</servlet-name>
         <url-pattern>/qpid</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>QpidRequestResponseServlet</servlet-name>
+        <url-pattern>/qpid-reqresp</url-pattern>
+    </servlet-mapping>
 
 </web-app>