[jbosscache-commits] JBoss Cache SVN: r7675 - in core/branches/flat/src: main/java/org/horizon/config and 10 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Tue Feb 10 08:56:01 EST 2009
Author: manik.surtani at jboss.com
Date: 2009-02-10 08:55:59 -0500 (Tue, 10 Feb 2009)
New Revision: 7675
Added:
core/branches/flat/src/main/java/org/horizon/loaderold/
Removed:
core/branches/flat/src/main/java/org/horizon/loader_old/
Modified:
core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java
core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java
core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java
core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java
core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java
core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java
core/branches/flat/src/main/java/org/horizon/loaderold/AbstractCacheLoaderOld.java
core/branches/flat/src/main/java/org/horizon/loaderold/AbstractDelegatingCacheLoaderOld.java
core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderConfig.java
core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderOld.java
core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoader.java
core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderManager.java
core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderOld.java
core/branches/flat/src/main/java/org/horizon/loaderold/CacheStore.java
core/branches/flat/src/main/java/org/horizon/loaderold/ChainingCacheLoaderOld.java
core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderConfig.java
core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderOld.java
core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderConfig.java
core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderOld.java
core/branches/flat/src/main/java/org/horizon/loaderold/Modification.java
core/branches/flat/src/main/java/org/horizon/loaderold/ReadOnlyDelegatingCacheLoaderOld.java
core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreCacheLoaderOld.java
core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreDefaultConfig.java
core/branches/flat/src/main/java/org/horizon/loaderold/StoredEntry.java
core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java
core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java
core/branches/flat/src/main/java/org/horizon/util/FileLookup.java
core/branches/flat/src/main/resources/config-samples/all.xml
core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java
core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java
Log:
Loaders - work in progress
Modified: core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/config/CacheLoaderConfig.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -21,8 +21,8 @@
*/
package org.horizon.config;
-import org.horizon.loader_old.CacheLoaderOld;
-import org.horizon.loader_old.SingletonStoreCacheLoaderOld;
+import org.horizon.loaderold.CacheLoaderOld;
+import org.horizon.loaderold.SingletonStoreCacheLoaderOld;
import org.horizon.util.Util;
import java.util.ArrayList;
Modified: core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/container/UnsortedDataContainer.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -22,8 +22,8 @@
package org.horizon.container;
import org.horizon.factories.annotations.Inject;
-import org.horizon.loader_old.CacheLoaderManager;
-import org.horizon.loader_old.CacheLoaderOld;
+import org.horizon.loaderold.CacheLoaderManager;
+import org.horizon.loaderold.CacheLoaderOld;
import java.util.AbstractSet;
import java.util.ArrayList;
Modified: core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -477,7 +477,7 @@
*/
public void registerDefaultClassLoader(ClassLoader loader) {
registerComponent(loader == null ? getClass().getClassLoader() : loader, ClassLoader.class);
- // make sure the class loader_old is non-volatile, so it survives restarts.
+ // make sure the class loaderold is non-volatile, so it survives restarts.
componentLookup.get(ClassLoader.class.getName()).nonVolatile = true;
}
Modified: core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -28,7 +28,7 @@
import org.horizon.factories.annotations.DefaultFactoryFor;
import org.horizon.factories.context.ContextFactory;
import org.horizon.invocation.InvocationContextContainer;
-import org.horizon.loader_old.CacheLoaderManager;
+import org.horizon.loaderold.CacheLoaderManager;
import org.horizon.marshall.Marshaller;
import org.horizon.marshall.VersionAwareMarshaller;
import org.horizon.notifications.cachelistener.CacheNotifier;
Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -35,8 +35,8 @@
import org.horizon.factories.annotations.Inject;
import org.horizon.factories.annotations.Start;
import org.horizon.interceptors.base.JmxStatsCommandInterceptor;
-import org.horizon.loader_old.CacheLoaderManager;
-import org.horizon.loader_old.CacheLoaderOld;
+import org.horizon.loaderold.CacheLoaderManager;
+import org.horizon.loaderold.CacheLoaderOld;
import org.horizon.notifications.cachelistener.CacheNotifier;
import org.horizon.transaction.TransactionTable;
Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -39,10 +39,10 @@
import org.horizon.invocation.Options;
import org.horizon.jmx.annotations.ManagedAttribute;
import org.horizon.jmx.annotations.ManagedOperation;
-import org.horizon.loader_old.CacheLoaderManager;
-import org.horizon.loader_old.CacheLoaderOld;
-import org.horizon.loader_old.Modification;
-import org.horizon.loader_old.Modification.ModificationType;
+import org.horizon.loaderold.CacheLoaderManager;
+import org.horizon.loaderold.CacheLoaderOld;
+import org.horizon.loaderold.Modification;
+import org.horizon.loaderold.Modification.ModificationType;
import org.horizon.logging.LogFactory;
import org.horizon.transaction.GlobalTransaction;
@@ -112,7 +112,7 @@
// this is a commit call.
GlobalTransaction gtx = command.getGlobalTransaction();
if (trace) log.trace("Calling loader.commit() for gtx " + gtx);
- // sync call (a write) on the loader_old
+ // sync call (a write) on the loaderold
// ignore modified FQNs
// List fqnsModified = getFqnsFromModificationList(txTable.get(globalTransaction).getCacheLoaderModifications());
try {
Copied: core/branches/flat/src/main/java/org/horizon/loaderold (from rev 7674, core/branches/flat/src/main/java/org/horizon/loader_old)
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/AbstractCacheLoaderOld.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/AbstractCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/AbstractCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.Cache;
import org.horizon.CacheException;
@@ -142,7 +142,7 @@
public void destroy() {
}
- // Adds simple transactional capabilities to cache loaders that are inherently non-transactional. If your cache loader_old implementation
+ // Adds simple transactional capabilities to cache loaders that are inherently non-transactional. If your cache loaderold implementation
// is tansactional though, then override these.
public void prepare(Object tx, List<Modification> modifications, boolean one_phase) {
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/AbstractDelegatingCacheLoaderOld.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/AbstractDelegatingCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/AbstractDelegatingCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.Cache;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderConfig.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderConfig.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderOld.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/AsyncCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/AsyncCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.CacheException;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoader.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoader.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoader.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -1,4 +1,4 @@
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.Cache;
import org.horizon.config.CacheLoaderConfig;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderManager.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderManager.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderManager.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.Cache;
import org.horizon.CacheException;
@@ -113,20 +113,20 @@
*/
private CacheLoaderOld<Object, Object> createCacheLoader() throws Exception {
CacheLoaderOld<Object, Object> tmpLoader;
- // if we only have a single cache loader_old configured in the chaining cacheloader then
- // don't use a chaining cache loader_old at all.
+ // if we only have a single cache loaderold configured in the chaining cacheloader then
+ // don't use a chaining cache loaderold at all.
ArrayList<IndividualCacheLoaderConfig> finalConfigs =
new ArrayList<IndividualCacheLoaderConfig>();
- // also if we are using passivation then just directly use the first cache loader_old.
+ // also if we are using passivation then just directly use the first cache loaderold.
if (config.useChainingCacheLoader()) {
- // create chaining cache loader_old.
+ // create chaining cache loaderold.
ChainingCacheLoaderOld<Object, Object> ccl = new ChainingCacheLoaderOld<Object, Object>();
tmpLoader = ccl;
Iterator<IndividualCacheLoaderConfig> it = config.getIndividualCacheLoaderConfigs().iterator();
- // only one cache loader_old may have fetchPersistentState to true.
+ // only one cache loaderold may have fetchPersistentState to true.
int numLoadersWithFetchPersistentState = 0;
while (it.hasNext()) {
CacheLoaderConfig.IndividualCacheLoaderConfig cfg = (CacheLoaderConfig.IndividualCacheLoaderConfig) it.next();
@@ -178,7 +178,7 @@
* @throws Exception
*/
private CacheLoaderOld<Object, Object> createCacheLoader(CacheLoaderConfig.IndividualCacheLoaderConfig cfg, Cache<Object, Object> cache) throws Exception {
- // create loader_old
+ // create loaderold
CacheLoaderOld<Object, Object> tmpLoader = cfg.getCacheLoader() == null ? createInstance(cfg.getClassName()) : cfg.getCacheLoader();
if (tmpLoader != null) {
@@ -205,7 +205,7 @@
if (decorator instanceof AbstractDelegatingCacheLoaderOld) {
@SuppressWarnings("unchecked")
AbstractDelegatingCacheLoaderOld<Object, Object> singletonDecorator = (AbstractDelegatingCacheLoaderOld<Object, Object>) decorator;
- /* set the cache loader_old to where calls will be delegated by the class providing the singleton
+ /* set the cache loaderold to where calls will be delegated by the class providing the singleton
* store functionality. */
singletonDecorator.setCacheLoader(tmpLoader);
tmpLoader = singletonDecorator;
@@ -218,7 +218,7 @@
tmpLoader.setConfig(cfg);
setCacheInLoader(cache, tmpLoader);
- // we should not be creating/starting the cache loader_old here - this should be done in the separate
+ // we should not be creating/starting the cache loaderold here - this should be done in the separate
// startCacheLoader() method.
// tmpLoader.create();
// tmpLoader.start();
@@ -256,7 +256,7 @@
if (log.isDebugEnabled()) log.debug("preloading transient state from cache loader {0}", loader);
long start, stop, total;
start = System.currentTimeMillis();
- // TODO: Call preload on the cache loader_old interface
+ // TODO: Call preload on the cache loaderold interface
if (true) throw new RuntimeException("implement me");
stop = System.currentTimeMillis();
total = stop - start;
@@ -298,9 +298,9 @@
@Stop
public void stopCacheLoader() {
if (loader != null) {
- // stop the cache loader_old
+ // stop the cache loaderold
loader.stop();
- // destroy the cache loader_old
+ // destroy the cache loaderold
loader.destroy();
}
}
@@ -324,9 +324,9 @@
// wire any deps.
registry.wireDependencies(loader);
- // create the cache loader_old
+ // create the cache loaderold
loader.create();
- // start the cache loader_old
+ // start the cache loaderold
loader.start();
purgeLoaders(false);
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderOld.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/CacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/CacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import net.jcip.annotations.ThreadSafe;
import org.horizon.Cache;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/CacheStore.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/CacheStore.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/CacheStore.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -1,4 +1,4 @@
-package org.horizon.loader;
+package org.horizon.loaderold;
import javax.transaction.Transaction;
import java.io.IOException;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/ChainingCacheLoaderOld.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/ChainingCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/ChainingCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.config.CacheLoaderConfig;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderConfig.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderConfig.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderOld.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/ClusteredCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/ClusteredCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import net.jcip.annotations.ThreadSafe;
import org.horizon.commands.CommandsFactory;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderConfig.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderConfig.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderConfig.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
import org.horizon.config.Dynamic;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderOld.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/FileCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/FileCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import net.jcip.annotations.ThreadSafe;
import org.horizon.CacheException;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/Modification.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/Modification.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/Modification.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import java.io.Serializable;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/ReadOnlyDelegatingCacheLoaderOld.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/ReadOnlyDelegatingCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/ReadOnlyDelegatingCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.logging.Log;
import org.horizon.logging.LogFactory;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreCacheLoaderOld.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreCacheLoaderOld.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreCacheLoaderOld.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.config.CacheLoaderConfig;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreDefaultConfig.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/SingletonStoreDefaultConfig.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/SingletonStoreDefaultConfig.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.horizon.loader;
+package org.horizon.loaderold;
import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig;
Modified: core/branches/flat/src/main/java/org/horizon/loaderold/StoredEntry.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/loader_old/StoredEntry.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/loaderold/StoredEntry.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -1,4 +1,4 @@
-package org.horizon.loader;
+package org.horizon.loaderold;
/**
* // TODO: Manik: Document this!
Modified: core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/marshall/HorizonMarshaller.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -263,7 +263,7 @@
Thread currentThread = Thread.currentThread();
ClassLoader old = currentThread.getContextClassLoader();
try {
- // only do this if we haven't already set a context class loader_old elsewhere.
+ // only do this if we haven't already set a context class loaderold elsewhere.
if (overrideContextClassloaderOnThread || old == null) currentThread.setContextClassLoader(loader);
return unmarshallObject(in, refMap);
}
Modified: core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -24,7 +24,7 @@
import org.horizon.config.Configuration;
import org.horizon.factories.annotations.Inject;
import org.horizon.factories.annotations.Start;
-import org.horizon.loader_old.CacheLoaderManager;
+import org.horizon.loaderold.CacheLoaderManager;
import org.horizon.logging.Log;
import org.horizon.logging.LogFactory;
import org.horizon.marshall.Marshaller;
Modified: core/branches/flat/src/main/java/org/horizon/util/FileLookup.java
===================================================================
--- core/branches/flat/src/main/java/org/horizon/util/FileLookup.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/java/org/horizon/util/FileLookup.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -67,7 +67,7 @@
ClassLoader cl = Thread.currentThread().getContextClassLoader();
InputStream is = cl == null ? null : cl.getResourceAsStream(filename);
if (is == null) {
- // check system class loader_old
+ // check system class loaderold
is = getClass().getClassLoader().getResourceAsStream(filename);
}
return is;
@@ -77,7 +77,7 @@
ClassLoader cl = Thread.currentThread().getContextClassLoader();
URL u = cl == null ? null : cl.getResource(filename);
if (u == null) {
- // check system class loader_old
+ // check system class loaderold
u = getClass().getClassLoader().getResource(filename);
}
if (u == null) {
Modified: core/branches/flat/src/main/resources/config-samples/all.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/all.xml 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/main/resources/config-samples/all.xml 2009-02-10 13:55:59 UTC (rev 7675)
@@ -129,14 +129,14 @@
Cache loaders.
If passivation is enabled, state is offloaded to the cache loaders ONLY when evicted. Similarly, when the state
- is accessed again, it is removed from the cache loader_old and loaded into memory.
+ is accessed again, it is removed from the cache loaderold and loaded into memory.
- Otherwise, state is always maintained in the cache loader_old as well as in memory.
+ Otherwise, state is always maintained in the cache loaderold as well as in memory.
- Set 'shared' to true if all instances in the cluster use the same cache loader_old instance, e.g., are talking to the
+ Set 'shared' to true if all instances in the cluster use the same cache loaderold instance, e.g., are talking to the
same database.
- If "preload" is true, all keys are loaded from the cache loader_old into memory upon starting the cache.
+ If "preload" is true, all keys are loaded from the cache loaderold into memory upon starting the cache.
-->
<loaders passivation="false" shared="false" preload="true">
Modified: core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -301,13 +301,13 @@
cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig(pasv, "/", DummyInMemoryCacheLoader.class.getName(), "debug=true", false, false, false, false));
cache.start();
-DummyInMemoryCacheLoader loader_old = (DummyInMemoryCacheLoader) cache.getCacheLoaderManager().getCacheLoader();
+DummyInMemoryCacheLoader loaderold = (DummyInMemoryCacheLoader) cache.getCacheLoaderManager().getCacheLoader();
rootNode.put("key", "value");
if (!pasv)
{
-Map m = loader_old.get(Fqn.ROOT);
+Map m = loaderold.get(Fqn.ROOT);
assertNotNull("Should not be null", m);
assertEquals("value", m.get("key"));
}
@@ -359,16 +359,16 @@
if (pasv) cache.evict(Fqn.ROOT, true);
-//now inspect the loader_old.
-assertEquals(vA, loader_old.get(nodeA.getFqn()).get(k));
-assertEquals(vB, loader_old.get(nodeB.getFqn()).get(k));
-assertEquals(vC, loader_old.get(nodeC.getFqn()).get(k));
-assertEquals(vD, loader_old.get(nodeD.getFqn()).get(k));
-assertEquals(vE, loader_old.get(nodeE.getFqn()).get(k));
+//now inspect the loaderold.
+assertEquals(vA, loaderold.get(nodeA.getFqn()).get(k));
+assertEquals(vB, loaderold.get(nodeB.getFqn()).get(k));
+assertEquals(vC, loaderold.get(nodeC.getFqn()).get(k));
+assertEquals(vD, loaderold.get(nodeD.getFqn()).get(k));
+assertEquals(vE, loaderold.get(nodeE.getFqn()).get(k));
-assertNull(loader_old.get(old_C));
-assertNull(loader_old.get(old_D));
-assertNull(loader_old.get(old_E));
+assertNull(loaderold.get(old_C));
+assertNull(loaderold.get(old_D));
+assertNull(loaderold.get(old_E));
}
*/
Modified: core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java
===================================================================
--- core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java 2009-02-10 13:51:40 UTC (rev 7674)
+++ core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java 2009-02-10 13:55:59 UTC (rev 7675)
@@ -6,8 +6,8 @@
import org.horizon.config.GlobalConfiguration;
import org.horizon.interceptors.BatchingInterceptor;
import org.horizon.interceptors.InterceptorChain;
-import org.horizon.loader_old.CacheLoaderManager;
-import org.horizon.loader_old.FileCacheLoaderConfig;
+import org.horizon.loaderold.CacheLoaderManager;
+import org.horizon.loaderold.FileCacheLoaderConfig;
import org.horizon.remoting.RPCManager;
import org.horizon.transaction.DummyTransactionManager;
import org.horizon.transaction.DummyTransactionManagerLookup;
@@ -58,7 +58,7 @@
public void testForceUnsharedComponents() throws NamedCacheNotFoundException {
CacheLoaderConfig clc = new CacheLoaderConfig();
- // TODO change this to use a dummy in memory cache loader_old instead!!
+ // TODO change this to use a dummy in memory cache loaderold instead!!
FileCacheLoaderConfig fc = new FileCacheLoaderConfig();
fc.setLocation("/tmp");
clc.addIndividualCacheLoaderConfig(fc);
More information about the jbosscache-commits
mailing list