QPID-3734

    -Refactored JCA adapter to use AMQDestination Java Bean
    -Created two new destination AdminObjects to managed JCA
    destinations
    -Refactored examples to use new AdminObjects
    -Minor cleanup
    -Moved broker.address property to build-properties.xml

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

4 files changed, 14 insertions, 12 deletions

diff --git a/qpid/java/.gitignore b/qpid/java/.gitignore
new file mode 100644
index 0000000000..36097e3820
--- /dev/null
+++ b/qpid/java/.gitignore
@@ -0,0 +1,2 @@
+*.swp
+eclipse-projects/*
diff --git a/qpid/java/jca/example/.gitignore b/qpid/java/jca/example/.gitignore
index 71337b619c..54c810d4a0 100644
--- a/qpid/java/jca/example/.gitignore
+++ b/qpid/java/jca/example/.gitignore
@@ -1,3 +1,4 @@
 build/*
 lib/*
+*.swp
 build-properties.xml
diff --git a/qpid/java/jca/example/conf/geronimo-ra.xml b/qpid/java/jca/example/conf/geronimo-ra.xml
index 1c7210d2ee..926c73baf1 100644
--- a/qpid/java/jca/example/conf/geronimo-ra.xml
+++ b/qpid/java/jca/example/conf/geronimo-ra.xml
@@ -67,7 +67,7 @@
       <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>
@@ -75,7 +75,7 @@
       <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>
+         <config-property-setting name="DestinationAddress">@qpid.hello.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
@@ -83,7 +83,7 @@
       <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>
+         <config-property-setting name="DestinationAddress">@qpid.goodbye.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
@@ -91,7 +91,7 @@
       <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>
+         <config-property-setting name="DestinationAddress">@qpid.hellogoodbye.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
@@ -99,7 +99,7 @@
       <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>
+         <config-property-setting name="DestinationAddress">@qpid.hello.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
@@ -107,7 +107,7 @@
       <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>
+         <config-property-setting name="DestinationAddress">@qpid.goodbye.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
@@ -115,7 +115,7 @@
       <adminobject-class>org.apache.qpid.ra.admin.QpidQueueImpl</adminobject-class>
       <adminobject-instance>
          <message-destination-name>RequestQueue</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.request.queue.dest.address@</config-property-setting>
+         <config-property-setting name="DestinationAddress">@qpid.request.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
@@ -123,7 +123,7 @@
       <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>
+         <config-property-setting name="DestinationAddress">@qpid.response.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
@@ -131,7 +131,7 @@
       <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>
+         <config-property-setting name="ConnectionURL">@broker.url@</config-property-setting>
       </adminobject-instance>
     </adminobject>
   </resourceadapter>
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 e95a72fb99..01f5eceecf 100755
--- a/qpid/java/jca/src/main/resources/META-INF/ra.xml
+++ b/qpid/java/jca/src/main/resources/META-INF/ra.xml
@@ -195,13 +195,12 @@
           </messagelistener>
         </messageadapter>
       </inbound-resourceadapter>
-
       <adminobject>
             <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-type>java.lang.String </config-property-type>
             </config-property>
         </adminobject>
       <adminobject>
@@ -209,7 +208,7 @@
             <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-type>java.lang.String </config-property-type>
             </config-property>
         </adminobject>
       <adminobject>