[jboss-cvs] JBossAS SVN: r101191 - in branches/Branch_Hornet_Temporary_2/testsuite/src: main/org/jboss/test/mdb/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 19 17:47:02 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-02-19 17:47:02 -0500 (Fri, 19 Feb 2010)
New Revision: 101191
Added:
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/hornetq-jms.xml
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/hornetq-queues.xml
Removed:
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/jboss-service.xml
Modified:
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java
Log:
fixing a few tests
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java 2010-02-19 22:29:34 UTC (rev 101190)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java 2010-02-19 22:47:02 UTC (rev 101191)
@@ -629,6 +629,8 @@
TopicConnectionFactory topicFactory = (TopicConnectionFactory) context.lookup(TOPIC_FACTORY);
topicConnection = topicFactory.createTopicConnection("john", "needle");
+
+ topicConnection.setClientID("john_id");
topicConnection.start();
@@ -821,6 +823,9 @@
getLog().debug("Create topic connection");
TopicConnectionFactory topicFactory = (TopicConnectionFactory) context.lookup(TOPIC_FACTORY);
topicConnection = topicFactory.createTopicConnection("john", "needle");
+
+ topicConnection.setClientID("john_id");
+
topicConnection.start();
try
@@ -931,6 +936,9 @@
getLog().debug("Create topic connection");
TopicConnectionFactory topicFactory = (TopicConnectionFactory) context.lookup(TOPIC_FACTORY);
topicConnection = topicFactory.createTopicConnection("john", "needle");
+
+ topicConnection.setClientID("john_id");
+
topicConnection.start();
try
@@ -967,7 +975,7 @@
getLog().debug("Subscribing to topic, with an empty selector");
subSession = topicConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- subscriber = subSession.createDurableSubscriber(topic, "test", " ", false);
+ subscriber = subSession.createDurableSubscriber(topic, "test", "", false);
getLog().debug("Send a message");
message = sendSession.createTextMessage("Message2");
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java 2010-02-19 22:29:34 UTC (rev 101190)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java 2010-02-19 22:47:02 UTC (rev 101191)
@@ -270,10 +270,15 @@
Test wrapper = new JBossTestSetup(suite)
{
+
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
protected void setUp() throws Exception
{
super.setUp();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ deploy(loader.getResource("hornetq/hornetq-jms.xml").toString());
+ deploy(loader.getResource("hornetq/hornetq-queues.xml").toString());
deploy("mdb.jar");
}
@@ -289,6 +294,22 @@
{
getLog().warn("Unable to undeploy mdb.jar", ignored);
}
+ try
+ {
+ undeploy(loader.getResource("hornetq/hornetq-jms.xml").toString());
+ }
+ catch (Exception ignored)
+ {
+ getLog().warn("Unable to undeploy hornetq/hornetq-jms.xml", ignored);
+ }
+ try
+ {
+ undeploy(loader.getResource("hornetq/hornetq-queues.xml").toString());
+ }
+ catch (Exception ignored)
+ {
+ getLog().warn("Unable to undeploy hornetq/hornetq-jms.xml", ignored);
+ }
}
};
Added: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/hornetq-jms.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/hornetq-jms.xml (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/hornetq-jms.xml 2010-02-19 22:47:02 UTC (rev 101191)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+ <queue name="myMDBQueue">
+ <entry name="/queue/myMDBQueue"/>
+ <entry name="anotherContext/QueueInADifferentContext"/>
+ </queue>
+
+
+
+ <topic name="myMDBTopic">
+ <entry name="/topic/myMDBTopic"/>
+ <entry name="anotherContext/TopicInADifferentContext"/>
+ </topic>
+
+</configuration>
Added: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/hornetq-queues.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/hornetq-queues.xml (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/hornetq-queues.xml 2010-02-19 22:47:02 UTC (rev 101191)
@@ -0,0 +1,26 @@
+<configuration xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq ../../../../src/schemas/hornetq-configuration.xsd ">
+
+ <security-settings>
+ <security-setting match="jms.queue.myMDBQueue">
+ <permission type="send" roles="guest,publisher,durpublisher"/>
+ <permission type="consume" roles="guest,publisher,durpublisher"/>
+ <permission type="createDurableQueue" roles="guest,durpublisher"/>
+ <permission type="deleteDurableQueue" roles="guest,durpublisher"/>
+ <permission type="createTempQueue" roles="guest,durpublisher"/>
+ <permission type="deleteTempQueue" roles="guest,durpublisher"/>
+ <permission type="manage" roles="guest,publisher,durpublisher"/>
+ </security-setting>
+ <security-setting match="jms.topic.myMDTopic">
+ <permission type="send" roles="guest,publisher,durpublisher"/>
+ <permission type="consume" roles="guest,publisher,durpublisher"/>
+ <permission type="createDurableQueue" roles="guest,durpublisher"/>
+ <permission type="deleteDurableQueue" roles="guest,durpublisher"/>
+ <permission type="createTempQueue" roles="guest,durpublisher"/>
+ <permission type="deleteTempQueue" roles="guest,durpublisher"/>
+ <permission type="manage" roles="guest,publisher,durpublisher"/>
+ </security-setting>
+ </security-settings>
+</configuration>
+
Deleted: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/jboss-service.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/jboss-service.xml 2010-02-19 22:29:34 UTC (rev 101190)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/mdb/jboss-service.xml 2010-02-19 22:47:02 UTC (rev 101191)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE server>
-
-<server>
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.mq.destination:service=Queue,name=myMDBQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="SecurityConfig">
- <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.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=myMDBTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="SecurityConfig">
- <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
More information about the jboss-cvs-commits
mailing list