From 0dcfedb9a055a5ec9175a13cdce8667104cd799a Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Wed, 1 Feb 2012 23:56:28 +0000
Subject: QPID-3734 Commiting patch by Weston Price.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239411 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/jca/example/conf/geronimo-ra.xml | 35 ++++++++++++------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

(limited to 'qpid/java/jca/example/conf/geronimo-ra.xml')

diff --git a/qpid/java/jca/example/conf/geronimo-ra.xml b/qpid/java/jca/example/conf/geronimo-ra.xml
index 2943ac0a58..e3e74ebc62 100644
--- a/qpid/java/jca/example/conf/geronimo-ra.xml
+++ b/qpid/java/jca/example/conf/geronimo-ra.xml
@@ -63,65 +63,58 @@
     <!-- Note, do not remove this admin object. There appears to be a bug in Geronimo's deployer that does not correctly create JNDI references
          if an extra admin object is not present -->
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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>Dummy</message-destination-name>
-         <config-property-setting name="destinationType">TOPIC</config-property-setting>
          <config-property-setting name="destinationAddress">amq.topic</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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="destinationType">TOPIC</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.hello.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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="destinationType">TOPIC</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.goodbye.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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="destinationType">TOPIC</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.hellogoodbye.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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="destinationType">QUEUE</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.hello.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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="destinationType">QUEUE</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.goodbye.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
-      <adminobject-interface>javax.jms.Destination</adminobject-interface>
-      <adminobject-class>org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
+      <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="destinationType">QUEUE</config-property-setting>
          <config-property-setting name="destinationAddress">@qpid.responder.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
-- 
cgit v1.2.1