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

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

Author: wolfc
Date: 2007-11-05 03:42:57 -0500 (Mon, 05 Nov 2007)
New Revision: 66724

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

Modified: branches/JBPAPP_4_2/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-05 08:06:19 UTC (rev 66723)
+++ branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-05 08:42:57 UTC (rev 66724)
@@ -2308,6 +2308,8 @@
             <include name="*.xml"/>
          </fileset>
       </copy>
+      
+      <mq2jbm basedir="${resources}/test/mdbtransactions"/>
    </target>
 
    <target name="longlived"

Copied: branches/JBPAPP_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-mq-service.xml (from rev 66721, branches/JBPAPP_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-mq-service.xml	                        (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-mq-service.xml	2007-11-05 08:42:57 UTC (rev 66724)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=queuetest">
+      <attribute name="JNDIName">queue/mdbtest</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=badcreationtest">
+      <attribute name="JNDIName">queue/badcreationmdb</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=rollbackqueuetest">
+      <attribute name="JNDIName">queue/rollbackmdbtest</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=queue21test">
+      <attribute name="JNDIName">queue/mdb21test</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+</server>

Deleted: branches/JBPAPP_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml	2007-11-05 08:06:19 UTC (rev 66723)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/mdbtransactions/mdbtransactionstest-service.xml	2007-11-05 08:42:57 UTC (rev 66724)
@@ -1,23 +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=queuetest">
-      <attribute name="JNDIName">queue/mdbtest</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=badcreationtest">
-      <attribute name="JNDIName">queue/badcreationmdb</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=rollbackqueuetest">
-      <attribute name="JNDIName">queue/rollbackmdbtest</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=queue21test">
-      <attribute name="JNDIName">queue/mdb21test</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/mdbtransactions/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java	2007-11-05 08:06:19 UTC (rev 66723)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java	2007-11-05 08:42:57 UTC (rev 66724)
@@ -175,7 +175,7 @@
    public static Test suite() throws Exception
    {
       return getDeploySetup(MDBUnitTestCase.class,
-            "mdbtransactionstest-service.xml, mdbtransactions-test.jar");
+            "mdbtransactionstest-${jboss.jms.provider}-service.xml, mdbtransactions-test.jar");
    }
 
 }
\ No newline at end of file