[jboss-cvs] JBossAS SVN: r67123 - in trunk/ejb3/src: test/org/jboss/ejb3/test/dd/mdb/unit and 1 other directories.

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

Author: adrian at jboss.org
Date: 2007-11-15 06:28:58 -0500 (Thu, 15 Nov 2007)
New Revision: 67123

Added:
   trunk/ejb3/src/resources/test/invalidtxmdb/invalidtxmdbtest-service.xml
Removed:
   trunk/ejb3/src/resources/test/invalidtxmdb/mdbtest-service.xml
Modified:
   trunk/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/invalidtxmdb/unit/MDBUnitTestCase.java
Log:
[EJBTHREE-1113] - Give the queue deployment files unique names

Copied: trunk/ejb3/src/resources/test/invalidtxmdb/invalidtxmdbtest-service.xml (from rev 67062, trunk/ejb3/src/resources/test/invalidtxmdb/mdbtest-service.xml)
===================================================================
--- trunk/ejb3/src/resources/test/invalidtxmdb/invalidtxmdbtest-service.xml	                        (rev 0)
+++ trunk/ejb3/src/resources/test/invalidtxmdb/invalidtxmdbtest-service.xml	2007-11-15 11:28:58 UTC (rev 67123)
@@ -0,0 +1,8 @@
+<?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>
+</server>

Deleted: trunk/ejb3/src/resources/test/invalidtxmdb/mdbtest-service.xml
===================================================================
--- trunk/ejb3/src/resources/test/invalidtxmdb/mdbtest-service.xml	2007-11-15 11:24:03 UTC (rev 67122)
+++ trunk/ejb3/src/resources/test/invalidtxmdb/mdbtest-service.xml	2007-11-15 11:28:58 UTC (rev 67123)
@@ -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=queuetest">
-      <attribute name="JNDIName">queue/mdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-</server>

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java	2007-11-15 11:24:03 UTC (rev 67122)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java	2007-11-15 11:28:58 UTC (rev 67123)
@@ -306,6 +306,6 @@
     */
    public static Test suite() throws Exception
    {
-      return new JBossTestSetup(getDeploySetup(MDBUnitTestCase.class, "dd-mdb-jbossmq-destinations-service.xml, dd-mdb-service.xml, dd-mdb.jar"));
+      return new JBossTestSetup(getDeploySetup(MDBUnitTestCase.class, "mdbtest-service.xml, dd-mdb-jbossmq-destinations-service.xml, dd-mdb-service.xml, dd-mdb.jar"));
    }
 }
\ No newline at end of file

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/invalidtxmdb/unit/MDBUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/invalidtxmdb/unit/MDBUnitTestCase.java	2007-11-15 11:24:03 UTC (rev 67122)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/invalidtxmdb/unit/MDBUnitTestCase.java	2007-11-15 11:28:58 UTC (rev 67123)
@@ -81,7 +81,7 @@
 
    public static Test suite() throws Exception
    {
-      return getDeploySetup(MDBUnitTestCase.class, "mdbtest-service.xml, invalidtxmdb-test.jar");
+      return getDeploySetup(MDBUnitTestCase.class, "invalidtxmdbtest-service.xml, invalidtxmdb-test.jar");
    }
 
 }
\ No newline at end of file