[jboss-cvs] JBossAS SVN: r58543 - trunk/hibernate-int/src/main/org/jboss/hibernate/cache

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

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

Modified:
   trunk/hibernate-int/src/main/org/jboss/hibernate/cache/DeployedTreeCacheProvider.java
Log:
Use a Cache impl that can talk to JBC 2.0.0

Modified: trunk/hibernate-int/src/main/org/jboss/hibernate/cache/DeployedTreeCacheProvider.java
===================================================================
--- trunk/hibernate-int/src/main/org/jboss/hibernate/cache/DeployedTreeCacheProvider.java	2006-11-18 11:11:34 UTC (rev 58542)
+++ trunk/hibernate-int/src/main/org/jboss/hibernate/cache/DeployedTreeCacheProvider.java	2006-11-18 11:12:20 UTC (rev 58543)
@@ -15,8 +15,7 @@
 import org.hibernate.cache.Cache;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.CacheProvider;
-import org.jboss.cache.TreeCache;
-import org.jboss.cache.TreeCacheMBean;
+import org.jboss.cache.jmx.CacheJmxWrapperMBean;
 import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.tm.TransactionManagerLocator;
@@ -33,7 +32,7 @@
    public static final String OBJECT_NAME_PROP = "hibernate.treecache.objectName";
    public static final String DEFAULT_OBJECT_NAME = "jboss.cache:service=HibernateTreeCache";
 
-   private TreeCache deployedTreeCache;
+   private org.jboss.cache.Cache deployedTreeCache;
 
    public void start(Properties properties) throws CacheException
    {
@@ -49,18 +48,17 @@
          throw new CacheException( "Malformed TreeCache ObjectName");
       }
 
-      TreeCacheMBean mbean;
+      CacheJmxWrapperMBean mbean;
       try
       {
          MBeanServer server = MBeanServerLocator.locateJBoss();
-         mbean = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, objectName, server);
+         mbean = (CacheJmxWrapperMBean) MBeanProxyExt.create(CacheJmxWrapperMBean.class, objectName, server);
+         deployedTreeCache = mbean.getCache();
       }
       catch( Throwable t )
       {
          throw new CacheException( "Unable to locate TreeCache MBean under object name [" + configObjectName + "]" );
       }
-
-      deployedTreeCache = mbean.getInstance();
    }
 
    public void stop()
@@ -84,7 +82,7 @@
    public Cache buildCache(String name, Properties properties) throws CacheException
    {
       TransactionManager tm = TransactionManagerLocator.getInstance().locate(); 
-      return new org.hibernate.cache.TreeCache( deployedTreeCache, name, tm );
+      return new JBCCache( deployedTreeCache, name, tm );
    }
 
    public long nextTimestamp()