[jboss-cvs] JBossAS SVN: r66654 - in branches/JBPAPP_4_2/ejb3: src/resources/test/mdb and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 1 10:42:55 EDT 2007
Author: wolfc
Date: 2007-11-01 10:42:55 -0400 (Thu, 01 Nov 2007)
New Revision: 66654
Added:
branches/JBPAPP_4_2/ejb3/src/resources/test/mdb/mdbtest-mq-service.xml
Removed:
branches/JBPAPP_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml
Modified:
branches/JBPAPP_4_2/ejb3/build-test.xml
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/ConcurrentMDBUnitTestCase.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MetricsUnitTestCase.java
Log:
JBPAPP-347: Fixed dd for mdb test
Modified: branches/JBPAPP_4_2/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-test.xml 2007-11-01 14:41:22 UTC (rev 66653)
+++ branches/JBPAPP_4_2/ejb3/build-test.xml 2007-11-01 14:42:55 UTC (rev 66654)
@@ -2474,6 +2474,8 @@
<include name="*.xml"/>
</fileset>
</copy>
+
+ <mq2jbm basedir="${resources}/test/mdb"/>
</target>
<target name="mdbtopic"
Copied: branches/JBPAPP_4_2/ejb3/src/resources/test/mdb/mdbtest-mq-service.xml (from rev 66642, branches/JBPAPP_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/mdb/mdbtest-mq-service.xml (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/mdb/mdbtest-mq-service.xml 2007-11-01 14:42:55 UTC (rev 66654)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+<!--
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=cmtmdbtest">
+ <attribute name="JNDIName">queue/cmtmdbtest</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=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=defaultedqueuetest">
+ <attribute name="JNDIName">queue/defaultedmdbtest</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=overridedefaultedqueuetest">
+ <attribute name="JNDIName">queue/overridedefaultedmdbtest</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=nondurablequeuetest">
+ <attribute name="JNDIName">queue/nondurablemdbtest</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=bmtqueuetest">
+ <attribute name="JNDIName">queue/bmtmdbtest</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=overridequeuetest">
+ <attribute name="JNDIName">queue/overridequeuetest</attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+
+ <mbean code="org.jboss.mq.server.jmx.Topic"
+ name="jboss.mq.destination:service=Topic,name=topictest">
+ <attribute name="JNDIName">topic/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=transactionmdbtest">
+ <attribute name="JNDIName">queue/transactionmdbtest</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=expirationtest">
+ <attribute name="JNDIName">queue/expirationmdbtest</attribute>
+<!-- <attribute name="ExpiryDestination">jboss.mq.destination:name=DLQ,service=Queue</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=expirytest">
+ <attribute name="JNDIName">queue/expirytest</attribute>
+<!-- <attribute name="ExpiryDestination">jboss.mq.destination:name=DLQ,service=Queue</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=dlqtest">
+ <attribute name="JNDIName">queue/dlqtest</attribute>
+<!-- <attribute name="ExpiryDestination">jboss.mq.destination:name=DLQ,service=Queue</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=concurrentqueuetest">
+ <attribute name="JNDIName">queue/concurrentmdbtest</attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+
+</server>
Deleted: branches/JBPAPP_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml 2007-11-01 14:41:22 UTC (rev 66653)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml 2007-11-01 14:42:55 UTC (rev 66654)
@@ -1,86 +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=cmtmdbtest">
- <attribute name="JNDIName">queue/cmtmdbtest</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=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=defaultedqueuetest">
- <attribute name="JNDIName">queue/defaultedmdbtest</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=overridedefaultedqueuetest">
- <attribute name="JNDIName">queue/overridedefaultedmdbtest</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=nondurablequeuetest">
- <attribute name="JNDIName">queue/nondurablemdbtest</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=bmtqueuetest">
- <attribute name="JNDIName">queue/bmtmdbtest</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=overridequeuetest">
- <attribute name="JNDIName">queue/overridequeuetest</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
- <mbean code="org.jboss.mq.server.jmx.Topic"
- name="jboss.mq.destination:service=Topic,name=topictest">
- <attribute name="JNDIName">topic/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=transactionmdbtest">
- <attribute name="JNDIName">queue/transactionmdbtest</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=expirationtest">
- <attribute name="JNDIName">queue/expirationmdbtest</attribute>
-<!-- <attribute name="ExpiryDestination">jboss.mq.destination:name=DLQ,service=Queue</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=expirytest">
- <attribute name="JNDIName">queue/expirytest</attribute>
-<!-- <attribute name="ExpiryDestination">jboss.mq.destination:name=DLQ,service=Queue</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=dlqtest">
- <attribute name="JNDIName">queue/dlqtest</attribute>
-<!-- <attribute name="ExpiryDestination">jboss.mq.destination:name=DLQ,service=Queue</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=concurrentqueuetest">
- <attribute name="JNDIName">queue/concurrentmdbtest</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/clusteredjms/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java 2007-11-01 14:41:22 UTC (rev 66653)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java 2007-11-01 14:42:55 UTC (rev 66654)
@@ -39,7 +39,6 @@
import org.jboss.ejb3.test.clusteredjms.TestStatus;
import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
-import org.jboss.test.JBossClusteredTestCase;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/ConcurrentMDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/ConcurrentMDBUnitTestCase.java 2007-11-01 14:41:22 UTC (rev 66653)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/ConcurrentMDBUnitTestCase.java 2007-11-01 14:42:55 UTC (rev 66654)
@@ -120,7 +120,7 @@
public static Test suite() throws Exception
{
return getDeploySetup(ConcurrentMDBUnitTestCase.class,
- "mdbtest-service.xml, mdb-test.jar");
+ "mdbtest-${jboss.jms.provider}-service.xml, mdb-test.jar");
}
}
\ No newline at end of file
Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java 2007-11-01 14:41:22 UTC (rev 66653)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java 2007-11-01 14:42:55 UTC (rev 66654)
@@ -694,7 +694,7 @@
public static Test suite() throws Exception
{
return getDeploySetup(MDBUnitTestCase.class,
- "mdbtest-service.xml, mdb-test.jar");
+ "mdbtest-${jboss.jms.provider}-service.xml, mdb-test.jar");
}
}
\ No newline at end of file
Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MetricsUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MetricsUnitTestCase.java 2007-11-01 14:41:22 UTC (rev 66653)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MetricsUnitTestCase.java 2007-11-01 14:42:55 UTC (rev 66654)
@@ -76,7 +76,7 @@
public static Test suite() throws Exception
{
- return getDeploySetup(MetricsUnitTestCase.class, "mdbtest-service.xml, mdb-test.jar");
+ return getDeploySetup(MetricsUnitTestCase.class, "mdbtest-${jboss.jms.provider}-service.xml, mdb-test.jar");
}
}
More information about the jboss-cvs-commits
mailing list