[jboss-cvs] JBossAS SVN: r61823 - trunk/testsuite/src/resources/jbossmessaging.

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

Author: scott.stark at jboss.org
Date: 2007-03-29 00:30:45 -0400 (Thu, 29 Mar 2007)
New Revision: 61823

Modified:
   trunk/testsuite/src/resources/jbossmessaging/test-destinations-full-service.xml
   trunk/testsuite/src/resources/jbossmessaging/test-destinations-service.xml
Log:
Fix the destination service class names

Modified: trunk/testsuite/src/resources/jbossmessaging/test-destinations-full-service.xml
===================================================================
--- trunk/testsuite/src/resources/jbossmessaging/test-destinations-full-service.xml	2007-03-29 04:25:03 UTC (rev 61822)
+++ trunk/testsuite/src/resources/jbossmessaging/test-destinations-full-service.xml	2007-03-29 04:30:45 UTC (rev 61823)
@@ -2,11 +2,7 @@
 
 <server>
 
-  <!-- <loader-repository>jboss.messaging:loader=ScopedLoaderRepository -->
-  <!--  <loader-repository-config>java2ParentDelegation=false</loader-repository-config> -->
-  <!-- </loader-repository> -->
-
-  <!-- <mbean code="org.jboss.jms.server.destination.Topic"
+  <mbean code="org.jboss.jms.server.destination.TopicService"
          name="jboss.messaging.destination:service=Topic,name=testTopic"
          xmbean-dd="xmdesc/Topic-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
@@ -17,9 +13,9 @@
            <role name="durpublisher" read="true" write="true" create="true"/>
         </security>
      </attribute>
-  </mbean>    Already installed with messaging.. so just ignoring this one -->
+  </mbean>
 
-  <mbean code="org.jboss.jms.server.destination.Topic"
+  <mbean code="org.jboss.jms.server.destination.TopicService"
          name="jboss.messaging.destination:service=Topic,name=securedTopic"
          xmbean-dd="xmdesc/Topic-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
@@ -30,7 +26,7 @@
      </attribute>
   </mbean>
 
-  <mbean code="org.jboss.jms.server.destination.Topic"
+  <mbean code="org.jboss.jms.server.destination.TopicService"
          name="jboss.messaging.destination:service=Topic,name=testDurableTopic"
          xmbean-dd="xmdesc/Topic-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
@@ -44,7 +40,7 @@
   </mbean>
 
 
-  <!-- <mbean code="org.jboss.jms.server.destination.Queue"
+  <mbean code="org.jboss.jms.server.destination.QueueService"
          name="jboss.messaging.destination:service=Queue,name=testQueue"
          xmbean-dd="xmdesc/Queue-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
@@ -55,33 +51,33 @@
            <role name="noacc" read="false" write="false" create="false"/>
         </security>
      </attribute>
-  </mbean>     Already installed with messaging.. so just ignoring this one -->
+  </mbean>
 
-  <mbean code="org.jboss.jms.server.destination.Queue"
+  <mbean code="org.jboss.jms.server.destination.QueueService"
          name="jboss.messaging.destination:service=Queue,name=A"
          xmbean-dd="xmdesc/Queue-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>
 
-  <mbean code="org.jboss.jms.server.destination.Queue"
+  <mbean code="org.jboss.jms.server.destination.QueueService"
          name="jboss.messaging.destination:service=Queue,name=B"
          xmbean-dd="xmdesc/Queue-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>
 
-  <mbean code="org.jboss.jms.server.destination.Queue"
+  <mbean code="org.jboss.jms.server.destination.QueueService"
          name="jboss.messaging.destination:service=Queue,name=C"
          xmbean-dd="xmdesc/Queue-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>
 
-  <mbean code="org.jboss.jms.server.destination.Queue"
+  <mbean code="org.jboss.jms.server.destination.QueueService"
          name="jboss.messaging.destination:service=Queue,name=D"
          xmbean-dd="xmdesc/Queue-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>
 
-  <mbean code="org.jboss.jms.server.destination.Queue"
+  <mbean code="org.jboss.jms.server.destination.QueueService"
          name="jboss.messaging.destination:service=Queue,name=ex"
          xmbean-dd="xmdesc/Queue-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>

Modified: trunk/testsuite/src/resources/jbossmessaging/test-destinations-service.xml
===================================================================
--- trunk/testsuite/src/resources/jbossmessaging/test-destinations-service.xml	2007-03-29 04:25:03 UTC (rev 61822)
+++ trunk/testsuite/src/resources/jbossmessaging/test-destinations-service.xml	2007-03-29 04:30:45 UTC (rev 61823)
@@ -2,24 +2,20 @@
 
 <server>
 
-  <!-- <loader-repository>jboss.messaging:loader=ScopedLoaderRepository -->
-  <!--  <loader-repository-config>java2ParentDelegation=false</loader-repository-config> -->
-  <!-- </loader-repository> -->
+   <mbean code="org.jboss.jms.server.destination.TopicService"
+      name="jboss.messaging.destination:service=Topic,name=testTopic"
+      xmbean-dd="xmdesc/Topic-xmbean.xml">
+      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+      <attribute name="SecurityConfig">
+         <security>
+            <role name="guest" read="true" write="true"/>
+            <role name="publisher" read="true" write="true" create="false"/>
+            <role name="durpublisher" read="true" write="true" create="true"/>
+         </security>
+      </attribute>
+   </mbean>
 
-  <!-- <mbean code="org.jboss.jms.server.destination.Topic"
-         name="jboss.messaging.destination:service=Topic,name=testTopic"
-         xmbean-dd="xmdesc/Topic-xmbean.xml">
-     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-     <attribute name="SecurityConfig">
-        <security>
-           <role name="guest" read="true" write="true"/>
-           <role name="publisher" read="true" write="true" create="false"/>
-           <role name="durpublisher" read="true" write="true" create="true"/>
-        </security>
-     </attribute>
-  </mbean> Already instealled on messaging.. just ignoring it -->
-
-  <mbean code="org.jboss.jms.server.destination.Topic"
+   <mbean code="org.jboss.jms.server.destination.TopicService"
          name="jboss.messaging.destination:service=Topic,name=securedTopic"
          xmbean-dd="xmdesc/Topic-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
@@ -30,7 +26,7 @@
      </attribute>
   </mbean>
 
-  <mbean code="org.jboss.jms.server.destination.Topic"
+   <mbean code="org.jboss.jms.server.destination.TopicService"
          name="jboss.messaging.destination:service=Topic,name=testDurableTopic"
          xmbean-dd="xmdesc/Topic-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
@@ -44,7 +40,7 @@
   </mbean>
 
 
-  <!-- <mbean code="org.jboss.jms.server.destination.Queue"
+  <mbean code="org.jboss.jms.server.destination.QueueService"
          name="jboss.messaging.destination:service=Queue,name=testQueue"
          xmbean-dd="xmdesc/Queue-xmbean.xml">
      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
@@ -55,6 +51,6 @@
            <role name="noacc" read="false" write="false" create="false"/>
         </security>
      </attribute>
-  </mbean>  Already instealled on messaging.. just ignoring it -->
+  </mbean>
 
 </server>