QPID-4984: WIP - Merge from trunk r.1525056

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

5 files changed, 23 insertions, 10 deletions

diff --git a/qpid/java/jca/README-JBOSS.txt b/qpid/java/jca/README-JBOSS.txt
index e88643e0f2..717565b938 100644
--- a/qpid/java/jca/README-JBOSS.txt
+++ b/qpid/java/jca/README-JBOSS.txt
@@ -101,7 +101,7 @@ provides two such objects
          name="qpid.jca:name=HelloQueue">
      <attribute name="JNDIName">Hello</attribute>
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='qpid-ra-<ra-version>.rar'</depends>
-     <attribute name="Type">javax.jms.Destination</attribute>
+     <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue/attribute>
      <attribute name="Properties">
         DestinationAddress=amq.direct
      </attribute>
@@ -118,7 +118,7 @@ can be customized for your environment. Please see the Qpid Java Client document
          name="qpid.jca:name=HelloTopic">
      <attribute name="JNDIName">HelloTopic</attribute>
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='qpid-ra-<ra-version>.rar'</depends>
-     <attribute name="Type">javax.jms.Destination</attribute>
+     <attribute name="Type">org.apache.qpid.ra.admin.QpidTopic</attribute>
      <attribute name="Properties">
         DestinationAddress=amq.topic
      </attribute>
diff --git a/qpid/java/jca/README.txt b/qpid/java/jca/README.txt
index a4d426310d..d4c14112a4 100644
--- a/qpid/java/jca/README.txt
+++ b/qpid/java/jca/README.txt
@@ -97,7 +97,7 @@ UseConnectionPerHandler
     The Apache C++ Broker multiplexes on the physical connection rather than the session. As a result, performance
     improvements can be gained by allocating and assigning a connection per inbound listener. The alternative is
     to share a connection across each handler for a given endpoint (MDB).
-Default:true
+Default:false
 
 The ManagedConnectionFactory JavaBean
 =====================================
diff --git a/qpid/java/jca/example/README-JBOSS7.txt b/qpid/java/jca/example/README-JBOSS7.txt
index 7a3e0db01a..5234a0b293 100644
--- a/qpid/java/jca/example/README-JBOSS7.txt
+++ b/qpid/java/jca/example/README-JBOSS7.txt
@@ -64,8 +64,6 @@ deploy this file copy the file to:
 
 JBOSS_HOME/standalone/configuration
 
-directory.
-
 Prior to deploying any application component, the JBoss application server
 should be started and available for requests. In order to use the qpid-standalone.xml
 file generated in the previous step, when starting JBoss AS 7 invoke the following:
@@ -100,7 +98,22 @@ will attempt to deploy the Qpid JCA example EAR into the JBoss AS 7 environment.
 Once the above command executes successfully, the Qpid JCA example application is
 deployed, configured and ready for use.
 
-Note, currently there is an issue with 'hot-deployment' in the JBoss AS 7 environment.
+If you choose to use the standalone 'thin' EJB3 client example, you will need to configure
+the security realm for your application. Please see
+
+http://www.mastertheboss.com/jboss-as-7/jboss-as-7-remote-ejb-client-tutorial
+
+on instructions for how to do this in the JBoss7 environment. Once this is done you
+will need to change the conf/jboss-ejb-client.properties file to use your recently
+configured username/password for your application:
+
+remote.connection.default.username=CHANGEME
+remote.connection.default.password=CHANGEME
+
+Modify these properties to use the username/password you configured in the
+above step.
+
+Currently there is an issue with 'hot-deployment' in the JBoss AS 7 environment.
 If you need to re-deploy the EAR file, restarting JBoss AS 7 is required.
 
 The build-jboss7-properties.xml file contains JBoss AS 7 specific configuration options
diff --git a/qpid/java/jca/example/conf/jboss-ejb-client.properties b/qpid/java/jca/example/conf/jboss-ejb-client.properties
index 8bf1075c14..9b62e6794c 100644
--- a/qpid/java/jca/example/conf/jboss-ejb-client.properties
+++ b/qpid/java/jca/example/conf/jboss-ejb-client.properties
@@ -7,6 +7,6 @@ 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
+remote.connection.default.username=CHANGEME
+remote.connection.default.password=CHANGEME
 
diff --git a/qpid/java/jca/rar/src/main/resources/META-INF/ra.xml b/qpid/java/jca/rar/src/main/resources/META-INF/ra.xml
index a9374f52d7..4819bc8ad5 100755
--- a/qpid/java/jca/rar/src/main/resources/META-INF/ra.xml
+++ b/qpid/java/jca/rar/src/main/resources/META-INF/ra.xml
@@ -109,12 +109,12 @@
       <config-property-type>java.lang.String</config-property-type>
       <config-property-value>amqp://anonymous:passwd@client/test?brokerlist='tcp://localhost?sasl_mechs='PLAIN''</config-property-value>
     </config-property>
-    
+
     <config-property>
       <description>Use a JMS Connection per MessageHandler</description>
       <config-property-name>UseConnectionPerHandler</config-property-name>
       <config-property-type>java.lang.Boolean</config-property-type>
-      <config-property-value>true</config-property-value>
+      <config-property-value>false</config-property-value>
     </config-property>
 
     <outbound-resourceadapter>