[jboss-cvs] JBossAS SVN: r66659 - in branches/JBPAPP_4_2/ejb3: src/resources/test/dd/mdb and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 1 12:24:04 EDT 2007
Author: wolfc
Date: 2007-11-01 12:24:04 -0400 (Thu, 01 Nov 2007)
New Revision: 66659
Added:
branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-mq-service.xml
Removed:
branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml
Modified:
branches/JBPAPP_4_2/ejb3/build-test.xml
branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java
Log:
JBPAPP-347: Fixed dd for dd/mdb test
Modified: branches/JBPAPP_4_2/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-test.xml 2007-11-01 16:23:12 UTC (rev 66658)
+++ branches/JBPAPP_4_2/ejb3/build-test.xml 2007-11-01 16:24:04 UTC (rev 66659)
@@ -1355,6 +1355,8 @@
<include name="*.xml"/>
</fileset>
</copy>
+
+ <mq2jbm basedir="${resources}/test/dd/mdb"/>
</target>
<target name="jms"
Copied: branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-mq-service.xml (from rev 66642, branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-mq-service.xml (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-mq-service.xml 2007-11-01 16:24:04 UTC (rev 66659)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE server>
+
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=myMDBQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+ <attribute name="SecurityConf">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="noacc" read="false" write="false" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+ <mbean code="org.jboss.mq.server.jmx.Topic"
+ name="jboss.mq.destination:service=Topic,name=myMDBTopic">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
+ <attribute name="SecurityConf">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+ <mbean code="org.jboss.naming.NamingAlias"
+ name="jboss.test:test=mdb,alias=anotherContext/QueueInADifferentContext">
+ <attribute name="FromName">anotherContext/QueueInADifferentContext</attribute>
+ <attribute name="ToName">queue/myMDBQueue</attribute>
+ </mbean>
+ <mbean code="org.jboss.naming.NamingAlias"
+ name="jboss.test:test=mdb,alias=anotherContext/TopicInADifferentContext">
+ <attribute name="FromName">anotherContext/TopicInADifferentContext</attribute>
+ <attribute name="ToName">topic/myMDBTopic</attribute>
+ </mbean>
+</server>
\ No newline at end of file
Deleted: branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml 2007-11-01 16:23:12 UTC (rev 66658)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/dd-mdb-service.xml 2007-11-01 16:24:04 UTC (rev 66659)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE server>
-
-<server>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=myMDBQueue">
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
- <attribute name="SecurityConf">
- <security>
- <role name="guest" read="true" write="true"/>
- <role name="publisher" read="true" write="true" create="false"/>
- <role name="noacc" read="false" write="false" create="false"/>
- </security>
- </attribute>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.Topic"
- name="jboss.mq.destination:service=Topic,name=myMDBTopic">
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
- <attribute name="SecurityConf">
- <security>
- <role name="guest" read="true" write="true"/>
- <role name="publisher" read="true" write="true" create="false"/>
- <role name="durpublisher" read="true" write="true" create="true"/>
- </security>
- </attribute>
- </mbean>
- <mbean code="org.jboss.naming.NamingAlias"
- name="jboss.test:test=mdb,alias=anotherContext/QueueInADifferentContext">
- <attribute name="FromName">anotherContext/QueueInADifferentContext</attribute>
- <attribute name="ToName">queue/myMDBQueue</attribute>
- </mbean>
- <mbean code="org.jboss.naming.NamingAlias"
- name="jboss.test:test=mdb,alias=anotherContext/TopicInADifferentContext">
- <attribute name="FromName">anotherContext/TopicInADifferentContext</attribute>
- <attribute name="ToName">topic/myMDBTopic</attribute>
- </mbean>
-</server>
\ No newline at end of file
Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java 2007-11-01 16:23:12 UTC (rev 66658)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java 2007-11-01 16:24:04 UTC (rev 66659)
@@ -24,6 +24,8 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
+
import javax.jms.ObjectMessage;
import javax.jms.Queue;
import javax.jms.QueueConnection;
@@ -81,15 +83,30 @@
QueueConnection queueConnection;
TopicConnection topicConnection;
- static HashMap jndiToDestName = new HashMap();
+ static Map<String, String> jndiToDestName = new HashMap<String, String>();
static
{
- jndiToDestName.put("queue/testQueue", "QUEUE.testQueue");
- jndiToDestName.put("topic/testTopic", "TOPIC.testTopic");
- jndiToDestName.put("topic/testDurableTopic", "TOPIC.testDurableTopic");
- jndiToDestName.put("queue/ex", "QUEUE.ex");
- jndiToDestName.put("queue/A", "QUEUE.A");
- jndiToDestName.put("queue/B", "QUEUE.B");
+ String jbossJmsProvider = System.getProperty("jboss.jms.provider");
+ if(jbossJmsProvider.equals("mq"))
+ {
+ jndiToDestName.put("queue/testQueue", "QUEUE.testQueue");
+ jndiToDestName.put("topic/testTopic", "TOPIC.testTopic");
+ jndiToDestName.put("topic/testDurableTopic", "TOPIC.testDurableTopic");
+ jndiToDestName.put("queue/ex", "QUEUE.ex");
+ jndiToDestName.put("queue/A", "QUEUE.A");
+ jndiToDestName.put("queue/B", "QUEUE.B");
+ }
+ else if(jbossJmsProvider.equals("jbm"))
+ {
+ jndiToDestName.put("queue/testQueue", "JBossQueue[testQueue]");
+ jndiToDestName.put("topic/testTopic", "JBossTopic[testTopic]");
+ jndiToDestName.put("topic/testDurableTopic", "JBossTopic[testDurableTopic]");
+ jndiToDestName.put("queue/ex", "JBossQueue[ex]");
+ jndiToDestName.put("queue/A", "JBossQueue[A]");
+ jndiToDestName.put("queue/B", "JBossQueue[B]");
+ }
+ else
+ throw new IllegalStateException("Unknown jboss jms provider " + jbossJmsProvider);
}
@@ -285,7 +302,7 @@
suite.addTest(new MDBUnitTestCase("testWaitForCompletion",""));
suite.addTest(new MDBUnitTestCase("testQueue","queue/B"));
- return new JBossTestSetup(getDeploySetup(suite, "dd-mdb-service.xml, dd-mdb.jar"));
+ return new JBossTestSetup(getDeploySetup(suite, "dd-mdb-${jboss.jms.provider}-service.xml, dd-mdb.jar"));
}
}
More information about the jboss-cvs-commits
mailing list