[Jboss-cvs] JBossAS SVN: r56303 - branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session

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

Author: bstansberry at jboss.com
Date: 2006-08-26 16:37:55 -0400 (Sat, 26 Aug 2006)
New Revision: 56303

Modified:
   branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheCluster.java
Log:
Use PojoCache instead of TreeCacheAop

Modified: branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheCluster.java
===================================================================
--- branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheCluster.java	2006-08-26 20:37:19 UTC (rev 56302)
+++ branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheCluster.java	2006-08-26 20:37:55 UTC (rev 56303)
@@ -46,8 +46,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.BatchModeTransactionManagerLookup;
 import org.jboss.cache.PropertyConfigurator;
-import org.jboss.cache.aop.TreeCacheAop;
-import org.jboss.cache.aop.TreeCacheAopMBean;
+import org.jboss.cache.aop.PojoCache;
+import org.jboss.cache.aop.PojoCacheMBean;
 import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.web.tomcat.tc5.Tomcat5;
@@ -107,7 +107,7 @@
    private LifecycleSupport lifecycle = new LifecycleSupport(this);
 
    /** Our tree cache */
-   private TreeCacheAopMBean treeCache = null;
+   private PojoCacheMBean treeCache = null;
    
    /** Name under which our TreeCache is registered in JMX */
    private String treeCacheObjectName = Tomcat5.DEFAULT_CACHE_NAME;
@@ -661,7 +661,7 @@
          MBeanServerLocator.setJBoss(getMBeanServer());
          
          // Initialize the tree cache
-         TreeCacheAopMBean cache = getTreeCache();
+         PojoCacheMBean cache = getTreeCache();
          
          if (treeCacheLocal)
          {
@@ -747,7 +747,7 @@
     * Gets our TreeCache, either from a local reference or the JMX
     * server.  If one is not found, creates and configures it.
     */
-   private TreeCacheAopMBean getTreeCache() throws Exception
+   private PojoCacheMBean getTreeCache() throws Exception
    {
       if (treeCache == null) {
          
@@ -756,13 +756,13 @@
          if (server.isRegistered(objName))
          {
             // Get a proxy to the existing TreeCache
-            treeCache = (TreeCacheAopMBean) 
-                  MBeanProxyExt.create(TreeCacheAopMBean.class, objName);
+            treeCache = (PojoCacheMBean) 
+                  MBeanProxyExt.create(PojoCacheMBean.class, objName);
          }
          else
          {
             // Create our own tree cache
-            treeCache = new TreeCacheAop();
+            treeCache = new PojoCache();
             
             // See if there is an XML descriptor file to configure the cache
             InputStream configIS = getCacheConfigStream();