[jboss-cvs] JBossAS SVN: r58435 - in trunk/tomcat/src/main/org/jboss/web/tomcat/tc6: session sso

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

Author: scott.stark at jboss.org
Date: 2006-11-15 23:18:12 -0500 (Wed, 15 Nov 2006)
New Revision: 58435

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheCluster.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheManager.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/sso/ClusteredSingleSignOn.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/sso/TreeCacheSSOClusterManager.java
Log:
Drop the Tomcat6 refences


Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheCluster.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheCluster.java	2006-11-16 04:15:57 UTC (rev 58434)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheCluster.java	2006-11-16 04:18:12 UTC (rev 58435)
@@ -50,7 +50,6 @@
 import org.jboss.cache.aop.PojoCacheMBean;
 import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.web.tomcat.tc6.Tomcat6;
 
 /**
  * A Tomcat <code>Cluster</code> implementation that uses a JBoss
@@ -110,7 +109,7 @@
    private PojoCacheMBean treeCache = null;
    
    /** Name under which our TreeCache is registered in JMX */
-   private String treeCacheObjectName = Tomcat6.DEFAULT_CACHE_NAME;
+   private String treeCacheObjectName = "jboss.cache:service=TomcatClusteringCache";
    
    /** Did we create the tree cache, or was it already registered in JMX? */
    private boolean treeCacheLocal = false;

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheManager.java	2006-11-16 04:15:57 UTC (rev 58434)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheManager.java	2006-11-16 04:18:12 UTC (rev 58435)
@@ -46,7 +46,6 @@
 import org.jboss.cache.CacheException;
 import org.jboss.metadata.WebMetaData;
 import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.web.tomcat.tc6.Tomcat6;
 
 import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
 
@@ -87,7 +86,7 @@
    private Map unloadedSessions_ = new ConcurrentHashMap();
 
    /** Our TreeCache's ObjectName */
-   private String cacheObjectNameString_ = Tomcat6.DEFAULT_CACHE_NAME;
+   private String cacheObjectNameString_ = "jboss.cache:service=TomcatClusteringCache";
 
    /**
     * If set to true, will add a JvmRouteFilter to the request.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/sso/ClusteredSingleSignOn.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/sso/ClusteredSingleSignOn.java	2006-11-16 04:15:57 UTC (rev 58434)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/sso/ClusteredSingleSignOn.java	2006-11-16 04:18:12 UTC (rev 58435)
@@ -16,7 +16,6 @@
 package org.jboss.web.tomcat.tc6.sso;
 
 
-import org.jboss.web.tomcat.tc6.Tomcat6;
 import org.jboss.web.tomcat.tc6.session.JBossManager;
 
 import java.io.IOException;
@@ -95,7 +94,7 @@
     * Only relevant if the SSOClusterManager implementation is
     * TreeCacheSSOClusterManager.
     */
-   private String treeCacheName = Tomcat6.DEFAULT_CACHE_NAME;
+   private String treeCacheName = "jboss.cache:service=TomcatClusteringCache";
    
    private Set activeManagers = Collections.synchronizedSet(new HashSet());
 

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/sso/TreeCacheSSOClusterManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/sso/TreeCacheSSOClusterManager.java	2006-11-16 04:15:57 UTC (rev 58434)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/sso/TreeCacheSSOClusterManager.java	2006-11-16 04:18:12 UTC (rev 58435)
@@ -44,7 +44,6 @@
 import org.jboss.logging.Logger;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.util.NestedRuntimeException;
-import org.jboss.web.tomcat.tc6.Tomcat6;
 import org.jgroups.View;
 
 /**
@@ -86,7 +85,7 @@
     * Default global value for the cacheName property
     */
    public static final String DEFAULT_GLOBAL_CACHE_NAME =
-      Tomcat6.DEFAULT_CACHE_NAME;
+      "jboss.cache:service=TomcatClusteringCache";
 
    /**
     * Parameter signature used for TreeCache.get calls over JMX