[jboss-cvs] JBossAS SVN: r74357 - in projects/ejb3/trunk: testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 10 12:37:51 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-06-10 12:37:50 -0400 (Tue, 10 Jun 2008)
New Revision: 74357
Modified:
projects/ejb3/trunk/core/src/main/resources/META-INF/persistence.properties
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/EntityTest.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityUnitTestCase.java
projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/META-INF/persistence.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/classloader/META-INF/persistence.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/classloader/optimistic/META-INF/persistence.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/optimistic/META-INF/persistence.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/providedprefix/META-INF/persistence.xml
Log:
[EJBTHREE-1405] Convert clustered entity caching to use Hibernate RegionFactory
Modified: projects/ejb3/trunk/core/src/main/resources/META-INF/persistence.properties
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/META-INF/persistence.properties 2008-06-10 15:54:54 UTC (rev 74356)
+++ projects/ejb3/trunk/core/src/main/resources/META-INF/persistence.properties 2008-06-10 16:37:50 UTC (rev 74357)
@@ -6,9 +6,11 @@
#hibernate.hbm2ddl.auto=create-drop
#hibernate.hbm2ddl.auto=create
hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-# Clustered cache with TreeCache
-#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
-#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
+# Clustered cache with JBoss Cache
+#hibernate.cache.region.factory_class=org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory
+#hibernate.cache.region.jbc2.cachefactory" value="java:CacheManager"/>
+#hibernate.cache.region.jbc2.cfg.entity" value="pessimistic-entity"/>
+#hibernate.cache.region.jbc2.cfg.query" value="local-query"/>
#hibernate.dialect=org.hibernate.dialect.HSQLDialect
hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/EntityTest.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/EntityTest.java 2008-06-10 15:54:54 UTC (rev 74356)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/EntityTest.java 2008-06-10 16:37:50 UTC (rev 74357)
@@ -31,13 +31,13 @@
*/
public interface EntityTest
{
- void getCache(boolean optimistic);
+ void getCache(String cacheConfigName);
Customer createCustomer();
Customer findByCustomerId(Integer id);
- void loadedFromCache();
+ String loadedFromCache();
void cleanup();
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java 2008-06-10 15:54:54 UTC (rev 74356)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java 2008-06-10 16:37:50 UTC (rev 74357)
@@ -68,17 +68,19 @@
{
}
- public void getCache(boolean optimistic)
+ public void getCache(String cacheConfigName)
{
- if (optimistic)
- cacheConfigName = "optimistic-shared";
- else
- cacheConfigName = "pessimistic-shared";
+ this.cacheConfigName = cacheConfigName;
try
{
- //Just to initialise the cache with a listener
- Cache<Object, Object> cache = getCache();
+ if (cache == null && cacheConfigName != null)
+ {
+ CacheManager cm = CacheManagerLocator.getCacheManagerLocator().getCacheManager(null);
+ cache = cm.getCache(cacheConfigName, true);
+ cache.start();
+ }
+
if (listener == null)
{
listener = new MyListener();
@@ -160,20 +162,21 @@
}
}
- public void loadedFromCache()
+ public String loadedFromCache()
{
System.out.println("CHECK CACHE");
try
{
System.out.println("Visited: " + listener.visited);
if (!listener.visited.contains("Customer#1"))
- throw new RuntimeException("Customer#1 was not in cache");
+ return "Customer#1 was not in cache";
if (!listener.visited.contains("Contact#1"))
- throw new RuntimeException("Contact#1 was not in cache");
+ return "Contact#1 was not in cache";
if (!listener.visited.contains("Contact#2"))
- throw new RuntimeException("Contact2#1 was not in cache");
+ return "Contact2#1 was not in cache";
if (!listener.visited.contains("Customer.contacts#1"))
- throw new RuntimeException("Customer.contacts#1 was not in cache");
+ return "Customer.contacts#1 was not in cache";
+ return null;
}
finally
{
@@ -188,11 +191,9 @@
{
try
{
- if (listener != null)
+ if (cache != null && listener != null)
{
- Cache c = getCache();
- if (c != null)
- c.removeCacheListener(listener);
+ cache.removeCacheListener(listener);
}
}
catch (Exception e)
@@ -231,17 +232,6 @@
}
}
- private Cache<Object, Object> getCache() throws Exception
- {
- if (cache == null && cacheConfigName != null)
- {
- CacheManager cm = CacheManagerLocator.getCacheManagerLocator().getCacheManager(null);
- cache = cm.getCache(cacheConfigName, true);
- cache.start();
- }
- return cache;
- }
-
@CacheListener
public class MyListener
{
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java 2008-06-10 15:54:54 UTC (rev 74356)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java 2008-06-10 16:37:50 UTC (rev 74357)
@@ -116,7 +116,7 @@
InitialContext ctx1 = new InitialContext(prop1);
tester1 = (EntityTest)ctx1.lookup("EntityTestBean/remote");
- tester0.getCache(isOptimistic());
+ tester0.getCache(getCacheConfigName());
Customer customer = tester0.createCustomer();
@@ -143,30 +143,21 @@
// so pause a bit before checking node 1
sleep(SLEEP_TIME);
- //Now connect to cache on node2 and make sure it is all there
+ //Now connect to cache on node2 and make sure it is all there
+ tester1.getCache(getCacheConfigName());
- tester1.getCache(isOptimistic());
-
System.out.println("Find node 1");
customer = tester1.findByCustomerId(customer.getId());
//Check everything was in cache
System.out.println("Check cache 1");
- try
- {
- tester1.loadedFromCache();
- }
- catch (Exception e)
- {
- log.info("Call to tester1 failed", e);
- fail(e.getMessage());
- }
+ assertEquals(null, tester1.loadedFromCache());
}
- protected boolean isOptimistic()
+ protected String getCacheConfigName()
{
- return false;
+ return "pessimistic-shared";
}
public static Test suite() throws Exception
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityUnitTestCase.java 2008-06-10 15:54:54 UTC (rev 74356)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityUnitTestCase.java 2008-06-10 16:37:50 UTC (rev 74357)
@@ -46,9 +46,9 @@
}
@Override
- protected boolean isOptimistic()
+ protected String getCacheConfigName()
{
- return true;
+ return "optimistic-shared";
}
}
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/META-INF/persistence.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/META-INF/persistence.xml 2008-06-10 15:54:54 UTC (rev 74356)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/META-INF/persistence.xml 2008-06-10 16:37:50 UTC (rev 74357)
@@ -3,8 +3,10 @@
<persistence-unit name="tempdb" transaction-type="JTA">
<jta-data-source>java:/DefaultDS</jta-data-source>
<properties>
- <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
- <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
+ <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory"/>
+ <property name="hibernate.cache.region.jbc2.cachefactory" value="java:CacheManager"/>
+ <property name="hibernate.cache.region.jbc2.cfg.entity" value="pessimistic-shared"/>
+ <property name="hibernate.cache.region.jbc2.cfg.query" value="pessimistic-shared"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
</properties>
</persistence-unit>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/classloader/META-INF/persistence.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/classloader/META-INF/persistence.xml 2008-06-10 15:54:54 UTC (rev 74356)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/classloader/META-INF/persistence.xml 2008-06-10 16:37:50 UTC (rev 74357)
@@ -3,8 +3,10 @@
<persistence-unit name="tempdb" transaction-type="JTA">
<jta-data-source>java:/ClusteredEntityTestDS</jta-data-source>
<properties>
- <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
- <property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
+ <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory"/>
+ <property name="hibernate.cache.region.jbc2.cachefactory" value="java:CacheManager"/>
+ <property name="hibernate.cache.region.jbc2.cfg.entity" value="pessimistic-entity"/>
+ <property name="hibernate.cache.region.jbc2.cfg.query" value="pessimistic-shared"/>
<!-- Must use "update" here as we do a test of redeployment and don't want to drop the db -->
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.cache.use_query_cache" value="true"/>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/classloader/optimistic/META-INF/persistence.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/classloader/optimistic/META-INF/persistence.xml 2008-06-10 15:54:54 UTC (rev 74356)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/classloader/optimistic/META-INF/persistence.xml 2008-06-10 16:37:50 UTC (rev 74357)
@@ -3,8 +3,10 @@
<persistence-unit name="tempdb" transaction-type="JTA">
<jta-data-source>java:/ClusteredEntityTestDS</jta-data-source>
<properties>
- <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.OptimisticTreeCacheProviderHook"/>
- <property name="hibernate.cache.jbc2.config.name" value="optimistic-shared"/>
+ <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory"/>
+ <property name="hibernate.cache.region.jbc2.cachefactory" value="java:CacheManager"/>
+ <property name="hibernate.cache.jbc2.cfg.entity" value="optimistic-entity"/>
+ <property name="hibernate.cache.region.jbc2.cfg.query" value="optimistic-shared"/>
<!-- Must use "update" here as we do a test of redeployment and don't want to drop the db -->
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.cache.use_query_cache" value="true"/>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/optimistic/META-INF/persistence.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/optimistic/META-INF/persistence.xml 2008-06-10 15:54:54 UTC (rev 74356)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/optimistic/META-INF/persistence.xml 2008-06-10 16:37:50 UTC (rev 74357)
@@ -3,8 +3,10 @@
<persistence-unit name="tempdb" transaction-type="JTA">
<jta-data-source>java:/DefaultDS</jta-data-source>
<properties>
- <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.OptimisticTreeCacheProviderHook"/>
- <property name="hibernate.cache.jbc2.config.name" value="optimistic-shared"/>
+ <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory"/>
+ <property name="hibernate.cache.region.jbc2.cachefactory" value="java:CacheManager"/>
+ <property name="hibernate.cache.region.jbc2.cfg.entity" value="optimistic-shared"/>
+ <property name="hibernate.cache.region.jbc2.cfg.query" value="optimistic-shared"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
</properties>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/providedprefix/META-INF/persistence.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/providedprefix/META-INF/persistence.xml 2008-06-10 15:54:54 UTC (rev 74356)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/clusteredentity/providedprefix/META-INF/persistence.xml 2008-06-10 16:37:50 UTC (rev 74357)
@@ -3,8 +3,10 @@
<persistence-unit name="tempdb" transaction-type="JTA">
<jta-data-source>java:/ClusteredEntityTestDS</jta-data-source>
<properties>
- <property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
- <property name="hibernate.cache.jbc2.config.name" value="pessimistic-shared"/>
+ <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory"/>
+ <property name="hibernate.cache.region.jbc2.cachefactory" value="java:CacheManager"/>
+ <property name="hibernate.cache.region.jbc2.cfg.entity" value="pessimistic-entity"/>
+ <property name="hibernate.cache.region.jbc2.cfg.query" value="pessimistic-shared"/>
<!-- Must use "update" here as we do a test of redeployment and don't want to drop the db -->
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.cache.use_query_cache" value="true"/>
More information about the jboss-cvs-commits
mailing list