[Jboss-cvs] JBossAS SVN: r56829 - branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3/src/resources/test/cache

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

Author: bill.burke at jboss.com
Date: 2006-09-13 22:11:46 -0400 (Wed, 13 Sep 2006)
New Revision: 56829

Modified:
   branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3/src/resources/test/cache/testejb3-cache-service.xml
   branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3/src/resources/test/cache/testejb3-statefulcache-service.xml
Log:
race condition in test

Modified: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3/src/resources/test/cache/testejb3-cache-service.xml
===================================================================
--- branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3/src/resources/test/cache/testejb3-cache-service.xml	2006-09-14 01:27:45 UTC (rev 56828)
+++ branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3/src/resources/test/cache/testejb3-cache-service.xml	2006-09-14 02:11:46 UTC (rev 56829)
@@ -8,7 +8,7 @@
                                    READ_UNCOMMITTED
                                    NONE
       -->
-      <attribute name="IsolationLevel">READ_UNCOMMITTED</attribute>
+      <attribute name="IsolationLevel">READ_UNCOMMITTED</attribute>   
 
       <!--     Valid modes are LOCAL
                                REPL_ASYNC
@@ -36,34 +36,13 @@
                <attribute name="maxNodes">5000</attribute>
                <attribute name="timeToIdleSeconds">1000</attribute>
             </region>
+
          </config>
       </attribute>
 
-      <attribute name="CacheLoaderConfiguration">
-            <config>
-                <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
-                <passivation>true</passivation>
-                <preload>/</preload>
-                <shared>false</shared>
 
-                <!-- we can now have multiple cache loaders, which get chained -->
-                <cacheloader>
-                    <class>org.jboss.ejb3.cache.tree.PassivationCacheLoader</class>
-                    <!-- same as the old CacheLoaderConfig attribute -->
-                    <properties>
-                        location=server/all/tmp/stateful
-                    </properties>
-                    <!-- whether the cache loader writes are asynchronous -->
-                    <async>false</async>
-                    <!-- only one cache loader in the chain may set fetchPersistentState to true.
-                        An exception is thrown if more than one cache loader sets this to true. -->
-                    <fetchPersistentState>true</fetchPersistentState>
-                    <!-- determines whether this cache loader ignores writes - defaults to false. -->
-                    <ignoreModifications>false</ignoreModifications>
-                </cacheloader>
-
-            </config>
-        </attribute>
+      <attribute name="CacheLoaderClass">org.jboss.ejb3.cache.tree.PassivationCacheLoader</attribute>
+      <attribute name="CacheLoaderConfig">location=stateful</attribute>
    </mbean>
 
 </server>

Modified: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3/src/resources/test/cache/testejb3-statefulcache-service.xml
===================================================================
--- branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3/src/resources/test/cache/testejb3-statefulcache-service.xml	2006-09-14 01:27:45 UTC (rev 56828)
+++ branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3/src/resources/test/cache/testejb3-statefulcache-service.xml	2006-09-14 02:11:46 UTC (rev 56829)
@@ -40,32 +40,10 @@
          </config>
       </attribute>
 
-      <attribute name="CacheLoaderConfiguration">
-            <config>
-                <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
-                <passivation>true</passivation>
-                <preload>/</preload>
-                <shared>false</shared>
 
-                <!-- we can now have multiple cache loaders, which get chained -->
-                <cacheloader>
-                    <class>org.jboss.ejb3.cache.tree.StatefulCacheLoader</class>
-                    <!-- same as the old CacheLoaderConfig attribute -->
-                    <properties>
-                        location=server/all/tmp/stateful
-                    </properties>
-                    <!-- whether the cache loader writes are asynchronous -->
-                    <async>false</async>
-                    <!-- only one cache loader in the chain may set fetchPersistentState to true.
-                        An exception is thrown if more than one cache loader sets this to true. -->
-                    <fetchPersistentState>true</fetchPersistentState>
-                    <!-- determines whether this cache loader ignores writes - defaults to false. -->
-                    <ignoreModifications>false</ignoreModifications>
-                </cacheloader>
+      <attribute name="CacheLoaderClass">org.jboss.ejb3.cache.tree.StatefulCacheLoader</attribute>
+      <attribute name="CacheLoaderConfig">location=stateful</attribute>
+   </mbean>     
 
-            </config>
-        </attribute>
-   </mbean>
-
 </server>