[jboss-cvs] JBossAS SVN: r109259 - in trunk: testsuite/src/main/org/jboss/test/cluster/testutil and 1 other directory.

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

Author: pferraro
Date: 2010-11-10 16:09:30 -0500 (Wed, 10 Nov 2010)
New Revision: 109259

Modified:
   trunk/component-matrix/pom.xml
   trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
Log:
Upgrade ha-server-ispn -> 1.0.0.CR5, ha-server-cache-ispn -> 1.0.0.CR6.  Contains class loader leak fixes. 

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-11-10 21:07:16 UTC (rev 109258)
+++ trunk/component-matrix/pom.xml	2010-11-10 21:09:30 UTC (rev 109259)
@@ -76,12 +76,12 @@
     <version.org.jboss.bootstrap>2.1.0-alpha-5</version.org.jboss.bootstrap>
     <version.org.jboss.cl>2.2.0.Alpha9</version.org.jboss.cl>
     <version.org.jboss.classpool>1.0.0.Alpha6</version.org.jboss.classpool>
-    <version.org.jboss.cluster.cache.spi>3.0.0.CR1</version.org.jboss.cluster.cache.spi>
-    <version.org.jboss.cluster.cache.ispn>1.0.0.CR5</version.org.jboss.cluster.cache.ispn>
     <version.org.jboss.cluster.client>1.1.2.Final</version.org.jboss.cluster.client>
     <version.org.jboss.cluster.server.api>2.0.0.CR1</version.org.jboss.cluster.server.api>
     <version.org.jboss.cluster.server.core>1.0.0.CR1</version.org.jboss.cluster.server.core>
-    <version.org.jboss.cluster.server.ispn>1.0.0.CR4</version.org.jboss.cluster.server.ispn>
+    <version.org.jboss.cluster.server.ispn>1.0.0.CR5</version.org.jboss.cluster.server.ispn>
+    <version.org.jboss.cluster.cache.spi>3.0.0.CR1</version.org.jboss.cluster.cache.spi>
+    <version.org.jboss.cluster.cache.ispn>1.0.0.CR6</version.org.jboss.cluster.cache.ispn>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.2.0.Alpha8</version.org.jboss.deployers>
     <version.org.jboss.ejb3.depchain>1.0.0-alpha-17</version.org.jboss.ejb3.depchain>

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java	2010-11-10 21:07:16 UTC (rev 109258)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java	2010-11-10 21:09:30 UTC (rev 109259)
@@ -102,7 +102,7 @@
       }
       
       DistributedCacheManagerFactory factory = new DistributedCacheManagerFactory();
-      CacheSource source = new CacheSource()
+      CacheSource sessionCacheSource = new CacheSource()
       {
          @Override
          public <K, V> Cache<K, V> getCache(LocalDistributableSessionManager manager)
@@ -110,8 +110,17 @@
             return cacheContainer.getCache(manager.getName());
          }
       };
+      CacheSource jvmRouteCacheSource = new CacheSource()
+      {
+         @Override
+         public <K, V> Cache<K, V> getCache(LocalDistributableSessionManager manager)
+         {
+            return cacheContainer.getCache(manager.getEngineName());
+         }
+      };
       
-      factory.setCacheSource(source);
+      factory.setSessionCacheSource(sessionCacheSource);
+      factory.setJvmRouteCacheSource(jvmRouteCacheSource);
       
       JBossCacheManager<OutgoingDistributableSessionData> manager = new JBossCacheManager<OutgoingDistributableSessionData>(factory);
       manager.setSnapshotMode(SnapshotMode.INSTANT);
@@ -132,47 +141,52 @@
       globalConfig.setClusterName("testing");
       globalConfig.setStrictPeerToPeer(false);
 
-      Configuration config = new Configuration();
-      config.setInvocationBatchingEnabled(true);
-      config.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
-      config.setSyncReplTimeout(20000);
-      config.setLockAcquisitionTimeout(15000);
-      config.setCacheMode(local ? CacheMode.LOCAL : (totalReplication ? CacheMode.REPL_SYNC : CacheMode.DIST_SYNC));
+      Configuration defaultConfig = new Configuration();
+      defaultConfig.setInvocationBatchingEnabled(true);
+      defaultConfig.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
+      defaultConfig.setSyncReplTimeout(20000);
+      defaultConfig.setLockAcquisitionTimeout(15000);
+      defaultConfig.setCacheMode(local ? CacheMode.LOCAL : (totalReplication ? CacheMode.REPL_SYNC : CacheMode.DIST_SYNC));
       
-      CacheMode mode = config.getCacheMode();
-      if (mode.isReplicated())
-      {
-         config.setFetchInMemoryState(true);
-      }
-      else if (mode.isDistributed())
-      {
-         config.setNumOwners(2);
-         config.setFetchInMemoryState(false);
-      }
-      
+      CacheMode mode = defaultConfig.getCacheMode();
+      defaultConfig.setFetchInMemoryState(mode.isReplicated());
+
       // Block for commits -- no races between test driver and replication
-      config.setSyncCommitPhase(true);
-      config.setSyncRollbackPhase(true);
+      defaultConfig.setSyncCommitPhase(true);
+      defaultConfig.setSyncRollbackPhase(true);
       
       if (passivationDir != null)
       {
          CacheLoaderManagerConfig managerConfig = new CacheLoaderManagerConfig();
          managerConfig.setPassivation(true);
-         managerConfig.setShared(false);
-         managerConfig.setPreload(true);  // pre-load passivated sessions
+         managerConfig.setPreload(true);
          
          FileCacheStoreConfig fileConfig = new FileCacheStoreConfig();
          fileConfig.setLocation(passivationDir);
-         fileConfig.setFetchPersistentState(true);
+         fileConfig.setFetchPersistentState(!mode.isDistributed());
          fileConfig.setPurgeOnStartup(purgeCacheLoader);
-         fileConfig.setIgnoreModifications(false);
          
          managerConfig.setCacheLoaderConfigs(Collections.<CacheLoaderConfig>singletonList(fileConfig));
          
+         defaultConfig.setCacheLoaderManagerConfig(managerConfig);
+      }
+      
+      EmbeddedCacheManager container = new DefaultCacheManager(globalConfig, defaultConfig, false);
+      
+      if (mode.isDistributed())
+      {
+         Configuration config = new Configuration();
+         config.setCacheMode(CacheMode.REPL_ASYNC);
+         config.setFetchInMemoryState(true);
+         CacheLoaderManagerConfig managerConfig = new CacheLoaderManagerConfig();
+         managerConfig.setCacheLoaderConfigs(Collections.<CacheLoaderConfig>emptyList());
+         managerConfig.setPassivation(false);
          config.setCacheLoaderManagerConfig(managerConfig);
+
+         container.defineConfiguration("jboss.web", config);
       }
       
-      return new DefaultCacheContainer(new DefaultCacheManager(globalConfig, config, false));
+      return new DefaultCacheContainer(container);
    }
    
    public static void setupContainer(String warName, String jvmRoute, Manager mgr)