[jbosscache-commits] JBoss Cache SVN: r7180 - in core/branches/flat/src: main/java/org/jboss/starobrno/factories and 4 other directories.

Author: jason.greene(a)jboss.com Date: 2008-11-19 23:56:54 -0500 (Wed, 19 Nov 2008) New Revision: 7180 Modified: core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigurationParser.java core/branches/flat/src/main/java/org/jboss/starobrno/factories/EmptyConstructorFactory.java core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/CacheLoaderInterceptor.java core/branches/flat/src/main/java/org/jboss/starobrno/loader/CacheLoaderManager.java core/branches/flat/src/test/java/org/jboss/starobrno/api/mvcc/read_committed/CacheAPIMVCCTest.java core/branches/flat/src/test/java/org/jboss/starobrno/api/mvcc/repeatable_read/CacheAPIMVCCTest.java Log: More cache loader fixes Modified: core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigurationParser.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigurationParser.java 2008-11-20 04:09:47 UTC (rev 7179) +++ core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigurationParser.java 2008-11-20 04:56:54 UTC (rev 7180) @@ -291,7 +291,7 @@ { if (element == null) return; //no eviction might be configured EvictionElementParser evictionElementParser = new EvictionElementParser(); - config.setEvictionConfig(evictionElementParser.parseEvictionElement(element)); + //config.setEvictionConfig(evictionElementParser.parseEvictionElement(element)); } private void configureJmxStatistics(Element element) Modified: core/branches/flat/src/main/java/org/jboss/starobrno/factories/EmptyConstructorFactory.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/factories/EmptyConstructorFactory.java 2008-11-20 04:09:47 UTC (rev 7179) +++ core/branches/flat/src/main/java/org/jboss/starobrno/factories/EmptyConstructorFactory.java 2008-11-20 04:56:54 UTC (rev 7180) @@ -22,6 +22,11 @@ package org.jboss.starobrno.factories; +import org.jboss.cache.RegionRegistry; +import org.jboss.cache.buddyreplication.BuddyFqnTransformer; +import org.jboss.cache.invocation.CacheInvocationDelegate; +import org.jboss.cache.lock.LockStrategyFactory; +import org.jboss.starobrno.RPCManager; import org.jboss.starobrno.batch.BatchContainer; import org.jboss.starobrno.commands.CommandsFactory; import org.jboss.starobrno.config.ConfigurationException; @@ -29,19 +34,13 @@ import org.jboss.starobrno.factories.annotations.DefaultFactoryFor; import org.jboss.starobrno.factories.context.ContextFactory; import org.jboss.starobrno.invocation.InvocationContextContainer; -import org.jboss.starobrno.notifications.Notifier; -import org.jboss.starobrno.transaction.TransactionTable; -import org.jboss.starobrno.remoting.RPCManagerImpl; -import org.jboss.starobrno.remoting.ChannelMessageListener; +import org.jboss.starobrno.loader.CacheLoaderManager; import org.jboss.starobrno.marshall.ExtendedMarshaller; -import org.jboss.starobrno.marshall.CacheMarshallerStarobrno; import org.jboss.starobrno.marshall.VersionAwareMarshaller; -import org.jboss.starobrno.RPCManager; -import org.jboss.cache.loader.CacheLoaderManager; -import org.jboss.cache.invocation.CacheInvocationDelegate; -import org.jboss.cache.lock.LockStrategyFactory; -import org.jboss.cache.buddyreplication.BuddyFqnTransformer; -import org.jboss.cache.RegionRegistry; +import org.jboss.starobrno.notifications.Notifier; +import org.jboss.starobrno.remoting.ChannelMessageListener; +import org.jboss.starobrno.remoting.RPCManagerImpl; +import org.jboss.starobrno.transaction.TransactionTable; /** * Simple factory that just uses reflection and an empty constructor of the component type. @@ -68,7 +67,7 @@ { componentImpl = VersionAwareMarshaller.class; } - else + else if (componentType.equals(RPCManager.class)) { componentImpl = RPCManagerImpl.class; Modified: core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/CacheLoaderInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/CacheLoaderInterceptor.java 2008-11-20 04:09:47 UTC (rev 7179) +++ core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/CacheLoaderInterceptor.java 2008-11-20 04:56:54 UTC (rev 7180) @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; -import org.jboss.cache.transaction.TransactionTable; import org.jboss.starobrno.commands.read.GetKeyValueCommand; import org.jboss.starobrno.commands.write.PutKeyValueCommand; import org.jboss.starobrno.commands.write.RemoveCommand; @@ -42,6 +41,7 @@ import org.jboss.starobrno.loader.CacheLoader; import org.jboss.starobrno.loader.CacheLoaderManager; import org.jboss.starobrno.notifications.Notifier; +import org.jboss.starobrno.transaction.TransactionTable; /** * Loads nodes that don't exist at the time of the call into memory from the CacheLoader Modified: core/branches/flat/src/main/java/org/jboss/starobrno/loader/CacheLoaderManager.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/loader/CacheLoaderManager.java 2008-11-20 04:09:47 UTC (rev 7179) +++ core/branches/flat/src/main/java/org/jboss/starobrno/loader/CacheLoaderManager.java 2008-11-20 04:56:54 UTC (rev 7180) @@ -91,7 +91,7 @@ { // TODO: Inject CacheSPI once we have the cache loaders not relying on a tree structure this.config = configuration.getCacheLoaderConfig(); -// this.cache = cache; + this.cache = cache; this.configuration = configuration; this.registry = registry; Modified: core/branches/flat/src/test/java/org/jboss/starobrno/api/mvcc/read_committed/CacheAPIMVCCTest.java =================================================================== --- core/branches/flat/src/test/java/org/jboss/starobrno/api/mvcc/read_committed/CacheAPIMVCCTest.java 2008-11-20 04:09:47 UTC (rev 7179) +++ core/branches/flat/src/test/java/org/jboss/starobrno/api/mvcc/read_committed/CacheAPIMVCCTest.java 2008-11-20 04:56:54 UTC (rev 7180) @@ -6,7 +6,7 @@ import org.testng.annotations.Test; /** - * MVCC version of {@link org.jboss.cache.api.CacheAPITest} + * MVCC version of {@link org.jboss.cache.api.CacheLoaderTest} */ @Test(groups = {"functional", "mvcc"}) public class CacheAPIMVCCTest extends CacheAPITest Modified: core/branches/flat/src/test/java/org/jboss/starobrno/api/mvcc/repeatable_read/CacheAPIMVCCTest.java =================================================================== --- core/branches/flat/src/test/java/org/jboss/starobrno/api/mvcc/repeatable_read/CacheAPIMVCCTest.java 2008-11-20 04:09:47 UTC (rev 7179) +++ core/branches/flat/src/test/java/org/jboss/starobrno/api/mvcc/repeatable_read/CacheAPIMVCCTest.java 2008-11-20 04:56:54 UTC (rev 7180) @@ -6,7 +6,7 @@ import org.testng.annotations.Test; /** - * MVCC version of {@link org.jboss.cache.api.CacheAPITest} + * MVCC version of {@link org.jboss.cache.api.CacheLoaderTest} */ @Test(groups = {"functional", "mvcc"}) public class CacheAPIMVCCTest extends CacheAPITest