[jboss-cvs] JBossAS SVN: r101435 - in branches/Branch_Hornet_Temporary_2/testsuite/src: main/org/jboss/test/mdbsessionpoolclear/test and 7 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Feb 24 22:20:08 EST 2010


Author: clebert.suconic at jboss.com
Date: 2010-02-24 22:20:07 -0500 (Wed, 24 Feb 2010)
New Revision: 101435

Removed:
   branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ee5client/ee5client-jms-service.xml
   branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-clustered-destinations-full-service.xml
   branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-destinations-full-service.xml
   branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-destinations-service.xml
   branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossts/resources/xa-mq-destinations-service.xml
   branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdbsessionpoolclear/mdbsessionpoolclear-jbm-service.xml
   branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/jbpm-bpel/deploy/jms/jbossmq-destinations-service.xml
Modified:
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb3/jbas6239/QueueTestMDB.java
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdbsessionpoolclear/test/MDBUnitTestCase.java
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java
   branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdbsessionpoolclear/META-INF/jboss.xml
Log:
Fixing tests

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb3/jbas6239/QueueTestMDB.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb3/jbas6239/QueueTestMDB.java	2010-02-25 02:16:21 UTC (rev 101434)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb3/jbas6239/QueueTestMDB.java	2010-02-25 03:20:07 UTC (rev 101435)
@@ -51,7 +51,7 @@
 })
 @RunAs("TestRole")
 @SecurityDomain(value="other",unauthenticatedPrincipal="user")
- at Depends("org.hornetq:module=JMS,name=\"mdbtest\",type=DeployedQueue")
+ at Depends("org.hornetq:module=JMS,name=\"mdbtest\",type=Queue")
 public class QueueTestMDB implements MessageListener
 {
    @Resource(mappedName="java:/ConnectionFactory")

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdbsessionpoolclear/test/MDBUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdbsessionpoolclear/test/MDBUnitTestCase.java	2010-02-25 02:16:21 UTC (rev 101434)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdbsessionpoolclear/test/MDBUnitTestCase.java	2010-02-25 03:20:07 UTC (rev 101435)
@@ -40,9 +40,12 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.jboss.test.jms.JMSTestAdmin;
 import org.jboss.test.mdbsessionpoolclear.bean.TestStatus;
 import org.jboss.test.mdbsessionpoolclear.bean.TestStatusHome;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
 import org.jboss.logging.Logger;
+import org.jboss.test.JBossJMSTestCase;
 import org.jboss.test.JBossTestCase;
 import org.jboss.test.JBossTestSetup;
 
@@ -52,7 +55,7 @@
  * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
  * @version $Id$
  */
-public class MDBUnitTestCase extends JBossTestCase
+public class MDBUnitTestCase extends JBossJMSTestCase
 {
    private static final Logger log = Logger.getLogger(MDBUnitTestCase.class);
 
@@ -60,6 +63,7 @@
    {
       super(name);
    }
+   
 
   
    public void testMdb() throws Exception
@@ -84,7 +88,7 @@
       session.close();
       cnn.close();
       
-      Thread.sleep(5 * 1000);
+      //Thread.sleep(5 * 1000);
       
       assertEquals(1, status.queueFired());
       
@@ -174,6 +178,7 @@
          protected void setUp() throws Exception
          {
             super.setUp();
+            MDBUnitTestCase.deployQueue("mdbsessionpoolclearQueue");
             deploy("mdbsessionpoolclear.jar");
          }
 
@@ -181,19 +186,9 @@
          {
             super.tearDown();
 
-            // Remove the DLQ messages
-            try
-            {
-               getServer().invoke(
-                  new ObjectName("jboss.messaging.destination:service=Queue,name=DLQ"),
-                  "removeAllMessages", new Object[0], new String[0]);
-            }
-            catch (Exception ignored)
-            {
-               getLog().warn("unable to clear dlq", ignored);
-            }
+            
+            JMSDestinationsUtil.purgeQueue("/queue/DLQ");
 
-            ClassLoader loader = Thread.currentThread().getContextClassLoader();
             try
             {
                undeploy("mdbsessionpoolclear.jar");
@@ -202,6 +197,8 @@
             {
                getLog().warn("Unable to undeploy mdbsessionpoolclear.jar", ignored);
             }
+            
+            MDBUnitTestCase.undeployDestinations();
          }
       };
 

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java	2010-02-25 02:16:21 UTC (rev 101434)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java	2010-02-25 03:20:07 UTC (rev 101435)
@@ -1,5 +1,13 @@
 package org.jboss.test.util.jms;
 
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.MessageConsumer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.naming.InitialContext;
+
+import org.hornetq.api.core.client.ClientConsumer;
 import org.jboss.logging.Logger;
 import org.jboss.test.jms.JMSTestAdmin;
 import org.jboss.test.jms.TestRole;
@@ -47,5 +55,35 @@
    }
    
    
+   public static void purgeQueue(String jndi) throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      Connection conn = null;
+      try
+      {
+         Queue queue = (Queue)ctx.lookup(jndi);
+         ConnectionFactory cf = (javax.jms.ConnectionFactory)ctx.lookup("ConnectionFactory");
+         conn = cf.createConnection();
+         Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         conn.start();
+         MessageConsumer cons = sess.createConsumer(queue);
+         
+         while (cons.receiveNoWait() != null);
+         
+         
+      }
+      finally
+      {
+         ctx.close();
+         if (conn != null)
+         {
+            conn.close();
+         }
+      }
+   }
 
