[jboss-cvs] JBossAS SVN: r61817 - trunk/testsuite/src/resources/mdb.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-03-28 19:23:53 -0400 (Wed, 28 Mar 2007)
New Revision: 61817

Modified:
   trunk/testsuite/src/resources/mdb/jboss-service.xml
Log:
Update the jms destination mbeans to the jbm 1.2 version

Modified: trunk/testsuite/src/resources/mdb/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/mdb/jboss-service.xml	2007-03-28 22:46:56 UTC (rev 61816)
+++ trunk/testsuite/src/resources/mdb/jboss-service.xml	2007-03-28 23:23:53 UTC (rev 61817)
@@ -2,11 +2,12 @@
 <!DOCTYPE server>
 
 <server>
-  <mbean code="org.jboss.jms.server.destination.Queue"
-	 name="jboss.mq.destination:service=Queue,name=myMDBQueue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+	 name="jboss.mq.destination:service=Queue,name=myMDBQueue"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+    <depends>jboss.messaging:service=PostOffice</depends>
+    <attribute name="SecurityConfig">
       <security>
         <role name="guest" read="true" write="true"/>
         <role name="publisher" read="true" write="true" create="false"/>
@@ -14,11 +15,12 @@
       </security>
     </attribute>
   </mbean>
-  <mbean code="org.jboss.jms.server.destination.Topic"
-	 name="jboss.mq.destination:service=Topic,name=myMDBTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
+  <mbean code="org.jboss.jms.server.destination.TopicService"
+    name="jboss.messaging.destination:service=Topic,name=myMDBTopic"
+    xmbean-dd="xmdesc/Topic-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+    <depends>jboss.messaging:service=PostOffice</depends>
+    <attribute name="SecurityConfig">
       <security>
         <role name="guest" read="true" write="true"/>
         <role name="publisher" read="true" write="true" create="false"/>
@@ -26,10 +28,6 @@
       </security>
     </attribute>
   </mbean>
-   <mbean code="org.jboss.jms.server.destination.Queue"
-     name="jboss.mq.destination:service=Queue,name=testObjectMessage">
-     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
   <mbean code="org.jboss.naming.NamingAlias"
          name="jboss.test:test=mdb,alias=anotherContext/QueueInADifferentContext">
      <attribute name="FromName">anotherContext/QueueInADifferentContext</attribute>