[jboss-cvs] JBossAS SVN: r66859 - in branches/Branch_4_2/testsuite: src/resources/resendmdb/META-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 8 06:37:48 EST 2007
Author: adrian at jboss.org
Date: 2007-11-08 06:37:48 -0500 (Thu, 08 Nov 2007)
New Revision: 66859
Modified:
branches/Branch_4_2/testsuite/imports/test-jars.xml
branches/Branch_4_2/testsuite/src/resources/resendmdb/META-INF/ejb-jar.xml
branches/Branch_4_2/testsuite/src/resources/resendmdb/META-INF/jboss.xml
Log:
[JBAS-4945] - Change the test to use the old JMSContainerInvoker where the original problem was seen.
Modified: branches/Branch_4_2/testsuite/imports/test-jars.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/test-jars.xml 2007-11-08 11:36:54 UTC (rev 66858)
+++ branches/Branch_4_2/testsuite/imports/test-jars.xml 2007-11-08 11:37:48 UTC (rev 66859)
@@ -132,6 +132,7 @@
_jars-pooled,
_jars-proxycompiler,
_jars-readahead,
+ _jars-resendmdb,
_jars-retry,
_jars-scoped,
_jars-security,
Modified: branches/Branch_4_2/testsuite/src/resources/resendmdb/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/resendmdb/META-INF/ejb-jar.xml 2007-11-08 11:36:54 UTC (rev 66858)
+++ branches/Branch_4_2/testsuite/src/resources/resendmdb/META-INF/ejb-jar.xml 2007-11-08 11:37:48 UTC (rev 66859)
@@ -21,18 +21,19 @@
<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-property>
- <activation-config-property-name>DLQJNDIName</activation-config-property-name>
- <activation-config-property-value>queue/B</activation-config-property-value>
- </activation-config-property>
</activation-config>
</message-driven>
<message-driven>
<ejb-name>MDBB</ejb-name>
- <ejb-class>org.jboss.test.resendmdb.beans.RollbackMDB</ejb-class>
+ <ejb-class>org.jboss.test.resendmdb.beans.ResendMDB</ejb-class>
<messaging-type>javax.jms.MessageListener</messaging-type>
<transaction-type>Container</transaction-type>
+ <env-entry>
+ <env-entry-name>queueName</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>queue/C</env-entry-value>
+ </env-entry>
<activation-config>
<activation-config-property>
<activation-config-property-name>destination</activation-config-property-name>
@@ -43,22 +44,13 @@
<activation-config-property-value>javax.jms.Queue</activation-config-property-value>
</activation-config-property>
</activation-config>
- <activation-config-property>
- <activation-config-property-name>DLQJNDIName</activation-config-property-name>
- <activation-config-property-value>queue/C</activation-config-property-value>
- </activation-config-property>
</message-driven>
<message-driven>
<ejb-name>MDBC</ejb-name>
- <ejb-class>org.jboss.test.resendmdb.beans.ResendMDB</ejb-class>
+ <ejb-class>org.jboss.test.resendmdb.beans.RollbackMDB</ejb-class>
<messaging-type>javax.jms.MessageListener</messaging-type>
<transaction-type>Container</transaction-type>
- <env-entry>
- <env-entry-name>queueName</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>queue/D</env-entry-value>
- </env-entry>
<activation-config>
<activation-config-property>
<activation-config-property-name>destination</activation-config-property-name>
Modified: branches/Branch_4_2/testsuite/src/resources/resendmdb/META-INF/jboss.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/resendmdb/META-INF/jboss.xml 2007-11-08 11:36:54 UTC (rev 66858)
+++ branches/Branch_4_2/testsuite/src/resources/resendmdb/META-INF/jboss.xml 2007-11-08 11:37:48 UTC (rev 66859)
@@ -9,7 +9,7 @@
<ejb-name>MDBA</ejb-name>
<invoker-bindings>
<invoker>
- <invoker-proxy-binding-name>jms-message-inflow-driven-bean</invoker-proxy-binding-name>
+ <invoker-proxy-binding-name>message-driven-bean-a</invoker-proxy-binding-name>
</invoker>
</invoker-bindings>
</message-driven>
@@ -17,7 +17,7 @@
<ejb-name>MDBB</ejb-name>
<invoker-bindings>
<invoker>
- <invoker-proxy-binding-name>jms-message-inflow-driven-bean</invoker-proxy-binding-name>
+ <invoker-proxy-binding-name>message-driven-bean</invoker-proxy-binding-name>
</invoker>
</invoker-bindings>
</message-driven>
@@ -25,9 +25,58 @@
<ejb-name>MDBC</ejb-name>
<invoker-bindings>
<invoker>
- <invoker-proxy-binding-name>jms-message-inflow-driven-bean</invoker-proxy-binding-name>
+ <invoker-proxy-binding-name>message-driven-bean-c</invoker-proxy-binding-name>
</invoker>
</invoker-bindings>
</message-driven>
</enterprise-beans>
+
+ <invoker-proxy-bindings>
+ <invoker-proxy-binding>
+ <name>message-driven-bean-a</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>
+ <CreateJBossMQDestination>true</CreateJBossMQDestination>
+ <!-- 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>
+ <DLQConfig>
+ <DestinationQueue>queue/B</DestinationQueue>
+ <MaxTimesRedelivered>10</MaxTimesRedelivered>
+ <TimeToLive>0</TimeToLive>
+ </DLQConfig>
+ </MDBConfig>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+ <invoker-proxy-binding>
+ <name>message-driven-bean-c</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>
+ <CreateJBossMQDestination>true</CreateJBossMQDestination>
+ <!-- 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>
+ <DLQConfig>
+ <DestinationQueue>queue/D</DestinationQueue>
+ <MaxTimesRedelivered>10</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