[jboss-cvs] JBossAS SVN: r105830 - in branches/JBPAPP_5_1/testsuite: src/main/org/jboss/test/messagedriven/support and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 8 23:47:22 EDT 2010
Author: clebert.suconic at jboss.com
Date: 2010-06-08 23:47:22 -0400 (Tue, 08 Jun 2010)
New Revision: 105830
Added:
branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/
branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/
branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/ejb-jar.xml
branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/jboss-mdb-client-id.xml
branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-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/support/BasicMessageDrivenUnitTest.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-09 02:59:32 UTC (rev 105829)
+++ branches/JBPAPP_5_1/testsuite/imports/sections/mdb.xml 2010-06-09 03:47:22 UTC (rev 105830)
@@ -52,6 +52,17 @@
</fileset>
</jar>
+ <!-- build testmessagedriven-hornetq.jar -->
+ <jar destfile="${build.lib}/testmessagedriven-hornetq.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/messagedriven/beans/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/messagedriven/jar-hornetq">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
+
+
<!-- build testmessagedriven.sar -->
<jar destfile="${build.lib}/testmessagedriven.sar">
<fileset dir="${build.classes}">
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java 2010-06-09 02:59:32 UTC (rev 105829)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java 2010-06-09 03:47:22 UTC (rev 105830)
@@ -100,7 +100,7 @@
protected Thread thread;
protected boolean running = false;
- protected String mdbjar = "testmessagedriven.jar";
+ protected String mdbjar = JMSDestinationsUtil.isJBM() ? "testmessagedriven.jar" : "testmessagedriven-hornetq.jar";
protected String mbeansar = "testmessagedriven.sar";
protected ObjectName jmxDestination = ObjectNameFactory.create("does:not=exist");
Added: branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/ejb-jar.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/ejb-jar.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/ejb-jar.xml 2010-06-09 03:47:22 UTC (rev 105830)
@@ -0,0 +1,50 @@
+<?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> TODO: place this back when http://jira.jboss.com/jira/browse/JBAS-4585 is done -->
+ <transaction-type>Container</transaction-type>
+ </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> TODO: Place this back when http://jira.jboss.com/jira/browse/JBAS-4585 is done -->
+ <trans-attribute>Required</trans-attribute>
+ </container-transaction>
+
+ </assembly-descriptor>
+
+</ejb-jar>
Added: branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/jboss-mdb-client-id.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/jboss-mdb-client-id.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/jboss-mdb-client-id.xml 2010-06-09 03:47:22 UTC (rev 105830)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>TestMDB</ejb-name>
+ <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-property>
+ <activation-config-property-name>user</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.user}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>password</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.password}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>DLQMaxResent</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.DLQMaxResent}</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+ <mdb-client-id>testclient1</mdb-client-id>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>jms-message-inflow-driven-bean</invoker-proxy-binding-name>
+ </invoker>
+ </invoker-bindings>
+ <create-destination>${test.messagedriven.createDestination}</create-destination>
+ </message-driven>
+ <message-driven>
+ <ejb-name>TestDLQ</ejb-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>jms-message-inflow-driven-bean</invoker-proxy-binding-name>
+ </invoker>
+ </invoker-bindings>
+ </message-driven>
+ </enterprise-beans>
+</jboss>
Added: branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/jboss.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/jboss.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/messagedriven/jar-hornetq/META-INF/jboss.xml 2010-06-09 03:47:22 UTC (rev 105830)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>TestMDB</ejb-name>
+ <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-property>
+ <activation-config-property-name>user</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.user}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>password</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.password}</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>jms-message-inflow-driven-bean</invoker-proxy-binding-name>
+ </invoker>
+ </invoker-bindings>
+ <create-destination>${test.messagedriven.createDestination}</create-destination>
+ </message-driven>
+ <message-driven>
+ <ejb-name>TestDLQ</ejb-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>jms-message-inflow-driven-bean</invoker-proxy-binding-name>
+ </invoker>
+ </invoker-bindings>
+ </message-driven>
+ </enterprise-beans>
+</jboss>
More information about the jboss-cvs-commits
mailing list