[jboss-cvs] JBossAS SVN: r101094 - in branches/Branch_Hornet_Temporary_2/testsuite: src/main/org/jboss/test/cts/ejb and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 17 17:19:31 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-02-17 17:19:30 -0500 (Wed, 17 Feb 2010)
New Revision: 101094
Added:
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/hornetq/
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/hornetq/hornetq-jms.xml
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/hornetq/hornetq-queues.xml
Modified:
branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/client.xml
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/ejb/StrictlyPooledMDB.java
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/cts/META-INF/jboss.xml
Log:
Changing testsuite to work with MDB 2
Modified: branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/client.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/client.xml 2010-02-17 22:18:33 UTC (rev 101093)
+++ branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/client.xml 2010-02-17 22:19:30 UTC (rev 101094)
@@ -16,7 +16,7 @@
<metainf dir="${build.resources}/client">
<include name="jboss-app.xml"/>
</metainf>
- <fileset dir="${build.lib}/dest-free">
+ <fileset dir="${build.lib}">
<include name="cts.jar"/>
</fileset>
<fileset dir="${build.lib}">
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/ejb/StrictlyPooledMDB.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/ejb/StrictlyPooledMDB.java 2010-02-17 22:18:33 UTC (rev 101093)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/ejb/StrictlyPooledMDB.java 2010-02-17 22:19:30 UTC (rev 101094)
@@ -110,7 +110,8 @@
public void onMessage(Message message)
{
int count = incActiveCount();
- log.debug("Begin onMessage, activeCount="+count+", ctx="+ctx);
+
+ for (int i = 0 ; i < 20; i++) log.debug("Begin onMessage, activeCount="+count+", ctx="+ctx);
try
{
Message reply = null;
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/cts/META-INF/jboss.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/cts/META-INF/jboss.xml 2010-02-17 22:18:33 UTC (rev 101093)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/cts/META-INF/jboss.xml 2010-02-17 22:19:30 UTC (rev 101094)
@@ -101,12 +101,12 @@
<ejb-name>StrictlyPooledMDB</ejb-name>
<destination-jndi-name>queue/A</destination-jndi-name>
<configuration-name>Strictly Pooled Message Driven Bean</configuration-name>
- <!-- <depends>org.hornetq:service=Queue,module=JMS,name="A",type=Queue</depends> -->
+ <depends>org.hornetq:module=JMS,name="A",type=DeployedQueue</depends>
</message-driven>
<message-driven>
<ejb-name>SubclassMDB</ejb-name>
<destination-jndi-name>queue/C</destination-jndi-name>
- <!-- <depends>org.hornetq:service=Queue,module=JMS,name="C",type=Queue</depends> -->
+ <depends>org.hornetq:module=JMS,name="C",type=DeployedQueue</depends>
</message-driven>
</enterprise-beans>
Added: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/hornetq/hornetq-jms.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/hornetq/hornetq-jms.xml (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/hornetq/hornetq-jms.xml 2010-02-17 22:19:30 UTC (rev 101094)
@@ -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/hornetq/hornetq-queues.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/hornetq/hornetq-queues.xml (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/hornetq/hornetq-queues.xml 2010-02-17 22:19:30 UTC (rev 101094)
@@ -0,0 +1,36 @@
+<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.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