[jboss-cvs] JBossAS SVN: r73422 - in projects/ejb3/trunk/core/src: test/resources/test/ejbthree1136 and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2008-05-15 11:08:08 -0400 (Thu, 15 May 2008)
New Revision: 73422

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
   projects/ejb3/trunk/core/src/test/resources/test/ejbthree1136/jboss-service.xml
Log:
[EJBTHREE-1362] Scope clustered SFSBs to the JBC /sfsb region

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2008-05-15 15:07:20 UTC (rev 73421)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2008-05-15 15:08:08 UTC (rev 73422)
@@ -67,7 +67,8 @@
  */
 public class StatefulTreeCache implements ClusteredStatefulCache
 {
-   private static final int FQN_SIZE = 3; // depth of fqn that we store the session in.
+   private static final int FQN_SIZE = 4; // depth of fqn that we store the session in.
+   private static final String SFSB = "sfsb";
    private static final int DEFAULT_BUCKET_COUNT = 100;
 
    private static final String[] DEFAULT_HASH_BUCKETS = new String[DEFAULT_BUCKET_COUNT];
@@ -346,7 +347,7 @@
          throw new RuntimeException("Cannot get cache with name " + name, e1);
       }
 
-      cacheNode = new Fqn(new Object[] { this.ejbContainer.getDeploymentPropertyListString() });
+      cacheNode = new Fqn(new Object[] { SFSB, this.ejbContainer.getDeploymentPropertyListString() });
       
       // Try to create an eviction region per ejb
       region = cache.getRegion(cacheNode, true);

Modified: projects/ejb3/trunk/core/src/test/resources/test/ejbthree1136/jboss-service.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/test/ejbthree1136/jboss-service.xml	2008-05-15 15:07:20 UTC (rev 73421)
+++ projects/ejb3/trunk/core/src/test/resources/test/ejbthree1136/jboss-service.xml	2008-05-15 15:08:08 UTC (rev 73422)
@@ -8,8 +8,9 @@
       <attribute name="CacheManager"><inject bean="CacheManager"/></attribute>
       
       <attribute name="CacheConfigName">sfsb-cache</attribute>
-
-      <attribute name="RegionRoot">/jboss:j2ee:jar=ejbthree1136.jar,name=DoNothingBean,service=EJB3</attribute>
+
+      <!-- Remove the 'ear=ejbthree1136.jar' part if the object name changes -->ejbthree
+      <attribute name="RegionRoot">/sfsb/ear=ejbthree1136.jar,jar=ejbthree1136.jar,name=DoNothingBean,service=EJB3</attribute>
    </mbean>
 
 </server>