[jboss-cvs] JBossAS SVN: r59421 - in branches/Branch_4_2/testsuite: . src/main/org/jboss/test/security/test src/resources/security/custom-secmgr src/resources/security/custom-secmgr/META-INF

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

Author: anil.saldhana at jboss.com
Date: 2007-01-08 15:04:36 -0500 (Mon, 08 Jan 2007)
New Revision: 59421

Added:
   branches/Branch_4_2/testsuite/src/resources/security/custom-secmgr/queues-service.xml
Modified:
   branches/Branch_4_2/testsuite/build.xml
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/security/test/CustomSecurityManagerTestCase.java
   branches/Branch_4_2/testsuite/src/resources/security/custom-secmgr/META-INF/jboss.xml
Log:
JBAS-3963: change queue names

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-01-08 19:19:00 UTC (rev 59420)
+++ branches/Branch_4_2/testsuite/build.xml	2007-01-08 20:04:36 UTC (rev 59421)
@@ -727,6 +727,7 @@
     <antcall target="tests-jacc-security"/>
     <antcall target="tests-jacc-securitymgr"/>
     <antcall target="tests-jacc-security-external"/>
+    <antcall target="tests-custom-securitymgr"/>
     <antcall target="tests-compatibility"/>
     <antcall target="tests-webservice-ssl"/>
     <antcall target="tests-unified"/>

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/security/test/CustomSecurityManagerTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/security/test/CustomSecurityManagerTestCase.java	2007-01-08 19:19:00 UTC (rev 59420)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/security/test/CustomSecurityManagerTestCase.java	2007-01-08 20:04:36 UTC (rev 59421)
@@ -97,12 +97,14 @@
          {
             super.setUp();
             Configuration.setConfiguration(new XMLLoginConfigImpl());
+            deploy(getResourceURL("security/custom-secmgr/queues-service.xml"));
             redeploy("custom-secmgrtests.ear"); 
             flushAuthCache();
          }
          protected void tearDown() throws Exception
          {
             undeploy("custom-secmgrtests.ear"); 
+            undeploy(getResourceURL("security/custom-secmgr/queues-service.xml"));
             super.tearDown();
          
          }

Modified: branches/Branch_4_2/testsuite/src/resources/security/custom-secmgr/META-INF/jboss.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/security/custom-secmgr/META-INF/jboss.xml	2007-01-08 19:19:00 UTC (rev 59420)
+++ branches/Branch_4_2/testsuite/src/resources/security/custom-secmgr/META-INF/jboss.xml	2007-01-08 20:04:36 UTC (rev 59421)
@@ -152,7 +152,7 @@
 
       <message-driven>
          <ejb-name>RunAsMDB</ejb-name>
-         <destination-jndi-name>queue/A</destination-jndi-name>
+         <destination-jndi-name>queue/QueueA</destination-jndi-name>
          <resource-ref>
             <res-ref-name>jms/QueFactory</res-ref-name>
             <jndi-name>ConnectionFactory</jndi-name>
@@ -160,7 +160,7 @@
       </message-driven>
       <message-driven>
          <ejb-name>RunAsWithRolesMDB</ejb-name>
-         <destination-jndi-name>queue/C</destination-jndi-name>
+         <destination-jndi-name>queue/QueueC</destination-jndi-name>
          <security-identity>
             <run-as-principal>RunAsWithRolesMDBPrincipal</run-as-principal>
          </security-identity>
@@ -171,7 +171,7 @@
       </message-driven>
       <message-driven>
          <ejb-name>DeepRunAsMDB</ejb-name>
-         <destination-jndi-name>queue/D</destination-jndi-name>
+         <destination-jndi-name>queue/QueueD</destination-jndi-name>
          <security-identity>
             <run-as-principal>InternalUser</run-as-principal>
          </security-identity>

Added: branches/Branch_4_2/testsuite/src/resources/security/custom-secmgr/queues-service.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/security/custom-secmgr/queues-service.xml	2007-01-08 19:19:00 UTC (rev 59420)
+++ branches/Branch_4_2/testsuite/src/resources/security/custom-secmgr/queues-service.xml	2007-01-08 20:04:36 UTC (rev 59421)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+      <mbean code="org.jboss.mq.server.jmx.Queue"
+       name="jboss.mq.destination:service=Queue,name=QueueA">
+       <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+     </mbean>
+     <mbean code="org.jboss.mq.server.jmx.Queue"
+       name="jboss.mq.destination:service=Queue,name=QueueB">
+       <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+     </mbean>
+     <mbean code="org.jboss.mq.server.jmx.Queue"
+         name="jboss.mq.destination:service=Queue,name=QueueC">
+         <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+     </mbean>
+     <mbean code="org.jboss.mq.server.jmx.Queue"
+         name="jboss.mq.destination:service=Queue,name=QueueD">
+       <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+     </mbean>
+</server>