[jboss-cvs] JBossAS SVN: r61806 - in branches/Branch_4_2/ejb3/src: resources/test/mdb and 1 other directories.

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

Author: bdecoste
Date: 2007-03-28 14:17:06 -0400 (Wed, 28 Mar 2007)
New Revision: 61806

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java
   branches/Branch_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java
Log:
[EJBTHREE-890] fixed test for rejected JIRA and added comment to PoolClass annotation for proper use

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java	2007-03-28 18:16:01 UTC (rev 61805)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/annotation/ejb/PoolClass.java	2007-03-28 18:17:06 UTC (rev 61806)
@@ -29,7 +29,9 @@
 import org.jboss.ejb3.Pool;
 
 /**
- * Annotation for specifying the pool class to manage thread pooling for a bean
+ * Annotation for specifying the pool class to manage thread pooling for a stateless session
+ * bean. To control the pool size of an MDB, use the "minSession" and "maxSession" 
+ * ActivationConfigProperty
  *
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  * @version $Revision$

Modified: branches/Branch_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml	2007-03-28 18:16:01 UTC (rev 61805)
+++ branches/Branch_4_2/ejb3/src/resources/test/mdb/mdbtest-service.xml	2007-03-28 18:17:06 UTC (rev 61806)
@@ -55,6 +55,13 @@
       <attribute name="JNDIName">queue/transactionmdbtest</attribute>
       <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
    </mbean>
+   
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=expirationtest">
+      <attribute name="JNDIName">queue/expirationmdbtest</attribute>
+<!--       <attribute name="ExpiryDestination">jboss.mq.destination:name=DLQ,service=Queue</attribute>  -->
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
 
    <mbean code="org.jboss.mq.server.jmx.Queue"
       name="jboss.mq.destination:service=Queue,name=expirytest">

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java	2007-03-28 18:16:01 UTC (rev 61805)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java	2007-03-28 18:17:06 UTC (rev 61806)
@@ -37,9 +37,9 @@
 @MessageDriven(activationConfig =
 {
    @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-   @ActivationConfigProperty(propertyName="destination", propertyValue="queue/expirationmdbtest")
+   @ActivationConfigProperty(propertyName="destination", propertyValue="queue/expirationmdbtest"),
+   @ActivationConfigProperty(propertyName="maxSession", propertyValue="1")
 })
- at PoolClass(value=org.jboss.ejb3.StrictMaxPool.class, maxSize=1)
 public class ExpirationTestMDB implements MessageListener
 {
    public void onMessage(Message message)