User: pra
Date: 01/02/28 01:41:07
Modified: src/resources/mdb/META-INF ejb-jar.xml jboss.xml
Log:
Up to date to new MDB deployment descriptor; new test added for transaction
handling; error in build.sh corrected
Revision Changes Path
1.4 +39 -24 jbosstest/src/resources/mdb/META-INF/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
RCS file: /products/cvs/ejboss/jbosstest/src/resources/mdb/META-INF/ejb-jar.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ejb-jar.xml 2001/02/21 05:07:47 1.3
+++ ejb-jar.xml 2001/02/28 09:41:06 1.4
@@ -13,21 +13,12 @@
<message-driven>
<ejb-name>ObjectMessageBean</ejb-name>
<ejb-class>org.jboss.test.mdb.bean.ObjectMessageBean</ejb-class>
-<!--
- <jms-message-selector>JMSType='activityCompletion'</jms-message-selector>
--->
- <jms-message-selector></jms-message-selector>
- <!-- We also have the acknowledge-mode - AUTO_ACKNOWLEDGE |
DUPS_OK_AKNOWLEDGE - for bean managed transactions, and the subscription-durability
for topic destination types -->
- <transaction-type>Bean</transaction-type>
- <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
-
- <message-driven-destination>
- <jms-destination-type>javax.jms.Queue</jms-destination-type>
-<!--
-Only with topic
- <subscription-durability>Durable</subscription-durability>
--->
-<subscription-durability>NonDurable</subscription-durability>
+ <message-selector></message-selector>
+ <transaction-type>Bean</transaction-type>
+ <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
+ <message-driven-destination>
+ <destination-type>javax.jms.Queue</destination-type>
+ <subscription-durability>NonDurable</subscription-durability>
</message-driven-destination>
</message-driven>
@@ -35,15 +26,15 @@
<ejb-name>QueueBean</ejb-name>
<ejb-class>org.jboss.test.mdb.bean.QueueBean</ejb-class>
<!--
- <jms-message-selector>JMSType='activityCompletion'</jms-message-selector>
+ <message-selector>JMSType='activityCompletion'</message-selector>
-->
- <jms-message-selector></jms-message-selector>
+ <message-selector></message-selector>
<!-- We also have the acknowledge-mode - AUTO_ACKNOWLEDGE |
DUPS_OK_AKNOWLEDGE - for bean managed transactions, and the subscription-durability
for topic destination types -->
<transaction-type>Bean</transaction-type>
<acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
<message-driven-destination>
- <jms-destination-type>javax.jms.Queue</jms-destination-type>
+ <destination-type>javax.jms.Queue</destination-type>
<!--
Only with topic
<subscription-durability>Durable</subscription-durability>
@@ -55,15 +46,15 @@
<ejb-name>TopicBean</ejb-name>
<ejb-class>org.jboss.test.mdb.bean.TopicBean</ejb-class>
<!--
- <jms-message-selector>JMSType='activityCompletion'</jms-message-selector>
+ <message-selector>JMSType='activityCompletion'</message-selector>
-->
- <jms-message-selector></jms-message-selector>
+ <message-selector></message-selector>
<!-- We also have the acknowledge-mode - AUTO_ACKNOWLEDGE |
DUPS_OK_AKNOWLEDGE - for bean managed transactions, and the subscription-durability
for topic destination types -->
<transaction-type>Container</transaction-type>
<!-- <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode> -->
<message-driven-destination>
- <jms-destination-type>javax.jms.Topic</jms-destination-type>
+ <destination-type>javax.jms.Topic</destination-type>
<!--
Only with topic
<subscription-durability>Durable</subscription-durability>
@@ -75,15 +66,15 @@
<ejb-name>DurableTopicBean</ejb-name>
<ejb-class>org.jboss.test.mdb.bean.TopicBean</ejb-class>
<!--
- <jms-message-selector>JMSType='activityCompletion'</jms-message-selector>
+ <message-selector>JMSType='activityCompletion'</message-selector>
-->
- <jms-message-selector></jms-message-selector>
+ <message-selector></message-selector>
<!-- We also have the acknowledge-mode - AUTO_ACKNOWLEDGE |
DUPS_OK_AKNOWLEDGE - for bean managed transactions, and the subscription-durability
for topic destination types -->
<transaction-type>Container</transaction-type>
<!-- <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode> -->
<message-driven-destination>
- <jms-destination-type>javax.jms.Topic</jms-destination-type>
+ <destination-type>javax.jms.Topic</destination-type>
<!--
Only with topic
<subscription-durability>Durable</subscription-durability>
@@ -91,6 +82,17 @@
<subscription-durability>Durable</subscription-durability>
</message-driven-destination>
</message-driven>
+ <message-driven>
+ <ejb-name>ExQueueBean</ejb-name>
+ <ejb-class>org.jboss.test.mdb.bean.ExQueueBean</ejb-class>
+ <message-selector></message-selector>
+ <transaction-type>Container</transaction-type>
+
+ <message-driven-destination>
+ <destination-type>javax.jms.Queue</destination-type>
+ <subscription-durability>NonDurable</subscription-durability>
+ </message-driven-destination>
+ </message-driven>
</enterprise-beans>
@@ -113,6 +115,19 @@
<method>
<ejb-name>DurableTopicBean</ejb-name>
+
+ <method-name>*</method-name>
+
+ </method>
+ <!-- May also be NotSupported -->
+ <trans-attribute>Required</trans-attribute>
+
+ </container-transaction>
+ <container-transaction>
+
+ <method>
+
+ <ejb-name>ExQueueBean</ejb-name>
<method-name>*</method-name>
1.6 +5 -0 jbosstest/src/resources/mdb/META-INF/jboss.xml
Index: jboss.xml
===================================================================
RCS file: /products/cvs/ejboss/jbosstest/src/resources/mdb/META-INF/jboss.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jboss.xml 2001/02/21 05:07:47 1.5
+++ jboss.xml 2001/02/28 09:41:06 1.6
@@ -24,6 +24,11 @@
<mdb-passwd>needle</mdb-passwd>
<mdb-client-id>DurableSubscriberExample</mdb-client-id>
</message-driven>
+ <message-driven>
+ <ejb-name>ExQueueBean</ejb-name>
+ <configuration-name>Standard Message Driven Bean</configuration-name>
+ <destination-jndi-name>queue/ex</destination-jndi-name>
+ </message-driven>
<secure>false</secure>
</enterprise-beans>
</jboss>