[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/loader ...
Brian Stansberry
brian.stansberry at jboss.com
Wed Oct 25 00:50:19 EDT 2006
User: bstansberry
Date: 06/10/25 00:50:19
Modified: tests/functional/org/jboss/cache/loader
LocalDelegatingCacheLoaderTest.java
JdbmCacheLoaderTest.java
ClusteredCacheLoaderTest.java
CacheLoaderPurgingTest.java
AsyncFileCacheLoaderTest.java
RpcDelegatingCacheLoaderTests.java
ChainingCacheLoaderFullTest.java
CacheLoaderWithReplicationTest.java
SingletonStoreCacheLoaderTest.java
AbstractCacheLoaderTestBase.java
CacheLoaderManagerTest.java
FileCacheLoaderTest.java SharedCacheLoaderTest.java
BdbjeCacheLoaderTest.java
CacheLoaderMethodCallCounterTest.java
ChainingCacheLoaderBasicTest.java
CacheLoaderTestsBase.java
JDBCCacheLoaderDerbyDSTest.java BdbjeTest.java
DataSourceIntegrationTest.java
TxCacheLoaderTest.java JDBCCacheLoaderTest.java
TcpCacheLoaderTest.java
Log:
Handle parsing of config XML in XmlConfigurationParser
Revision Changes Path
1.13 +1 -1 JBossCache/tests/functional/org/jboss/cache/loader/LocalDelegatingCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LocalDelegatingCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/LocalDelegatingCacheLoaderTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- LocalDelegatingCacheLoaderTest.java 11 Oct 2006 10:02:07 -0000 1.12
+++ LocalDelegatingCacheLoaderTest.java 25 Oct 2006 04:50:19 -0000 1.13
@@ -23,7 +23,7 @@
delegating_cache.start();
// configure first ...
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.LocalDelegatingCacheLoader", "", false, false, false));
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.LocalDelegatingCacheLoader", "", false, false, false));
// force our own cache loader instance
LocalDelegatingCacheLoader cacheLoader = new LocalDelegatingCacheLoader(delegating_cache);
1.5 +2 -2 JBossCache/tests/functional/org/jboss/cache/loader/JdbmCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JdbmCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/JdbmCacheLoaderTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- JdbmCacheLoaderTest.java 11 Oct 2006 10:02:07 -0000 1.4
+++ JdbmCacheLoaderTest.java 25 Oct 2006 04:50:19 -0000 1.5
@@ -10,7 +10,7 @@
* Tests {@link org.jboss.cache.loader.jdbm.JdbmCacheLoader}.
*
* @author Elias Ross
- * @version $Id: JdbmCacheLoaderTest.java,v 1.4 2006/10/11 10:02:07 msurtani Exp $
+ * @version $Id: JdbmCacheLoaderTest.java,v 1.5 2006/10/25 04:50:19 bstansberry Exp $
*/
public class JdbmCacheLoaderTest extends CacheLoaderTestsBase
{
@@ -51,7 +51,7 @@
}
}
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.jdbm.JdbmCacheLoader", "", false, true, false));
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.jdbm.JdbmCacheLoader", "", false, true, false));
}
public static Test suite()
1.10 +2 -2 JBossCache/tests/functional/org/jboss/cache/loader/ClusteredCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClusteredCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/ClusteredCacheLoaderTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ClusteredCacheLoaderTest.java 6 Sep 2006 15:30:58 -0000 1.9
+++ ClusteredCacheLoaderTest.java 25 Oct 2006 04:50:19 -0000 1.10
@@ -42,8 +42,8 @@
cache1.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_SYNC);
cache2.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_SYNC);
- cache1.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.ClusteredCacheLoader", "timeout=500", false, false, false));
- cache2.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.ClusteredCacheLoader", "timeout=500", false, false, false));
+ cache1.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.ClusteredCacheLoader", "timeout=500", false, false, false));
+ cache2.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.ClusteredCacheLoader", "timeout=500", false, false, false));
cache1.start();
cache2.start();
1.6 +6 -3 JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderPurgingTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderPurgingTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderPurgingTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CacheLoaderPurgingTest.java 19 Sep 2006 14:32:21 -0000 1.5
+++ CacheLoaderPurgingTest.java 25 Oct 2006 04:50:19 -0000 1.6
@@ -10,7 +10,9 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.TreeCache;
import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
+import org.w3c.dom.Element;
/**
* @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
@@ -36,7 +38,7 @@
cache = new TreeCache();
Configuration c = new Configuration();
cache.setConfiguration(c);
- c.setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location=" + System.getProperty("java.io.tmpdir", "/tmp") + "/" + "CacheLoaderPurgingTest", false, false, false));
+ c.setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location=" + System.getProperty("java.io.tmpdir", "/tmp") + "/" + "CacheLoaderPurgingTest", false, false, false));
cache.start();
cache.put(fqn, key, value);
@@ -60,7 +62,7 @@
cache = new TreeCache();
Configuration c = new Configuration();
cache.setConfiguration(c);
- c.setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location=" + System.getProperty("java.io.tmpdir", "/tmp") + "/" + "CacheLoaderPurgingTest", false, false, false, true));
+ c.setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location=" + System.getProperty("java.io.tmpdir", "/tmp") + "/" + "CacheLoaderPurgingTest", false, false, false, true));
cache.start();
cache.put(fqn, key, value);
@@ -111,7 +113,8 @@
Configuration c = new Configuration();
cache.setConfiguration(c);
- c.setCacheLoaderConfiguration(XmlHelper.stringToElement(xml));
+ Element element = XmlHelper.stringToElement(xml);
+ c.setCacheLoaderConfig(XmlConfigurationParser.parseCacheLoaderConfig(element));
cache.start();
cache.put(fqn, key, value);
1.16 +1 -1 JBossCache/tests/functional/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AsyncFileCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- AsyncFileCacheLoaderTest.java 24 Oct 2006 11:35:31 -0000 1.15
+++ AsyncFileCacheLoaderTest.java 25 Oct 2006 04:50:19 -0000 1.16
@@ -32,7 +32,7 @@
cache = new TreeCache();
cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL);
// cache.setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.jdbm.JdbmCacheLoader",
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader",
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader",
props, true, false, true));
cache.create();
cache.start();
1.8 +7 -4 JBossCache/tests/functional/org/jboss/cache/loader/RpcDelegatingCacheLoaderTests.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RpcDelegatingCacheLoaderTests.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/RpcDelegatingCacheLoaderTests.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- RpcDelegatingCacheLoaderTests.java 6 Sep 2006 15:30:58 -0000 1.7
+++ RpcDelegatingCacheLoaderTests.java 25 Oct 2006 04:50:19 -0000 1.8
@@ -2,14 +2,16 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.misc.TestingUtil;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
/**
* @author Bela Ban
- * @version $Id: RpcDelegatingCacheLoaderTests.java,v 1.7 2006/09/06 15:30:58 msurtani Exp $
+ * @version $Id: RpcDelegatingCacheLoaderTests.java,v 1.8 2006/10/25 04:50:19 bstansberry Exp $
*/
public class RpcDelegatingCacheLoaderTests
{
@@ -59,7 +61,7 @@
cache.getConfiguration().setInitialStateRetrievalTimeout(3000);
cache.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_ASYNC);
cache.getConfiguration().setFetchInMemoryState(true);
- cache.getConfiguration().setCacheLoaderConfiguration(getCacheLoaderConfig());
+ cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig());
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
cache.start();
@@ -114,7 +116,7 @@
System.out.println("the cache is " + cache.toString() + ", locks: " + cache.printLockInfo());
}
- protected Element getCacheLoaderConfig() throws Exception
+ protected CacheLoaderConfig getCacheLoaderConfig() throws Exception
{
String xml = " <config>\n" +
" \n" +
@@ -129,6 +131,7 @@
" </cacheloader>\n" +
" \n" +
" </config>";
- return XmlHelper.stringToElement(xml);
+ Element element = XmlHelper.stringToElement(xml);
+ return XmlConfigurationParser.parseCacheLoaderConfig(element);
}
}
1.8 +6 -3 JBossCache/tests/functional/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChainingCacheLoaderFullTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ChainingCacheLoaderFullTest.java 6 Sep 2006 15:30:58 -0000 1.7
+++ ChainingCacheLoaderFullTest.java 25 Oct 2006 04:50:19 -0000 1.8
@@ -12,6 +12,8 @@
import junit.framework.TestSuite;
import org.jboss.cache.Fqn;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
@@ -48,7 +50,7 @@
protected void startCache(boolean ignoreMods1, boolean ignoreMods2) throws Exception
{
cache = new TreeCache();
- cache.getConfiguration().setCacheLoaderConfiguration(getCacheLoaderConfig(loc1, loc2, ignoreMods1, ignoreMods2));
+ cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig(loc1, loc2, ignoreMods1, ignoreMods2));
cache.getConfiguration().setCacheMode("local");
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
cache.start();
@@ -65,7 +67,7 @@
cache = null;
}
- protected Element getCacheLoaderConfig(String loc1, String loc2, boolean ignoreMods1, boolean ignoreMods2) throws Exception
+ protected CacheLoaderConfig getCacheLoaderConfig(String loc1, String loc2, boolean ignoreMods1, boolean ignoreMods2) throws Exception
{
String xml = "<config>\n" +
"<passivation>false</passivation>\n" +
@@ -89,7 +91,8 @@
"<ignoreModifications>" + ignoreMods2 + "</ignoreModifications>\n" +
"</cacheloader>\n" +
"</config>";
- return XmlHelper.stringToElement(xml);
+ Element element = XmlHelper.stringToElement(xml);
+ return XmlConfigurationParser.parseCacheLoaderConfig(element);
}
public void testCruds() throws Exception
1.23 +2 -2 JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderWithReplicationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- CacheLoaderWithReplicationTest.java 6 Sep 2006 15:30:58 -0000 1.22
+++ CacheLoaderWithReplicationTest.java 25 Oct 2006 04:50:19 -0000 1.23
@@ -50,11 +50,11 @@
public void setUp() throws Exception
{
cache1 = new TreeCache();
- cache1.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "location=" + tmpLocation1, false, true, false));
+ cache1.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "location=" + tmpLocation1, false, true, false));
cache1.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
cache2 = new TreeCache();
- cache2.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "location=" + tmpLocation2, false, true, false));
+ cache2.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "location=" + tmpLocation2, false, true, false));
cache2.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
}
1.2 +7 -4 JBossCache/tests/functional/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SingletonStoreCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SingletonStoreCacheLoaderTest.java 29 Sep 2006 18:27:21 -0000 1.1
+++ SingletonStoreCacheLoaderTest.java 25 Oct 2006 04:50:19 -0000 1.2
@@ -11,7 +11,9 @@
import org.jboss.cache.NodeImpl;
import org.jboss.cache.TreeCache;
import org.jboss.cache.TreeCacheProxyImpl;
+import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
import org.apache.commons.logging.Log;
@@ -239,7 +241,7 @@
return new ActiveStatusModifier(mscl);
}
- protected Element getSingletonStoreCacheLoaderConfig(String cacheloaderClass, boolean singleton,
+ protected CacheLoaderConfig getSingletonStoreCacheLoaderConfig(String cacheloaderClass, boolean singleton,
boolean pushStateWhenCoordinator) throws Exception
{
String xml = "<config>\n" +
@@ -255,18 +257,19 @@
"<singletonStore pushStateWhenCoordinator=\"" + pushStateWhenCoordinator + "\">" + singleton + "</singletonStore>\n" +
"</cacheloader>\n" +
"</config>";
- return XmlHelper.stringToElement(xml);
+ Element element = XmlHelper.stringToElement(xml);
+ return XmlConfigurationParser.parseCacheLoaderConfig(element);
}
private void initSingletonNonPushCache(CacheSPI cache) throws Exception
{
- cache.getConfiguration().setCacheLoaderConfiguration(getSingletonStoreCacheLoaderConfig(
+ cache.getConfiguration().setCacheLoaderConfig(getSingletonStoreCacheLoaderConfig(
DummyInMemoryCacheLoader.class.getName(), true, false));
}
private void initSingletonWithPushCache(CacheSPI cache) throws Exception
{
- cache.getConfiguration().setCacheLoaderConfiguration(getSingletonStoreCacheLoaderConfig(
+ cache.getConfiguration().setCacheLoaderConfig(getSingletonStoreCacheLoaderConfig(
DummyInMemoryCacheLoader.class.getName(), true, true));
}
1.11 +7 -4 JBossCache/tests/functional/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractCacheLoaderTestBase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- AbstractCacheLoaderTestBase.java 19 Sep 2006 14:32:21 -0000 1.10
+++ AbstractCacheLoaderTestBase.java 25 Oct 2006 04:50:19 -0000 1.11
@@ -9,6 +9,8 @@
import junit.framework.TestCase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
@@ -38,17 +40,17 @@
}
- protected Element getSingleCacheLoaderConfig(String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean shared) throws Exception
+ protected CacheLoaderConfig getSingleCacheLoaderConfig(String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean shared) throws Exception
{
return getSingleCacheLoaderConfig(preload, cacheloaderClass, properties, async, fetchPersistentState, shared, false);
}
- protected Element getSingleCacheLoaderConfig(String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean shared, boolean purgeOnStartup) throws Exception
+ protected CacheLoaderConfig getSingleCacheLoaderConfig(String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean shared, boolean purgeOnStartup) throws Exception
{
return getSingleCacheLoaderConfig(false, preload, cacheloaderClass, properties, async, fetchPersistentState, shared, purgeOnStartup);
}
- protected Element getSingleCacheLoaderConfig(boolean passivation, String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean shared, boolean purgeOnStartup) throws Exception
+ protected CacheLoaderConfig getSingleCacheLoaderConfig(boolean passivation, String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean shared, boolean purgeOnStartup) throws Exception
{
String xml = "<config>\n" +
"<passivation>" + passivation + "</passivation>\n" +
@@ -62,6 +64,7 @@
"<purgeOnStartup>" + purgeOnStartup + "</purgeOnStartup>\n" +
"</cacheloader>\n" +
"</config>";
- return XmlHelper.stringToElement(xml);
+ Element element = XmlHelper.stringToElement(xml);
+ return XmlConfigurationParser.parseCacheLoaderConfig(element);
}
}
1.12 +34 -31 JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderManagerTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderManagerTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderManagerTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- CacheLoaderManagerTest.java 29 Sep 2006 18:27:21 -0000 1.11
+++ CacheLoaderManagerTest.java 25 Oct 2006 04:50:19 -0000 1.12
@@ -10,6 +10,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.CacheListener;
@@ -109,18 +110,18 @@
public void testSingleCacheLoaderFromXml() throws Exception
{
// without async
- Element confXml = getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location="+getTempDir(), false, false, false);
+ CacheLoaderConfig clc = getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location="+getTempDir(), false, false, false);
CacheLoaderManager mgr = new CacheLoaderManager();
- mgr.setConfig(confXml, null);
+ mgr.setConfig(clc, null);
CacheLoader cl = mgr.getCacheLoader();
Assert.assertEquals(FileCacheLoader.class, cl.getClass());
// with async
- confXml = getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location=" + getTempDir(), true, false, false);
+ clc = getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location=" + getTempDir(), true, false, false);
- mgr.setConfig(confXml, null);
+ mgr.setConfig(clc, null);
cl = mgr.getCacheLoader();
Assert.assertEquals(AsyncCacheLoader.class, cl.getClass());
}
@@ -157,9 +158,9 @@
" location=" + getTempDir() +
" </properties>" +
"</cacheloader></config>";
-
+ CacheLoaderConfig clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
CacheLoaderManager mgr = new CacheLoaderManager();
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
CacheLoader cl = mgr.getCacheLoader();
Assert.assertEquals(FileCacheLoader.class, cl.getClass());
@@ -193,8 +194,8 @@
" location=" + getTempDir() +
" </properties>" +
"</cacheloader></config>";
-
- mgr.setConfig(strToElement(conf), null);
+ clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
+ mgr.setConfig(clc, null);
cl = mgr.getCacheLoader();
Assert.assertEquals(AsyncCacheLoader.class, cl.getClass());
@@ -255,8 +256,9 @@
" </properties>" +
"</cacheloader></config>";
+ CacheLoaderConfig clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
CacheLoaderManager mgr = new CacheLoaderManager();
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
CacheLoader cl = mgr.getCacheLoader();
@@ -287,8 +289,8 @@
"cache.jdbc.driver=com.mysql.jdbc.Driver\ncache.jdbc.url=jdbc:mysql://localhost/test\ncache.jdbc.user=user\ncache.jdbc.password=pwd"+
" </properties>" +
"</cacheloader></config>";
-
- mgr.setConfig(strToElement(conf), null);
+ clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
+ mgr.setConfig(clc, null);
cl = mgr.getCacheLoader();
Assert.assertEquals(ChainingCacheLoader.class, cl.getClass());
@@ -386,9 +388,9 @@
"cache.jdbc.driver=com.mysql.jdbc.Driver\ncache.jdbc.url=jdbc:mysql://localhost/test\ncache.jdbc.user=user\ncache.jdbc.password=pwd" +
" </properties>" +
"</cacheloader></config>";
-
+ CacheLoaderConfig clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
CacheLoaderManager mgr = new CacheLoaderManager();
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
Assert.assertEquals(ChainingCacheLoader.class, mgr.getCacheLoader().getClass());
Assert.assertTrue("Should be true", mgr.isFetchPersistentState());
@@ -434,9 +436,10 @@
"cache.jdbc.driver=com.mysql.jdbc.Driver\ncache.jdbc.url=jdbc:mysql://localhost/test\ncache.jdbc.user=user\ncache.jdbc.password=pwd" +
" </properties>" +
"</cacheloader></config>";
+ clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
mgr = new CacheLoaderManager();
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
Assert.assertTrue("Should be false", !mgr.isFetchPersistentState());
@@ -458,9 +461,9 @@
" </properties>" +
"</cacheloader>" +
"</config>";
-
+ CacheLoaderConfig clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
CacheLoaderManager mgr = new CacheLoaderManager();
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
CacheLoaderConfig.IndividualCacheLoaderConfig iclc = mgr.getCacheLoaderConfig().getFirstCacheLoaderConfig();
assertFalse("Singleton has not been configured", iclc.isSingletonStore());
@@ -480,9 +483,9 @@
" <singletonStore>true</singletonStore>" +
"</cacheloader>" +
"</config>";
-
+ clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
mgr = new MockCacheLoaderManager();
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
iclc = mgr.getCacheLoaderConfig().getFirstCacheLoaderConfig();
assertTrue("Singleton has been configured", iclc.isSingletonStore());
@@ -502,9 +505,9 @@
" <singletonStore>false</singletonStore>" +
"</cacheloader>" +
"</config>";
-
+ clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
mgr = new CacheLoaderManager();
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
iclc = mgr.getCacheLoaderConfig().getFirstCacheLoaderConfig();
assertFalse("Singleton has not been configured", iclc.isSingletonStore());
@@ -524,9 +527,9 @@
" <singletonStore pushStateWhenCoordinator=\"false\">true</singletonStore>" +
"</cacheloader>" +
"</config>";
-
+ clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
mgr = new MockCacheLoaderManager();
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
iclc = mgr.getCacheLoaderConfig().getFirstCacheLoaderConfig();
assertTrue("Singleton has been configured", iclc.isSingletonStore());
@@ -546,9 +549,9 @@
" <singletonStore pushStateWhenCoordinator=\"false\">false</singletonStore>" +
"</cacheloader>" +
"</config>";
-
+ clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
mgr = new CacheLoaderManager();
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
iclc = mgr.getCacheLoaderConfig().getFirstCacheLoaderConfig();
assertFalse("Singleton has not been configured", iclc.isSingletonStore());
@@ -568,9 +571,9 @@
" <singletonStore pushStateWhenCoordinator=\"true\">false</singletonStore>" +
"</cacheloader>" +
"</config>";
-
+ clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
mgr = new CacheLoaderManager();
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
iclc = mgr.getCacheLoaderConfig().getFirstCacheLoaderConfig();
assertFalse("Singleton has not been configured", iclc.isSingletonStore());
@@ -590,9 +593,9 @@
" <singletonStore pushStateWhenCoordinator=\"true\">true</singletonStore>" +
"</cacheloader>" +
"</config>";
-
+ clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
mgr = new MockCacheLoaderManager();
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
iclc = mgr.getCacheLoaderConfig().getFirstCacheLoaderConfig();
assertTrue("Singleton has been configured", iclc.isSingletonStore());
@@ -613,11 +616,11 @@
" <singletonStore pushStateWhenCoordinator=\"true\">true</singletonStore>" +
"</cacheloader>" +
"</config>";
-
+ clc = XmlConfigurationParser.parseCacheLoaderConfig(strToElement(conf));
mgr = new CacheLoaderManager();
try
{
- mgr.setConfig(strToElement(conf), null);
+ mgr.setConfig(clc, null);
fail("A cache loader cannot be configured as singleton and shared, should have thrown an Exception");
}
catch (Exception e)
1.10 +1 -1 JBossCache/tests/functional/org/jboss/cache/loader/FileCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FileCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/FileCacheLoaderTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- FileCacheLoaderTest.java 11 Oct 2006 10:02:07 -0000 1.9
+++ FileCacheLoaderTest.java 25 Oct 2006 04:50:19 -0000 1.10
@@ -14,7 +14,7 @@
protected void configureCache() throws Exception
{
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "", false, true, false));
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "", false, true, false));
}
public static Test suite()
1.7 +2 -2 JBossCache/tests/functional/org/jboss/cache/loader/SharedCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SharedCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/SharedCacheLoaderTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- SharedCacheLoaderTest.java 6 Sep 2006 15:30:58 -0000 1.6
+++ SharedCacheLoaderTest.java 25 Oct 2006 04:50:19 -0000 1.7
@@ -33,8 +33,8 @@
cache1.getConfiguration().setCacheMode("REPL_SYNC");
cache2.getConfiguration().setCacheMode("REPL_SYNC");
- cache1.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", DummyCacheLoader.class.getName(), "", false, false, true));
- cache2.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", DummyCacheLoader.class.getName(), "", false, false, true));
+ cache1.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", DummyCacheLoader.class.getName(), "", false, false, true));
+ cache2.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", DummyCacheLoader.class.getName(), "", false, false, true));
cache1.start();
cache2.start();
1.17 +2 -2 JBossCache/tests/functional/org/jboss/cache/loader/BdbjeCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BdbjeCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/BdbjeCacheLoaderTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- BdbjeCacheLoaderTest.java 20 Jul 2006 08:05:18 -0000 1.16
+++ BdbjeCacheLoaderTest.java 25 Oct 2006 04:50:19 -0000 1.17
@@ -9,7 +9,7 @@
/**
* Runs the same tests as {@link FileCacheLoaderTest}, but with Berkeley DB instead of a file-based CacheLoader
* @author Bela Ban
- * @version $Id: BdbjeCacheLoaderTest.java,v 1.16 2006/07/20 08:05:18 msurtani Exp $
+ * @version $Id: BdbjeCacheLoaderTest.java,v 1.17 2006/10/25 04:50:19 bstansberry Exp $
*/
public class BdbjeCacheLoaderTest extends CacheLoaderTestsBase {
@@ -42,7 +42,7 @@
}
}
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "", false, true, false));
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "", false, true, false));
}
public static Test suite() {
1.11 +1 -1 JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderMethodCallCounterTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- CacheLoaderMethodCallCounterTest.java 6 Sep 2006 15:30:57 -0000 1.10
+++ CacheLoaderMethodCallCounterTest.java 25 Oct 2006 04:50:19 -0000 1.11
@@ -28,7 +28,7 @@
{
if (cache != null) tearDown();
cache = new TreeCache();
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", DummyCacheLoader.class.getName(), "", false, false, false));
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", DummyCacheLoader.class.getName(), "", false, false, false));
cache.start();
dummyLoader = (DummyCacheLoader) cache.getCacheLoader();
}
1.5 +7 -3 JBossCache/tests/functional/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChainingCacheLoaderBasicTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ChainingCacheLoaderBasicTest.java 20 Jul 2006 10:54:00 -0000 1.4
+++ ChainingCacheLoaderBasicTest.java 25 Oct 2006 04:50:19 -0000 1.5
@@ -8,6 +8,9 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+
+import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
@@ -34,10 +37,10 @@
protected void configureCache() throws Exception
{
- cache.getConfiguration().setCacheLoaderConfiguration(getCacheLoaderConfig(loc1, loc2));
+ cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig(loc1, loc2));
}
- protected Element getCacheLoaderConfig(String loc1, String loc2) throws Exception
+ protected CacheLoaderConfig getCacheLoaderConfig(String loc1, String loc2) throws Exception
{
String xml = "<config>\n" +
"<passivation>false</passivation>\n" +
@@ -59,7 +62,8 @@
"<fetchPersistentState>false</fetchPersistentState>\n" +
"</cacheloader>\n" +
"</config>";
- return XmlHelper.stringToElement(xml);
+ Element element = XmlHelper.stringToElement(xml);
+ return XmlConfigurationParser.parseCacheLoaderConfig(element);
}
public static Test suite()
1.34 +4 -2 JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderTestsBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderTestsBase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderTestsBase.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- CacheLoaderTestsBase.java 24 Oct 2006 11:35:31 -0000 1.33
+++ CacheLoaderTestsBase.java 25 Oct 2006 04:50:19 -0000 1.34
@@ -31,7 +31,7 @@
* Commons tests for all CacheLoaders
*
* @author Bela Ban
- * @version $Id: CacheLoaderTestsBase.java,v 1.33 2006/10/24 11:35:31 msurtani Exp $
+ * @version $Id: CacheLoaderTestsBase.java,v 1.34 2006/10/25 04:50:19 bstansberry Exp $
*/
abstract public class CacheLoaderTestsBase extends AbstractCacheLoaderTestBase
{
@@ -1726,6 +1726,8 @@
*/
public static class Complex implements Serializable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -6810871775584708565L;
Complex nested;
1.4 +2 -2 JBossCache/tests/functional/org/jboss/cache/loader/JDBCCacheLoaderDerbyDSTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JDBCCacheLoaderDerbyDSTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/JDBCCacheLoaderDerbyDSTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- JDBCCacheLoaderDerbyDSTest.java 6 Sep 2006 15:30:58 -0000 1.3
+++ JDBCCacheLoaderDerbyDSTest.java 25 Oct 2006 04:50:19 -0000 1.4
@@ -27,7 +27,7 @@
* must be in the lib directory for this test to run successfuly
*
* @author <a href="hmesha at novell.com">Hany Mesha</a>
- * @version <tt>$Revision: 1.3 $</tt>
+ * @version <tt>$Revision: 1.4 $</tt>
*/
public class JDBCCacheLoaderDerbyDSTest
extends CacheLoaderTestsBase
@@ -76,7 +76,7 @@
"cache.jdbc.node.type=" + prop.getProperty("cache.jdbc.node.type");
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", props, false, true, false));
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", props, false, true, false));
cache.create();
1.13 +4 -4 JBossCache/tests/functional/org/jboss/cache/loader/BdbjeTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BdbjeTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/BdbjeTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- BdbjeTest.java 24 Oct 2006 11:35:31 -0000 1.12
+++ BdbjeTest.java 25 Oct 2006 04:50:19 -0000 1.13
@@ -14,8 +14,8 @@
import org.jboss.cache.loader.bdbje.BdbjeCacheLoader;
import org.jboss.cache.loader.bdbje.BdbjeCacheLoader.Config;
import org.jboss.cache.statetransfer.StateTransferManager;
-import org.jboss.util.stream.MarshalledValueOutputStream;
import org.jboss.util.stream.MarshalledValueInputStream;
+import org.jboss.util.stream.MarshalledValueOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,7 +27,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
/**
@@ -37,7 +36,7 @@
* directory. Any scratch directory will do, but beware that all files in
* the directory will be deleted by setUp().</p>
*
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
public class BdbjeTest extends TestCase
{
@@ -1266,7 +1265,6 @@
{
startLoader(false, null);
- byte [] nullState = null;
/* Empty state. */
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
@@ -1363,6 +1361,8 @@
*/
private static class Complex implements Serializable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -1259096627833244770L;
Complex nested;
1.9 +3 -3 JBossCache/tests/functional/org/jboss/cache/loader/DataSourceIntegrationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DataSourceIntegrationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/DataSourceIntegrationTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- DataSourceIntegrationTest.java 6 Sep 2006 15:30:58 -0000 1.8
+++ DataSourceIntegrationTest.java 25 Oct 2006 04:50:19 -0000 1.9
@@ -7,8 +7,8 @@
package org.jboss.cache.loader;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.transaction.DummyTransactionManager;
-import org.w3c.dom.Element;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -35,7 +35,7 @@
}
- protected Element getCacheLoaderConfig(String jndi) throws Exception
+ protected CacheLoaderConfig getCacheLoaderConfig(String jndi) throws Exception
{
String props = "cache.jdbc.datasource=" + jndi + "\ncache.jdbc.table.create=false\ncache.jdbc.table.drop=false";
return getSingleCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", props, false, false, false);
@@ -62,7 +62,7 @@
cache = new TreeCache();
cache.getConfiguration().setCacheMode("local");
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
- cache.getConfiguration().setCacheLoaderConfiguration(getCacheLoaderConfig(JNDI_NAME));
+ cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig(JNDI_NAME));
cache.create();
1.7 +3 -3 JBossCache/tests/functional/org/jboss/cache/loader/TxCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TxCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/TxCacheLoaderTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- TxCacheLoaderTest.java 6 Sep 2006 15:30:58 -0000 1.6
+++ TxCacheLoaderTest.java 25 Oct 2006 04:50:19 -0000 1.7
@@ -16,7 +16,7 @@
/**
* @author Bela Ban
- * @version $Id: TxCacheLoaderTest.java,v 1.6 2006/09/06 15:30:58 msurtani Exp $
+ * @version $Id: TxCacheLoaderTest.java,v 1.7 2006/10/25 04:50:19 bstansberry Exp $
*/
public class TxCacheLoaderTest extends AbstractCacheLoaderTestBase
{
@@ -34,7 +34,7 @@
cache1.getConfiguration().setCacheMode("repl_sync");
cache1.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
- cache1.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location=" + location, false, false, false));
+ cache1.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location=" + location, false, false, false));
// cache1.setReplQueueInterval(3000);
cache1.create();
cache1.start();
@@ -44,7 +44,7 @@
cache2 = new TreeCache();
cache2.getConfiguration().setCacheMode("repl_sync");
cache2.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
- cache2.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location=" + location, false, false, false));
+ cache2.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "location=" + location, false, false, false));
cache2.getConfiguration().setLockAcquisitionTimeout(2000);
// cache2.setReplQueueInterval(3000);
cache2.create();
1.7 +2 -2 JBossCache/tests/functional/org/jboss/cache/loader/JDBCCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JDBCCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/JDBCCacheLoaderTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- JDBCCacheLoaderTest.java 20 Jul 2006 10:59:14 -0000 1.6
+++ JDBCCacheLoaderTest.java 25 Oct 2006 04:50:19 -0000 1.7
@@ -23,7 +23,7 @@
* must be in the lib directory.
*
* @author <a href="hmesha at novell.com">Hany Mesha</a>
- * @version <tt>$Revision: 1.6 $</tt>
+ * @version <tt>$Revision: 1.7 $</tt>
*/
public class JDBCCacheLoaderTest
extends CacheLoaderTestsBase
@@ -41,7 +41,7 @@
"cache.jdbc.user=" + prop.getProperty("cache.jdbc.user") + "\n" +
"cache.jdbc.password=" + prop.getProperty("cache.jdbc.password") + "\n" +
"cache.jdbc.node.type=" + prop.getProperty("cache.jdbc.node.type");
- cache.getConfiguration().setCacheLoaderConfiguration( getSingleCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", props, false, true, false) );
+ cache.getConfiguration().setCacheLoaderConfig( getSingleCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", props, false, true, false) );
}
public void testLargeObject()
1.9 +2 -2 JBossCache/tests/functional/org/jboss/cache/loader/TcpCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TcpCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/TcpCacheLoaderTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- TcpCacheLoaderTest.java 11 Oct 2006 10:02:07 -0000 1.8
+++ TcpCacheLoaderTest.java 25 Oct 2006 04:50:19 -0000 1.9
@@ -8,7 +8,7 @@
* Tests the TcpDelegatingCacheLoader
*
* @author Bela Ban
- * @version $Id: TcpCacheLoaderTest.java,v 1.8 2006/10/11 10:02:07 msurtani Exp $
+ * @version $Id: TcpCacheLoaderTest.java,v 1.9 2006/10/25 04:50:19 bstansberry Exp $
*/
public class TcpCacheLoaderTest extends CacheLoaderTestsBase
{
@@ -65,7 +65,7 @@
protected void configureCache() throws Exception
{
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("",
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("",
"org.jboss.cache.loader.TcpDelegatingCacheLoader",
"host=127.0.0.1\nport=12121", false, true, false));
}
More information about the jboss-cvs-commits
mailing list