+
+   
+   
+
 }

Deleted: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ee5client/ee5client-jms-service.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ee5client/ee5client-jms-service.xml	2010-02-25 02:16:21 UTC (rev 101434)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ee5client/ee5client-jms-service.xml	2010-02-25 03:20:07 UTC (rev 101435)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=messageReplier">
-      <attribute name="JNDIName">queue/messageReplier</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-</server>

Deleted: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-clustered-destinations-full-service.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-clustered-destinations-full-service.xml	2010-02-25 02:16:21 UTC (rev 101434)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-clustered-destinations-full-service.xml	2010-02-25 03:20:07 UTC (rev 101435)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<server>
-
-   <mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=testDistributedQueueA"
-      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"/>
-        </security>
-      </attribute>
-      <attribute name="Clustered">true</attribute>
-   </mbean>   
-
-   <mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=testDistributedQueueB"
-      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"/>
-        </security>
-      </attribute>
-      <attribute name="Clustered">true</attribute>
-   </mbean>   
-
-   <mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=testDistributedQueueC"
-      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"/>
-        </security>
-      </attribute>
-      <attribute name="Clustered">true</attribute>
-   </mbean>   
-
-   <mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=testDistributedQueueD"
-      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"/>
-        </security>
-      </attribute>
-      <attribute name="Clustered">true</attribute>
-   </mbean>   
-
-   <mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=testDistributedQueueE"
-      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"/>
-        </security>
-      </attribute>
-      <attribute name="Clustered">true</attribute>
-   </mbean>   
-
-   <mbean code="org.jboss.jms.server.destination.QueueService"
-      name="jboss.messaging.destination:service=Queue,name=testDistributedQueueF"
-      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"/>
-        </security>
-      </attribute>
-      <attribute name="Clustered">true</attribute>
-   </mbean>   
-
-
-</server>

Deleted: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-destinations-full-service.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-destinations-full-service.xml	2010-02-25 02:16:21 UTC (rev 101434)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-destinations-full-service.xml	2010-02-25 03:20:07 UTC (rev 101435)
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<server>
-
-   <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>
-      <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"/>
-            <role name="durpublisher" read="true" write="true" create="true"/>
-         </security>
-      </attribute>
-   </mbean>
-  
-
-  <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>
-      <depends>jboss.messaging:service=PostOffice</depends>
-     <attribute name="SecurityConfig">
-        <security>
-           <role name="publisher" read="true" write="true" create="false"/>
-        </security>
-     </attribute>
-  </mbean>
-
-  <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>
-      <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"/>
-           <role name="durpublisher" read="true" write="true" create="true"/>
-        </security>
-     </attribute>
-  </mbean>
-
-
-  <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>
-      <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"/>
-           <role name="noacc" read="false" write="false" create="false"/>
-        </security>
-     </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-         name="jboss.messaging.destination:service=Queue,name=A"
-         xmbean-dd="xmdesc/Queue-xmbean.xml">
-      <depends>jboss.messaging:service=PostOffice</depends>
-     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-  </mbean>
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-         name="jboss.messaging.destination:service=Queue,name=B"
-         xmbean-dd="xmdesc/Queue-xmbean.xml">
-      <depends>jboss.messaging:service=PostOffice</depends>
-     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-  </mbean>
-
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-         name="jboss.messaging.destination:service=Queue,name=C"
-         xmbean-dd="xmdesc/Queue-xmbean.xml">
-      <depends>jboss.messaging:service=PostOffice</depends>
-     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-  </mbean>
-
-  <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>
-      <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-
-  <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>
-      <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-
-</server>

