[jboss-cvs] JBossAS SVN: r67774 - in branches/Branch_4_2/testsuite/src: main/org/jboss/test/jca/inflowmdb and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2007-12-03 11:14:16 -0500 (Mon, 03 Dec 2007)
New Revision: 67774

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflow/TestMessageListener.java
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapterInflow.java
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflowmdb/TestMDBMessageListener.java
   branches/Branch_4_2/testsuite/src/resources/jca/inflowmdb/META-INF/ejb-jar.xml
Log:
[JBAS-4981] - Write a test for delivering messages inside and outside transactions in jca inflow where the transaction is started by the endpoint.

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflow/TestMessageListener.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflow/TestMessageListener.java	2007-12-03 13:48:44 UTC (rev 67773)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflow/TestMessageListener.java	2007-12-03 16:14:16 UTC (rev 67774)
@@ -30,4 +30,5 @@
 public interface TestMessageListener
 {
    void deliverMessage(TestMessage message);
+   void deliverMessageNoTransaction(TestMessage message);
 }

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapterInflow.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapterInflow.java	2007-12-03 13:48:44 UTC (rev 67773)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapterInflow.java	2007-12-03 16:14:16 UTC (rev 67774)
@@ -62,5 +62,9 @@
       ((TestMessageListener) endpoint).deliverMessage(message);
       if (message.acknowledged == false)
          throw new Exception("MDB did not acknowledge the message");
+      message = new TestMessage();
+      ((TestMessageListener) endpoint).deliverMessageNoTransaction(message);
+      if (message.acknowledged == false)
+         throw new Exception("MDB did not acknowledge the message");
    }
 }

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflowmdb/TestMDBMessageListener.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflowmdb/TestMDBMessageListener.java	2007-12-03 13:48:44 UTC (rev 67773)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/inflowmdb/TestMDBMessageListener.java	2007-12-03 16:14:16 UTC (rev 67774)
@@ -42,6 +42,11 @@
    {
       message.acknowledge();
    }
+   
+   public void deliverMessageNoTransaction(TestMessage message)
+   {
+      deliverMessage(message);
+   }
 
    public void ejbCreate()
    {

Modified: branches/Branch_4_2/testsuite/src/resources/jca/inflowmdb/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/jca/inflowmdb/META-INF/ejb-jar.xml	2007-12-03 13:48:44 UTC (rev 67773)
+++ branches/Branch_4_2/testsuite/src/resources/jca/inflowmdb/META-INF/ejb-jar.xml	2007-12-03 16:14:16 UTC (rev 67774)
@@ -41,37 +41,6 @@
         <transaction-type>Container</transaction-type>
       </message-driven>
 
-<!--
-      <message-driven>
-         <description>An MDB that accepts mail messages</description>
-         <ejb-name>MailMDB</ejb-name>
-         <ejb-class>org.jboss.test.jca.inflowmdb.TestJavaMailMDB</ejb-class>
-         <messaging-type>org.jboss.resource.adapter.mail.inflow.MailListener</messaging-type>
-         <activation-config>
-            <activation-config-property>
-               <activation-config-property-name>mailServer</activation-config-property-name>
-               <activation-config-property-value>${mailhost:mailhost}</activation-config-property-value>
-            </activation-config-property>
-            <activation-config-property>
-               <activation-config-property-name>mailFolder</activation-config-property-name>
-               <activation-config-property-value>INBOX</activation-config-property-value>
-            </activation-config-property>
-            <activation-config-property>
-               <activation-config-property-name>storeProtocol</activation-config-property-name>
-               <activation-config-property-value>imap</activation-config-property-value>
-            </activation-config-property>
-            <activation-config-property>
-               <activation-config-property-name>userName</activation-config-property-name>
-               <activation-config-property-value>jduke</activation-config-property-value>
-            </activation-config-property>
-            <activation-config-property>
-               <activation-config-property-name>password</activation-config-property-name>
-               <activation-config-property-value>theduke</activation-config-property-value>
-            </activation-config-property>
-        </activation-config>
-        <transaction-type>Container</transaction-type>
-      </message-driven>
--->
    </enterprise-beans>
 
    <assembly-descriptor>
@@ -83,6 +52,13 @@
          </method>
          <trans-attribute>Required</trans-attribute>
       </container-transaction>
+      <container-transaction>
+         <method>
+            <ejb-name>TestMDB</ejb-name>
+            <method-name>deliverMessageNoTransaction</method-name>
+         </method>
+         <trans-attribute>NotSupported</trans-attribute>
+      </container-transaction>
 
    </assembly-descriptor>