From 0a6aae2d0be895196e9965de27cf8871c01758db Mon Sep 17 00:00:00 2001
From: "Weston M. Price" <wprice@apache.org>
Date: Mon, 16 Apr 2012 14:08:32 +0000
Subject: QPID-3749     -General cleanup of ResourceAdapter     -Removed unused
 methods     -Fixed typos in ra.xml     -Changed default connectionURL to
 remove guest/guest

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1326622 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/jca/src/main/resources/META-INF/ra.xml | 38 ++++++++----------------
 1 file changed, 12 insertions(+), 26 deletions(-)

(limited to 'qpid/java/jca/src/main/resources')

diff --git a/qpid/java/jca/src/main/resources/META-INF/ra.xml b/qpid/java/jca/src/main/resources/META-INF/ra.xml
index 2c8344c8f0..e95a72fb99 100755
--- a/qpid/java/jca/src/main/resources/META-INF/ra.xml
+++ b/qpid/java/jca/src/main/resources/META-INF/ra.xml
@@ -69,7 +69,7 @@
     </config-property>
 
     <config-property>
-      <description>Interval between setup attempts</description>
+      <description>Interval between setup attempts in milliseconds</description>
       <config-property-name>SetupInterval</config-property-name>
       <config-property-type>java.lang.Long</config-property-type>
       <config-property-value>5000</config-property-value>
@@ -104,10 +104,10 @@
     </config-property>
 
     <config-property>
-      <description>connection URL</description>
+      <description>Connection URL</description>
       <config-property-name>ConnectionURL</config-property-name>
       <config-property-type>java.lang.String</config-property-type>
-      <config-property-value>amqp://guest:guest@/test?brokerlist='tcp://localhost:5672'</config-property-value>
+      <config-property-value>amqp://anonymous:passwd@client/test?brokerlist='tcp://localhost?sasl_mechs='PLAIN''</config-property-value>
     </config-property>
 
     <outbound-resourceadapter>
@@ -116,14 +116,14 @@
 
         <config-property>
           <description>Default session type</description>
-          <config-property-name>sessionDefaultType</config-property-name>
+          <config-property-name>SessionDefaultType</config-property-name>
           <config-property-type>java.lang.String</config-property-type>
           <config-property-value>javax.jms.Queue</config-property-value>
         </config-property>
 
         <config-property>
           <description>Specify lock timeout in seconds</description>
-          <config-property-name>useTryLock</config-property-name>
+          <config-property-name>UseTryLock</config-property-name>
           <config-property-type>java.lang.Integer</config-property-type>
           <config-property-value>0</config-property-value>
         </config-property>
@@ -137,7 +137,7 @@
 
         <config-property>
           <description>Client ID for the connection</description>
-          <config-property-name>ClientID</config-property-name>
+          <config-property-name>ClientId</config-property-name>
           <config-property-type>java.lang.String</config-property-type>
           <config-property-value>client_id</config-property-value>
         </config-property>
@@ -200,38 +200,24 @@
             <adminobject-interface>org.apache.qpid.ra.admin.QpidQueue</adminobject-interface>
             <adminobject-class> org.apache.qpid.ra.admin.QpidQueueImpl</adminobject-class>
             <config-property>
-                <config-property-name>destinationAddress </config-property-name>
-                <config-property-type>java.lang.String </config-property-type>
+                <config-property-name>DestinationAddress </config-property-name>
+                <config-property-type>java.lang.String</config-property-type>
             </config-property>
         </adminobject>
       <adminobject>
             <adminobject-interface>org.apache.qpid.ra.admin.QpidTopic</adminobject-interface>
             <adminobject-class> org.apache.qpid.ra.admin.QpidTopicImpl</adminobject-class>
             <config-property>
-                <config-property-name>destinationAddress </config-property-name>
-                <config-property-type>java.lang.String </config-property-type>
+                <config-property-name>DestinationAddress </config-property-name>
+                <config-property-type>java.lang.String</config-property-type>
             </config-property>
         </adminobject>
-      <!--
-      <adminobject>
-            <adminobject-interface>javax.jms.Destination</adminobject-interface>
-            <adminobject-class> org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
-            <config-property>
-                <config-property-name>destinationAddress </config-property-name>
-                <config-property-type>java.lang.String </config-property-type>
-            </config-property>
-            <config-property>
-                <config-property-name>destinationType</config-property-name>
-                <config-property-type>java.lang.String </config-property-type>
-            </config-property>
-        </adminobject>
-      -->
       <adminobject>
             <adminobject-interface>javax.jms.ConnectionFactory</adminobject-interface>
             <adminobject-class> org.apache.qpid.ra.admin.QpidConnectionFactoryProxy</adminobject-class>
             <config-property>
-                <config-property-name>connectionURL</config-property-name>
-                <config-property-type>java.lang.String </config-property-type>
+                <config-property-name>ConnectionURL</config-property-name>
+                <config-property-type>java.lang.String</config-property-type>
             </config-property>
         </adminobject>
    </resourceadapter>
-- 
cgit v1.2.1