[jboss-cvs] JBossAS SVN: r66728 - in branches/JBPAPP_4_2/ejb3: src/resources/test/strictpool and 1 other directories.

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

Author: wolfc
Date: 2007-11-05 07:44:02 -0500 (Mon, 05 Nov 2007)
New Revision: 66728

Added:
   branches/JBPAPP_4_2/ejb3/src/resources/test/strictpool/strictpool_mdbtest-mq-service.xml
Removed:
   branches/JBPAPP_4_2/ejb3/src/resources/test/strictpool/strictpool_mdbtest-service.xml
Modified:
   branches/JBPAPP_4_2/ejb3/build-test.xml
   branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java
Log:
JBPAPP-347: Fixed dd for strictpool test

Modified: branches/JBPAPP_4_2/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-05 12:36:19 UTC (rev 66727)
+++ branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-05 12:44:02 UTC (rev 66728)
@@ -2150,6 +2150,8 @@
             <include name="*.xml"/>
          </fileset>
       </copy>
+      
+      <mq2jbm basedir="${resources}/test/strictpool"/>
    </target>
 
    <target name="relationships"

Copied: branches/JBPAPP_4_2/ejb3/src/resources/test/strictpool/strictpool_mdbtest-mq-service.xml (from rev 66721, branches/JBPAPP_4_2/ejb3/src/resources/test/strictpool/strictpool_mdbtest-service.xml)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/strictpool/strictpool_mdbtest-mq-service.xml	                        (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/strictpool/strictpool_mdbtest-mq-service.xml	2007-11-05 12:44:02 UTC (rev 66728)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=queueA">
+      <attribute name="JNDIName">queue/queueA</attribute>
+      <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">
+      <attribute name="JNDIName">queue/queueB</attribute>
+      <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">
+      <attribute name="JNDIName">queue/queueC</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+</server>

Deleted: branches/JBPAPP_4_2/ejb3/src/resources/test/strictpool/strictpool_mdbtest-service.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/strictpool/strictpool_mdbtest-service.xml	2007-11-05 12:36:19 UTC (rev 66727)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/strictpool/strictpool_mdbtest-service.xml	2007-11-05 12:44:02 UTC (rev 66728)
@@ -1,21 +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=queueA">
-      <attribute name="JNDIName">queue/queueA</attribute>
-      <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">
-      <attribute name="JNDIName">queue/queueB</attribute>
-      <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">
-      <attribute name="JNDIName">queue/queueC</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-</server>

Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java	2007-11-05 12:36:19 UTC (rev 66727)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java	2007-11-05 12:44:02 UTC (rev 66728)
@@ -135,7 +135,7 @@
 
    public static Test suite() throws Exception
    {
-      return getDeploySetup(StrictPoolUnitTestCase.class, "strictpool_mdbtest-service.xml, strictpool-test.jar");
+      return getDeploySetup(StrictPoolUnitTestCase.class, "strictpool_mdbtest-${jboss.jms.provider}-service.xml, strictpool-test.jar");
 
    }