[jboss-cvs] JBossAS SVN: r105914 - in branches/JBPAPP_5_1/testsuite: src/main/org/jboss/test/messagedriven/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 10 00:50:10 EDT 2010
Author: clebert.suconic at jboss.com
Date: 2010-06-10 00:50:09 -0400 (Thu, 10 Jun 2010)
New Revision: 105914
Added:
branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/
branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/
branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/ejb-jar.xml
branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/hornetq-jms.xml
branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/hornetq-queues.xml
branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/jboss.xml
Modified:
branches/JBPAPP_5_1/testsuite/imports/sections/mdb.xml
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerDurableTopicMessageDrivenUnitTestCase.java
Log:
fixing tests
Modified: branches/JBPAPP_5_1/testsuite/imports/sections/mdb.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/sections/mdb.xml 2010-06-10 04:15:28 UTC (rev 105913)
+++ branches/JBPAPP_5_1/testsuite/imports/sections/mdb.xml 2010-06-10 04:50:09 UTC (rev 105914)
@@ -42,6 +42,15 @@
</fileset>
</jar>
+ <jar destfile="${build.lib}/jmscontainerinvoker-hornetq.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/messagedriven/beans/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/messagedriven/jmscontainerinvoker-hornetq">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
+
<!-- build testmessagedriven.jar -->
<jar destfile="${build.lib}/testmessagedriven.jar">
<fileset dir="${build.classes}">
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerDurableTopicMessageDrivenUnitTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerDurableTopicMessageDrivenUnitTestCase.java 2010-06-10 04:15:28 UTC (rev 105913)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerDurableTopicMessageDrivenUnitTestCase.java 2010-06-10 04:50:09 UTC (rev 105914)
@@ -29,6 +29,7 @@
import org.jboss.test.messagedriven.support.JMSContainerInvokerSimpleMessageDrivenUnitTest;
import org.jboss.test.messagedriven.support.Operation;
import org.jboss.test.messagedriven.support.SendMessageOperation;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Basic tests of message driven beans
@@ -45,7 +46,7 @@
public String getMDBDeployment()
{
- return "jmscontainerinvoker.jar";
+ return JMSDestinationsUtil.isHornetQ() ? "jmscontainerinvoker-hornetq.jar" : "jmscontainerinvoker.jar";
}
public Operation[] getDeliveryActiveOperations() throws Exception
Added: branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/ejb-jar.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/ejb-jar.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/ejb-jar.xml 2010-06-10 04:50:09 UTC (rev 105914)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
+ version="2.1">
+
+ <enterprise-beans>
+
+ <message-driven>
+ <ejb-name>TestMDB</ejb-name>
+ <ejb-class>org.jboss.test.messagedriven.beans.TestMessageDriven</ejb-class>
+ <messaging-type>javax.jms.MessageListener</messaging-type>
+ <transaction-type>${test.messagedriven.transactionType}</transaction-type>
+ <activation-config>
+ <activation-config-property>
+ <activation-config-property-name>destination</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.destination}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>destinationType</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.destinationType}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>subscriptionDurability</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.durability}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>clientID</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.clientID}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>subscriptionName</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.subscriptionName}</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+ </message-driven>
+
+ <message-driven>
+ <ejb-name>TestDLQ</ejb-name>
+ <ejb-class>org.jboss.test.messagedriven.beans.TestMessageDriven</ejb-class>
+ <messaging-type>javax.jms.MessageListener</messaging-type>
+ <transaction-type>Bean</transaction-type>
+ <activation-config>
+ <activation-config-property>
+ <activation-config-property-name>destination</activation-config-property-name>
+ <activation-config-property-value>queue/DLQ</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>destinationType</activation-config-property-name>
+ <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+ </message-driven>
+
+ </enterprise-beans>
+
+ <assembly-descriptor>
+
+ <container-transaction>
+ <method>
+ <ejb-name>TestMDB</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>${test.messagedriven.transactionAttribute}</trans-attribute>
+ </container-transaction>
+
+ </assembly-descriptor>
+
+</ejb-jar>
Added: branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/hornetq-jms.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/hornetq-jms.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/hornetq-jms.xml 2010-06-10 04:50:09 UTC (rev 105914)
@@ -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/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/hornetq-queues.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/hornetq-queues.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/hornetq-queues.xml 2010-06-10 04:50:09 UTC (rev 105914)
@@ -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>
+
Added: branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/jboss.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/jboss.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jmscontainerinvoker-hornetq/META-INF/jboss.xml 2010-06-10 04:50:09 UTC (rev 105914)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<jboss>
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>TestMDB</ejb-name>
+ <local-jndi-name>TestMDB</local-jndi-name>
+ <mdb-user>${test.messagedriven.user}</mdb-user>
+ <mdb-passwd>${test.messagedriven.password}</mdb-passwd>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>jms-container-invoker-driven-bean</invoker-proxy-binding-name>
+ </invoker>
+ </invoker-bindings>
+ </message-driven>
+ </enterprise-beans>
+ <invoker-proxy-bindings>
+ <invoker-proxy-binding>
+ <name>jms-container-invoker-driven-bean</name>
+ <invoker-mbean>default</invoker-mbean>
+ <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
+ <proxy-factory-config>
+ <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
+ <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
+ <!-- WARN: Don't set this to zero until a bug in the pooled executor is fixed -->
+ <MinimumSize>1</MinimumSize>
+ <MaximumSize>15</MaximumSize>
+ <KeepAliveMillis>30000</KeepAliveMillis>
+ <MaxMessages>1</MaxMessages>
+ <MDBConfig>
+ <ReconnectIntervalSec>10</ReconnectIntervalSec>
+ <DeliveryActive>${test.messagedriven.DeliveryActive}</DeliveryActive>
+ <DLQConfig>
+ <DestinationQueue>queue/DLQ</DestinationQueue>
+ <MaxTimesRedelivered>${test.messagedriven.DLQMaxResent}</MaxTimesRedelivered>
+ <TimeToLive>0</TimeToLive>
+ </DLQConfig>
+ </MDBConfig>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+ </invoker-proxy-bindings>
+</jboss>
More information about the jboss-cvs-commits
mailing list