Deleted: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-destinations-service.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-destinations-service.xml	2010-02-25 02:16:21 UTC (rev 101434)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossmessaging/test-destinations-service.xml	2010-02-25 03:20:07 UTC (rev 101435)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<server>
-
-   <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.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>
-     <attribute name="SecurityConfig">
-        <security>
-           <role name="publisher" read="true" write="true" create="false"/>
-        </security>
-     </attribute>
-  </mbean>
-
-   <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>
-     <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.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>
-     <attribute name="SecurityConfig">
-        <security>
-           <role name="guest" read="true" write="true"/>
-           <role name="publisher" read="true" write="true" create="false"/>
-           <role name="noacc" read="false" write="false" create="false"/>
-        </security>
-     </attribute>
-  </mbean>
-
-</server>

Deleted: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossts/resources/xa-mq-destinations-service.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossts/resources/xa-mq-destinations-service.xml	2010-02-25 02:16:21 UTC (rev 101434)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/jbossts/resources/xa-mq-destinations-service.xml	2010-02-25 03:20:07 UTC (rev 101435)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-
-  <!-- RECOVERY destinations -->
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=recovery">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.messaging:service=SecurityStore</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=recoveryTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.messaging:service=SecurityStore</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:service=Topic,name=recoveryDurableTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.messaging:service=SecurityStore</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=recoveryQueue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.messaging:service=SecurityStore</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-         name="jboss.mq.destination:service=Queue,name=rcvQ">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.messaging:service=SecurityStore</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-         name="jboss.mq.destination:service=Queue,name=sndQ">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-<!--
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true" create="true"/>
-      </security>
-    </attribute>
--->
-  </mbean>
-
- 
-</server>
-

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdbsessionpoolclear/META-INF/jboss.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdbsessionpoolclear/META-INF/jboss.xml	2010-02-25 02:16:21 UTC (rev 101434)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdbsessionpoolclear/META-INF/jboss.xml	2010-02-25 03:20:07 UTC (rev 101435)
@@ -16,7 +16,6 @@
                <invoker-proxy-binding-name>my-message-driven-bean</invoker-proxy-binding-name>
             </invoker>
          </invoker-bindings>
-         <depends>jboss.messaging.destination:service=Queue,name=mdbsessionpoolclearQueue</depends>
       </message-driven>
    </enterprise-beans>
 

Deleted: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdbsessionpoolclear/mdbsessionpoolclear-jbm-service.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdbsessionpoolclear/mdbsessionpoolclear-jbm-service.xml	2010-02-25 02:16:21 UTC (rev 101434)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdbsessionpoolclear/mdbsessionpoolclear-jbm-service.xml	2010-02-25 03:20:07 UTC (rev 101435)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   
-  <mbean code="org.jboss.jms.server.destination.QueueService" name="jboss.messaging.destination:service=Queue,name=mdbsessionpoolclearQueue" xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-    <depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-
-</server>

Deleted: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/jbpm-bpel/deploy/jms/jbossmq-destinations-service.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/jbpm-bpel/deploy/jms/jbossmq-destinations-service.xml	2010-02-25 02:16:21 UTC (rev 101434)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/jbpm-bpel/deploy/jms/jbossmq-destinations-service.xml	2010-02-25 03:20:07 UTC (rev 101435)
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id$ -->
-
-<!-- 
-   | This file defines the default Queues and Topics that JBossMQ
-   | ships with.  The default Queues and Topics are used by the 
-   | JBoss test suite and by the sample jms programs.
-   |
-   | You can add other destinations to this file, or you can create other
-   | *-service.xml files to contain your application's destinations.
- -->
-
-<server>
-  <!-- Destination without a configured SecurityManager or without a 
-       a SecurityConf will default to role guest with read=true, write=true,
-       create=false.
-  -->
-  <!--mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:name=testTopic,service=Topic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <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.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:name=securedTopic,service=Topic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="publisher" read="true" write="true" create="false"/>
-      </security>
-    </attribute>
-  </mbean-->
-
-  <!--mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:name=testDurableTopic,service=Topic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="SecurityConf">
-       <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.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:name=testQueue,service=Queue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-    <attribute name="MessageCounterHistoryDayLimit">-1</attribute>
-    <attribute name="SecurityConf">
-      <security>
-        <role name="guest" read="true" write="true"/>
-        <role name="publisher" read="true" write="true" create="false"/>
-        <role name="noacc" read="false" write="false" create="false"/>
-      </security>
-    </attribute>
-  </mbean>
-  <!--mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:name=A,service=Queue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean-->
-  <!--mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:name=B,service=Queue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean-->
-  <!--mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:name=C,service=Queue">
-	 <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean-->
-  <!--mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:name=D,service=Queue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean-->
-  <!--mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:name=ex,service=Queue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean-->
-
-</server>




More information about the jboss-cvs-commits mailing list