[jboss-cvs] JBossAS SVN: r101855 - in branches/Branch_Hornet_Temporary_2/testsuite/src: main/org/jboss/test/util/jms and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 4 10:48:34 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-03-04 10:48:33 -0500 (Thu, 04 Mar 2010)
New Revision: 101855
Added:
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-jms.xml
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-queues.xml
Removed:
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-configuration.xml
Modified:
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java
Log:
Test changes
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java 2010-03-04 15:47:51 UTC (rev 101854)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java 2010-03-04 15:48:33 UTC (rev 101855)
@@ -319,8 +319,8 @@
try
{
- // FIXME Need to wait for asynchrounous bootstrap of container
- Thread.sleep(5000);
+// // FIXME Need to wait for asynchrounous bootstrap of container
+// Thread.sleep(5000);
startReceiverThread();
}
catch (Exception e)
@@ -373,7 +373,7 @@
try
{
- JMSDestinationsUtil.destroyDestinations();
+ JMSDestinationsUtil.destroyEveryDestination();
}
catch (Throwable t)
{
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java 2010-03-04 15:47:51 UTC (rev 101854)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java 2010-03-04 15:48:33 UTC (rev 101855)
@@ -54,7 +54,13 @@
JMSTestAdmin.getAdmin().destroyCreatedDestinations();
}
+ public static void destroyEveryDestination() throws Exception
+ {
+ destroyDestinations();
+ JMSTestAdmin.getAdmin().destroyEveryDestination();
+ }
+
public static void purgeQueue(String jndi) throws Exception
{
InitialContext ctx = new InitialContext();
Deleted: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-configuration.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-configuration.xml 2010-03-04 15:47:51 UTC (rev 101854)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-configuration.xml 2010-03-04 15:48:33 UTC (rev 101855)
@@ -1,23 +0,0 @@
-<configuration xmlns="urn:hornetq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
-
- <address-settings>
- <!--default for catch all-->
- <address-setting match="jms.queue.*">
- <max-delivery-attempts>5</max-delivery-attempts>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- </address-setting>
- <address-setting match="jms.topic.*">
- <max-delivery-attempts>${test.messagedriven.DLQMaxResent}</max-delivery-attempts>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- </address-setting>
- </address-settings>
-
-</configuration>
\ No newline at end of file
Added: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-jms.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-jms.xml (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-jms.xml 2010-03-04 15:48:33 UTC (rev 101855)
@@ -0,0 +1,45 @@
+<?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">
+
+
+ <topic name="testTopic">
+ <entry name="/topic/testTopic"/>
+ </topic>
+
+ <topic name="securedTopic">
+ <entry name="/topic/securedTopic"/>
+ </topic>
+
+ <topic name="testDurableTopic">
+ <entry name="/topic/testDurableTopic"/>
+ </topic>
+
+ <queue name="testQueue">
+ <entry name="/queue/testQueue"/>
+ </queue>
+
+ <queue name="A">
+ <entry name="/queue/A"/>
+ </queue>
+
+ <queue name="B">
+ <entry name="/queue/B"/>
+ </queue>
+
+ <queue name="C">
+ <entry name="/queue/C"/>
+ </queue>
+
+ <queue name="D">
+ <entry name="/queue/D"/>
+ </queue>
+
+ <queue name="ex">
+ <entry name="/queue/ex"/>
+ </queue>
+
+
+</configuration>
Added: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-queues.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-queues.xml (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/hornetq-queues.xml 2010-03-04 15:48:33 UTC (rev 101855)
@@ -0,0 +1,54 @@
+<configuration xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq ../../../../src/schemas/hornetq-configuration.xsd ">
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="jms.queue.*">
+ <max-delivery-attempts>5</max-delivery-attempts>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ </address-setting>
+ <address-setting match="jms.topic.*">
+ <max-delivery-attempts>${test.messagedriven.DLQMaxResent}</max-delivery-attempts>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ </address-setting>
+ </address-settings>
+
+ <security-settings>
+ <security-setting match="jms.topic.testTopic">
+ <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.securedTopic">
+ <permission type="send" roles="publisher"/>
+ <permission type="consume" roles="publisher"/>
+ <permission type="manage" roles="publisher"/>
+ </security-setting>
+ <security-setting match="jms.topic.testDurableTopic">
+ <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.queue.testQueue">
+ <permission type="send" roles="guest,publisher"/>
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="manage" roles="guest,publisher"/>
+ </security-setting>
+ </security-settings>
+</configuration>
+
More information about the jboss-cvs-commits
mailing list