[jboss-cvs] JBossAS SVN: r107765 - in projects/cluster/ha-server-cache-ispn/trunk/src: test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn and 1 other directory.

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

Author: pferraro
Date: 2010-08-24 12:13:34 -0400 (Tue, 24 Aug 2010)
New Revision: 107765

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultCacheSource.java
   projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultCacheSourceTest.java
Log:
Use default cache container "session".  Allow override.

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultCacheSource.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultCacheSource.java	2010-08-24 16:03:05 UTC (rev 107764)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultCacheSource.java	2010-08-24 16:13:34 UTC (rev 107765)
@@ -36,8 +36,12 @@
  */
 public class DefaultCacheSource implements CacheSource
 {
+   public static final String DEFAULT_CACHE_CONTAINER = "session";
+   
    private final CacheContainerRegistry registry;
    
+   private String defaultContainerName = DEFAULT_CACHE_CONTAINER;
+   
    public DefaultCacheSource(CacheContainerRegistry registry)
    {
       this.registry = registry;
@@ -49,7 +53,7 @@
       ReplicationConfig replConfig = manager.getReplicationConfig();
       String templateCacheName = replConfig.getCacheName();
       
-      String containerName = null;
+      String containerName = this.defaultContainerName;
       
       if (templateCacheName != null)
       {
@@ -127,4 +131,9 @@
       
       return container.getCache(cacheName);
    }
+   
+   public void setDefaultContainerName(String defaultContainerName)
+   {
+      this.defaultContainerName = defaultContainerName;
+   }
 }

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultCacheSourceTest.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultCacheSourceTest.java	2010-08-24 16:03:05 UTC (rev 107764)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultCacheSourceTest.java	2010-08-24 16:13:34 UTC (rev 107765)
@@ -51,14 +51,14 @@
       config.setBackups(null);
       
       // Validate host contribution to cache name
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
-      this.start(null, "session-cache", "", "", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
-      this.start(null, "session-cache", "host1", "", "host1/ROOT", config, configuration, CacheMode.REPL_ASYNC);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
+      this.start("session", "session-cache", "", "", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
+      this.start("session", "session-cache", "host1", "", "host1/ROOT", config, configuration, CacheMode.REPL_ASYNC);
 
       // Validate context path contribution to cache name
-      this.start(null, "session-cache", null, "/", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
-      this.start(null, "session-cache", null, "/context1", "localhost/context1", config, configuration, CacheMode.REPL_ASYNC);
-      this.start(null, "session-cache", null, "/path/context1", "localhost/path/context1", config, configuration, CacheMode.REPL_ASYNC);
+      this.start("session", "session-cache", null, "/", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
+      this.start("session", "session-cache", null, "/context1", "localhost/context1", config, configuration, CacheMode.REPL_ASYNC);
+      this.start("session", "session-cache", null, "/path/context1", "localhost/path/context1", config, configuration, CacheMode.REPL_ASYNC);
       
       // Validate cache container qualified cache name
       config.setCacheName("default:session-cache");
@@ -66,40 +66,40 @@
       
       config.setCacheName("session-cache");
       config.setReplicationMode(ReplicationMode.SYNCHRONOUS);
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_SYNC);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_SYNC);
       
       config.setReplicationMode(ReplicationMode.ASYNCHRONOUS);
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
       
       config.setBackups(Integer.valueOf(-1));
       config.setReplicationMode(null);
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
       
       config.setReplicationMode(ReplicationMode.SYNCHRONOUS);
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_SYNC);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_SYNC);
       
       config.setReplicationMode(ReplicationMode.ASYNCHRONOUS);
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.REPL_ASYNC);
       
       config.setBackups(Integer.valueOf(0));
       config.setReplicationMode(null);
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.LOCAL);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.LOCAL);
       
       config.setReplicationMode(ReplicationMode.SYNCHRONOUS);
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.LOCAL);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.LOCAL);
       
       config.setReplicationMode(ReplicationMode.ASYNCHRONOUS);
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.LOCAL);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.LOCAL);
       
       config.setBackups(Integer.valueOf(1));
       config.setReplicationMode(null);
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.DIST_ASYNC);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.DIST_ASYNC);
       
       config.setReplicationMode(ReplicationMode.SYNCHRONOUS);
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.DIST_SYNC);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.DIST_SYNC);
       
       config.setReplicationMode(ReplicationMode.ASYNCHRONOUS);
-      this.start(null, "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.DIST_ASYNC);
+      this.start("session", "session-cache", null, "", "localhost/ROOT", config, configuration, CacheMode.DIST_ASYNC);
    }
    
    private void start(String containerName, String templateCacheName, String hostName, String contextName, String cacheName, ReplicationConfig config, Configuration configuration, CacheMode mode)