[jboss-cvs] JBossAS SVN: r58551 - trunk/ejb3/src/main/org/jboss/ejb3/entity

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

Author: bstansberry at jboss.com
Date: 2006-11-18 06:18:17 -0500 (Sat, 18 Nov 2006)
New Revision: 58551

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/entity/TreeCacheProviderHook.java
Log:
Use Hibernate Cache impls that can talk to JBC 2.0

Modified: trunk/ejb3/src/main/org/jboss/ejb3/entity/TreeCacheProviderHook.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/entity/TreeCacheProviderHook.java	2006-11-18 11:17:49 UTC (rev 58550)
+++ trunk/ejb3/src/main/org/jboss/ejb3/entity/TreeCacheProviderHook.java	2006-11-18 11:18:17 UTC (rev 58551)
@@ -23,16 +23,9 @@
 
 import java.util.Properties;
 
-import javax.management.ObjectName;
-
 import org.hibernate.cache.Cache;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.CacheProvider;
-import org.hibernate.cache.TreeCache;
-import org.jboss.cache.TreeCacheMBean;
-import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
 
 /**
  * Support for a standalone JBossCache (TreeCache) instance.  The JBossCache is configured
@@ -42,9 +35,8 @@
  */
 public class TreeCacheProviderHook implements CacheProvider
 {
+   private TransactionalCacheFactory cacheFactory;
 
-   private org.jboss.cache.TreeCache cache;
-
    /**
     * Construct and configure the Cache representation of a named cache region.
     *
@@ -56,7 +48,8 @@
     */
    public Cache buildCache(String regionName, Properties properties) throws CacheException
    {
-      return new TreeCache(cache, regionName, TxUtil.getTransactionManager());
+//      return new TreeCache(cache, regionName, TxUtil.getTransactionManager());
+      return cacheFactory.buildCache(regionName, properties);
    }
 
    public boolean isMinimalPutsEnabledByDefault()
@@ -78,16 +71,17 @@
     */
    public void start(Properties properties)
    {
-      try
-      {
-         ObjectName mbeanObjectName = new ObjectName((String) properties.get("hibernate.treecache.mbean.object_name"));
-         TreeCacheMBean mbean = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, mbeanObjectName, MBeanServerLocator.locateJBoss());
-         cache = mbean.getInstance();
-      }
-      catch (Exception e)
-      {
-         throw new CacheException(e);
-      }
+      cacheFactory = TransactionalCacheFactory.getFactory(properties);
+//      try
+//      {
+//         ObjectName mbeanObjectName = new ObjectName((String) properties.get("hibernate.treecache.mbean.object_name"));
+//         TreeCacheMBean mbean = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, mbeanObjectName, MBeanServerLocator.locateJBoss());
+//         cache = mbean.getInstance();
+//      }
+//      catch (Exception e)
+//      {
+//         throw new CacheException(e);
+//      }
    }
 
    public void stop()