Author: wprice
Date: Tue Apr 17 21:38:12 2012
New Revision: 1327292
URL: http://svn.apache.org/viewvc?rev=1327292&view=rev
Log:
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
Added:
qpid/trunk/qpid/java/.gitignore
Modified:
qpid/trunk/qpid/java/jca/example/.gitignore
qpid/trunk/qpid/java/jca/example/conf/geronimo-ra.xml
qpid/trunk/qpid/java/jca/src/main/resources/META-INF/ra.xml
Added: qpid/trunk/qpid/java/.gitignore
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/.gitignore?rev=1327292&view=auto
==============================================================================
--- qpid/trunk/qpid/java/.gitignore (added)
+++ qpid/trunk/qpid/java/.gitignore Tue Apr 17 21:38:12 2012
@@ -0,0 +1,2 @@
+*.swp
+eclipse-projects/*
Modified: qpid/trunk/qpid/java/jca/example/.gitignore
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/example/.gitignore?rev=1327292&r1=1327291&r2=1327292&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/example/.gitignore (original)
+++ qpid/trunk/qpid/java/jca/example/.gitignore Tue Apr 17 21:38:12 2012
@@ -1,3 +1,4 @@
build/*
lib/*
+*.swp
build-properties.xml
Modified: qpid/trunk/qpid/java/jca/example/conf/geronimo-ra.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/example/conf/geronimo-ra.xml?rev=1327292&r1=1327291&r2=1327292&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/example/conf/geronimo-ra.xml (original)
+++ qpid/trunk/qpid/java/jca/example/conf/geronimo-ra.xml Tue Apr 17 21:38:12
2012
@@ -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>
Modified: qpid/trunk/qpid/java/jca/src/main/resources/META-INF/ra.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/src/main/resources/META-INF/ra.xml?rev=1327292&r1=1327291&r2=1327292&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/src/main/resources/META-INF/ra.xml (original)
+++ qpid/trunk/qpid/java/jca/src/main/resources/META-INF/ra.xml Tue Apr 17
21:38:12 2012
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
