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

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

Author: bstansberry at jboss.com
Date: 2008-10-20 18:12:35 -0400 (Mon, 20 Oct 2008)
New Revision: 79776

Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ReplicationToPassivatedSessionUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
Log:
Reapply r79551, r79610 commits

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ReplicationToPassivatedSessionUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ReplicationToPassivatedSessionUnitTestCase.java	2008-10-20 22:01:03 UTC (rev 79775)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ReplicationToPassivatedSessionUnitTestCase.java	2008-10-20 22:12:35 UTC (rev 79776)
@@ -60,7 +60,6 @@
    protected Logger log = Logger.getLogger(getClass());   
    
    protected Set<JBossCacheManager> managers = new HashSet<JBossCacheManager>();
-   private String tempDir;
    
    public ReplicationToPassivatedSessionUnitTestCase(String name)
    {

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java	2008-10-20 22:01:03 UTC (rev 79775)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java	2008-10-20 22:12:35 UTC (rev 79776)
@@ -46,7 +46,6 @@
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
 import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.factories.XmlConfigurationParser;
 import org.jboss.cache.loader.FileCacheLoaderConfig;
 import org.jboss.cache.pojo.PojoCache;
 import org.jboss.cache.pojo.PojoCacheFactory;
@@ -144,8 +143,8 @@
    public static Configuration getConfiguration(boolean local, String passivationDir, 
          boolean totalReplication, boolean marshalling)
    {
-      XmlConfigurationParser parser = new XmlConfigurationParser();
-      Configuration config = parser.parseFile(CONFIG_LOCATION);
+      PojoCache temp = PojoCacheFactory.createCache(CONFIG_LOCATION, false);
+      Configuration config = temp.getCache().getConfiguration();
       if (local)
          config.setCacheMode(CacheMode.LOCAL);
       if (passivationDir == null)