[jbosscache-commits] JBoss Cache SVN: r7493 - in core/branches/flat: src/main/java/org/horizon and 34 other directories.

Author: manik.surtani(a)jboss.com Date: 2009-01-16 12:13:29 -0500 (Fri, 16 Jan 2009) New Revision: 7493 Added: core/branches/flat/src/main/java/org/horizon/logging/ core/branches/flat/src/main/java/org/horizon/logging/AbstractLogImpl.java core/branches/flat/src/main/java/org/horizon/logging/JDKLogImpl.java core/branches/flat/src/main/java/org/horizon/logging/Log.java core/branches/flat/src/main/java/org/horizon/logging/Log4JLogImpl.java core/branches/flat/src/main/java/org/horizon/logging/LogFactory.java Modified: core/branches/flat/pom.xml core/branches/flat/src/main/java/org/horizon/CacheDelegate.java core/branches/flat/src/main/java/org/horizon/CacheStatus.java core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapDelta.java core/branches/flat/src/main/java/org/horizon/cluster/ReplicationQueue.java core/branches/flat/src/main/java/org/horizon/commands/read/GetKeyValueCommand.java core/branches/flat/src/main/java/org/horizon/commands/remote/ClusteredGetCommand.java core/branches/flat/src/main/java/org/horizon/commands/remote/ReplicateCommand.java core/branches/flat/src/main/java/org/horizon/commands/write/InvalidateCommand.java core/branches/flat/src/main/java/org/horizon/config/ConfigurationComponent.java core/branches/flat/src/main/java/org/horizon/config/EvictionCacheConfig.java core/branches/flat/src/main/java/org/horizon/config/parsing/CacheConfigsXmlParser.java core/branches/flat/src/main/java/org/horizon/config/parsing/RootElementBuilder.java core/branches/flat/src/main/java/org/horizon/config/parsing/XmlConfigHelper.java core/branches/flat/src/main/java/org/horizon/container/ReadCommittedEntry.java core/branches/flat/src/main/java/org/horizon/container/RepeatableReadEntry.java core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java core/branches/flat/src/main/java/org/horizon/eviction/DefaultEvictionAction.java core/branches/flat/src/main/java/org/horizon/eviction/EvictionCacheManagerImpl.java core/branches/flat/src/main/java/org/horizon/eviction/EvictionManagerImpl.java core/branches/flat/src/main/java/org/horizon/eviction/EvictionTimerTask.java core/branches/flat/src/main/java/org/horizon/eviction/RemoveOnEvictActionPolicy.java core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseEvictionAlgorithm.java core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseSortedEvictionAlgorithm.java core/branches/flat/src/main/java/org/horizon/eviction/algorithms/ExpirationAlgorithm.java core/branches/flat/src/main/java/org/horizon/eviction/algorithms/fifo/FIFOAlgorithm.java core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lfu/LFUAlgorithm.java core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lru/LRUAlgorithm.java core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java core/branches/flat/src/main/java/org/horizon/factories/ComponentFactory.java core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/InterceptorChain.java core/branches/flat/src/main/java/org/horizon/interceptors/base/CommandInterceptor.java core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java core/branches/flat/src/main/java/org/horizon/jmx/ResourceDMBean.java core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java core/branches/flat/src/main/java/org/horizon/marshall/CacheMarshallerStarobrno.java core/branches/flat/src/main/java/org/horizon/marshall/VersionAwareMarshaller.java core/branches/flat/src/main/java/org/horizon/notifications/NotifierImpl.java core/branches/flat/src/main/java/org/horizon/remoting/ChannelMessageListener.java core/branches/flat/src/main/java/org/horizon/remoting/RPCManagerImpl.java core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java core/branches/flat/src/main/java/org/horizon/transaction/BatchModeTransactionManager.java core/branches/flat/src/main/java/org/horizon/transaction/DummyBaseTransactionManager.java core/branches/flat/src/main/java/org/horizon/transaction/DummyTransaction.java core/branches/flat/src/main/java/org/horizon/transaction/DummyTransactionManager.java core/branches/flat/src/main/java/org/horizon/transaction/DummyUserTransaction.java core/branches/flat/src/main/java/org/horizon/transaction/GenericTransactionManagerLookup.java core/branches/flat/src/main/java/org/horizon/transaction/TransactionTable.java core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java core/branches/flat/src/main/java/org/horizon/util/FileLookup.java core/branches/flat/src/main/java/org/horizon/util/ReflectionUtil.java core/branches/flat/src/main/java/org/horizon/util/TypedProperties.java core/branches/flat/src/main/java/org/horizon/util/internals/ReplicationListener.java core/branches/flat/src/test/java/org/horizon/BasicTest.java core/branches/flat/src/test/java/org/horizon/UnitTestCacheFactory.java core/branches/flat/src/test/java/org/horizon/api/mvcc/LockTestBase.java core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java core/branches/flat/src/test/java/org/horizon/profiling/ProfileTest.java core/branches/flat/src/test/java/org/horizon/profiling/TreeProfileTest.java core/branches/flat/src/test/java/org/horizon/replication/SyncCacheListenerTest.java Log: Removed dependencies on commons logging and used custom log layer to switch between Log4J (optional) and JDK logging. Also added SEAM style parameterization of log messages. Modified: core/branches/flat/pom.xml =================================================================== --- core/branches/flat/pom.xml 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/pom.xml 2009-01-16 17:13:29 UTC (rev 7493) @@ -38,12 +38,6 @@ </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - - <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> <version>2.2.8.GA</version> @@ -56,24 +50,28 @@ <version>1.0</version> <optional>true</optional> </dependency> + <dependency> <groupId>c3p0</groupId> <artifactId>c3p0</artifactId> <version>0.9.1.1</version> <optional>true</optional> </dependency> + <dependency> <groupId>sleepycat</groupId> <artifactId>je</artifactId> <version>1.7.0</version> <optional>true</optional> </dependency> + <dependency> <groupId>net.jcip</groupId> <artifactId>jcip-annotations</artifactId> <version>1.0</version> <optional>true</optional> </dependency> + <dependency> <groupId>net.noderunner</groupId> <artifactId>amazon-s3</artifactId> @@ -81,6 +79,13 @@ <optional>true</optional> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <optional>true</optional> + </dependency> + <!-- test dependencies --> <dependency> <groupId>org.easymock</groupId> @@ -88,24 +93,28 @@ <version>2.4</version> <scope>test</scope> </dependency> + <dependency> <groupId>jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> <version>4.3.0.GA</version> <scope>test</scope> </dependency> + <dependency> <groupId>beanshell</groupId> <artifactId>bsh</artifactId> <version>2.0b4</version> <scope>test</scope> </dependency> + <dependency> <groupId>net.noderunner</groupId> <artifactId>http</artifactId> <version>1.0</version> <scope>test</scope> </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> Modified: core/branches/flat/src/main/java/org/horizon/CacheDelegate.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/CacheDelegate.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/CacheDelegate.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.atomic.AtomicHashMap; import org.horizon.atomic.AtomicMap; import org.horizon.atomic.AtomicMapCache; @@ -48,6 +46,8 @@ import org.horizon.invocation.InvocationContextContainer; import org.horizon.loader.CacheLoaderManager; import org.horizon.lock.LockManager; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.marshall.Marshaller; import org.horizon.notifications.Notifier; import org.horizon.remoting.RPCManager; Modified: core/branches/flat/src/main/java/org/horizon/CacheStatus.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/CacheStatus.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/CacheStatus.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,8 @@ */ package org.horizon; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; /** * Various states that an object that has a four stage lifecycle (i.e. <code>create()</code>, <code>start()</code>, Modified: core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapDelta.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapDelta.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/atomic/AtomicHashMapDelta.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,8 @@ */ package org.horizon.atomic; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.io.IOException; import java.io.ObjectInput; Modified: core/branches/flat/src/main/java/org/horizon/cluster/ReplicationQueue.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/cluster/ReplicationQueue.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/cluster/ReplicationQueue.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.cluster; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.commands.CommandsFactory; import org.horizon.commands.ReplicableCommand; import org.horizon.commands.remote.ReplicateCommand; @@ -30,6 +28,8 @@ import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; import org.horizon.factories.annotations.Stop; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.remoting.RPCManager; import java.util.ArrayList; Modified: core/branches/flat/src/main/java/org/horizon/commands/read/GetKeyValueCommand.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/commands/read/GetKeyValueCommand.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/commands/read/GetKeyValueCommand.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,11 +21,11 @@ */ package org.horizon.commands.read; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.commands.Visitor; import org.horizon.container.MVCCEntry; import org.horizon.context.InvocationContext; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.notifications.Notifier; /** Modified: core/branches/flat/src/main/java/org/horizon/commands/remote/ClusteredGetCommand.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/commands/remote/ClusteredGetCommand.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/commands/remote/ClusteredGetCommand.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,13 +21,13 @@ */ package org.horizon.commands.remote; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.commands.DataCommand; import org.horizon.commands.ReplicableCommand; import org.horizon.container.DataContainer; import org.horizon.context.InvocationContext; import org.horizon.interceptors.InterceptorChain; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.ArrayList; import java.util.List; Modified: core/branches/flat/src/main/java/org/horizon/commands/remote/ReplicateCommand.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/commands/remote/ReplicateCommand.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/commands/remote/ReplicateCommand.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,12 +21,12 @@ */ package org.horizon.commands.remote; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.commands.ReplicableCommand; import org.horizon.commands.VisitableCommand; import org.horizon.context.InvocationContext; import org.horizon.interceptors.InterceptorChain; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.ArrayList; import java.util.List; Modified: core/branches/flat/src/main/java/org/horizon/commands/write/InvalidateCommand.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/commands/write/InvalidateCommand.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/commands/write/InvalidateCommand.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,13 +21,13 @@ */ package org.horizon.commands.write; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheSPI; import org.horizon.commands.Visitor; import org.horizon.commands.read.AbstractDataCommand; import org.horizon.container.DataContainer; import org.horizon.context.InvocationContext; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.notifications.Notifier; import org.horizon.tree.Fqn; Modified: core/branches/flat/src/main/java/org/horizon/config/ConfigurationComponent.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/ConfigurationComponent.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/config/ConfigurationComponent.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.config; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheSPI; import org.horizon.CacheStatus; import org.horizon.factories.ComponentRegistry; @@ -30,6 +28,8 @@ import org.horizon.factories.annotations.Start; import org.horizon.factories.scopes.Scope; import org.horizon.factories.scopes.Scopes; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.Collection; import java.util.Collections; Modified: core/branches/flat/src/main/java/org/horizon/config/EvictionCacheConfig.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/EvictionCacheConfig.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/config/EvictionCacheConfig.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,7 +21,7 @@ */ package org.horizon.config; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.LogFactory; public class EvictionCacheConfig extends ConfigurationComponent { /** Modified: core/branches/flat/src/main/java/org/horizon/config/parsing/CacheConfigsXmlParser.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/parsing/CacheConfigsXmlParser.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/config/parsing/CacheConfigsXmlParser.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,10 +21,10 @@ */ package org.horizon.config.parsing; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.Configuration; import org.horizon.config.ConfigurationException; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.util.FileLookup; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: core/branches/flat/src/main/java/org/horizon/config/parsing/RootElementBuilder.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/parsing/RootElementBuilder.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/config/parsing/RootElementBuilder.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,9 +21,9 @@ */ package org.horizon.config.parsing; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.ConfigurationException; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.jboss.util.xml.JBossEntityResolver; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: core/branches/flat/src/main/java/org/horizon/config/parsing/XmlConfigHelper.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/config/parsing/XmlConfigHelper.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/config/parsing/XmlConfigHelper.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,9 +21,9 @@ */ package org.horizon.config.parsing; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.ConfigurationException; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.util.BeanUtils; import org.jboss.util.StringPropertyReplacer; import org.w3c.dom.Document; @@ -186,7 +186,7 @@ } } - if (log.isDebugEnabled()) log.debug("getSubElement(): Does not exist for " + subElementName); + if (log.isDebugEnabled()) log.debug("getSubElement(): Does not exist for {0}", subElementName); return null; } @@ -512,7 +512,7 @@ Map<String, String> stringAttribs = new HashMap<String, String>(); Map<String, Element> xmlAttribs = new HashMap<String, Element>(); NodeList list = source.getElementsByTagName(ATTR); - if (log.isDebugEnabled()) log.debug("Attribute size: " + list.getLength()); + if (log.isDebugEnabled()) log.debug("Attribute size: {0}", list.getLength()); // loop through attributes for (int loop = 0; loop < list.getLength(); loop++) { Modified: core/branches/flat/src/main/java/org/horizon/container/ReadCommittedEntry.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/container/ReadCommittedEntry.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/container/ReadCommittedEntry.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,10 +21,10 @@ */ package org.horizon.container; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import static org.horizon.container.ReadCommittedEntry.Flags.*; import org.horizon.context.InvocationContext; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; /** * A node delegate that encapsulates read committed semantics when writes are initiated, committed or rolled back. Modified: core/branches/flat/src/main/java/org/horizon/container/RepeatableReadEntry.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/container/RepeatableReadEntry.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/container/RepeatableReadEntry.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,10 +21,10 @@ */ package org.horizon.container; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import static org.horizon.container.ReadCommittedEntry.Flags.CHANGED; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; /** * A node delegate that encapsulates repeatable read semantics when writes are initiated, committed or rolled back. Modified: core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/context/InvocationContextImpl.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,10 +21,10 @@ */ package org.horizon.context; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.Option; import org.horizon.container.MVCCEntry; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.transaction.GlobalTransaction; import org.horizon.transaction.TransactionTable; import org.horizon.util.FastCopyHashMap; Modified: core/branches/flat/src/main/java/org/horizon/eviction/DefaultEvictionAction.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/eviction/DefaultEvictionAction.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/eviction/DefaultEvictionAction.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,9 +21,9 @@ */ package org.horizon.eviction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.Cache; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; /** * Default eviction action policy that calls {@link Cache#evict(Object)} to evict a node. @@ -41,15 +41,15 @@ } public boolean evict(K key) { - if (trace) log.trace("Attempting to evict cache node with key of " + key); + if (trace) log.trace("Attempting to evict cache node with key of {0}", key); try { cache.evict(key); - log.trace("Eviction of cache node with key of " + key + " successful"); + log.trace("Eviction of cache node with key of {0} successful", key); return true; } catch (Exception e) { - if (log.isDebugEnabled()) log.debug("Unable to evict " + key, e); + if (log.isDebugEnabled()) log.debug("Unable to evict {0}", e, key); return false; } } Modified: core/branches/flat/src/main/java/org/horizon/eviction/EvictionCacheManagerImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/eviction/EvictionCacheManagerImpl.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/eviction/EvictionCacheManagerImpl.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -1,10 +1,10 @@ package org.horizon.eviction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheSPI; import org.horizon.config.EvictionAlgorithmConfig; import org.horizon.config.EvictionCacheConfig; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.util.Util; import java.util.concurrent.BlockingQueue; Modified: core/branches/flat/src/main/java/org/horizon/eviction/EvictionManagerImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/eviction/EvictionManagerImpl.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/eviction/EvictionManagerImpl.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -1,9 +1,9 @@ package org.horizon.eviction; import net.jcip.annotations.ThreadSafe; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.EvictionManager; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.HashMap; import java.util.Map; Modified: core/branches/flat/src/main/java/org/horizon/eviction/EvictionTimerTask.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/eviction/EvictionTimerTask.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/eviction/EvictionTimerTask.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,9 +21,9 @@ */ package org.horizon.eviction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.EvictionManager; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; Modified: core/branches/flat/src/main/java/org/horizon/eviction/RemoveOnEvictActionPolicy.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/eviction/RemoveOnEvictActionPolicy.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/eviction/RemoveOnEvictActionPolicy.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,9 +21,9 @@ */ package org.horizon.eviction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.Cache; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; /** * An eviction action policy that calls {@link Cache#remove(Object)} to evict an entry. Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseEvictionAlgorithm.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseEvictionAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseEvictionAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.eviction.algorithms; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheSPI; import org.horizon.config.EvictionAlgorithmConfig; import org.horizon.eviction.EvictionAction; @@ -32,6 +30,8 @@ import org.horizon.eviction.EvictionException; import org.horizon.eviction.EvictionQueue; import org.horizon.eviction.KeyEntry; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseSortedEvictionAlgorithm.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseSortedEvictionAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/BaseSortedEvictionAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,10 +21,10 @@ */ package org.horizon.eviction.algorithms; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.eviction.EvictionEvent; import org.horizon.eviction.EvictionException; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.concurrent.BlockingQueue; Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/ExpirationAlgorithm.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/ExpirationAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/ExpirationAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.eviction.algorithms; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.EvictionAlgorithmConfig; import org.horizon.eviction.EvictionEvent; import org.horizon.eviction.EvictionEvent.Type; @@ -30,6 +28,8 @@ import org.horizon.eviction.EvictionQueue; import org.horizon.eviction.ExpirationAlgorithmConfig; import org.horizon.eviction.KeyEntry; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.Iterator; import java.util.SortedSet; Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/fifo/FIFOAlgorithm.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/fifo/FIFOAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/fifo/FIFOAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,13 +21,13 @@ */ package org.horizon.eviction.algorithms.fifo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.EvictionAlgorithmConfig; import org.horizon.eviction.EvictionException; import org.horizon.eviction.EvictionQueue; import org.horizon.eviction.KeyEntry; import org.horizon.eviction.algorithms.BaseEvictionAlgorithm; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; /** * First-in-first-out algorithm used to evict nodes. Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lfu/LFUAlgorithm.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lfu/LFUAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lfu/LFUAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,13 +21,13 @@ */ package org.horizon.eviction.algorithms.lfu; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.EvictionAlgorithmConfig; import org.horizon.eviction.EvictionException; import org.horizon.eviction.EvictionQueue; import org.horizon.eviction.KeyEntry; import org.horizon.eviction.algorithms.BaseSortedEvictionAlgorithm; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; /** * Least Frequently Used algorithm for cache eviction. Note that this algorithm is not thread-safe. Modified: core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lru/LRUAlgorithm.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lru/LRUAlgorithm.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/eviction/algorithms/lru/LRUAlgorithm.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,13 +21,13 @@ */ package org.horizon.eviction.algorithms.lru; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.EvictionAlgorithmConfig; import org.horizon.eviction.EvictionException; import org.horizon.eviction.EvictionQueue; import org.horizon.eviction.KeyEntry; import org.horizon.eviction.algorithms.BaseEvictionAlgorithm; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.Iterator; Modified: core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/factories/AbstractComponentRegistry.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.factories; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import org.horizon.CacheStatus; import org.horizon.Version; @@ -38,6 +36,8 @@ import org.horizon.factories.scopes.Scope; import org.horizon.factories.scopes.Scopes; import org.horizon.lifecycle.Lifecycle; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.util.BeanUtils; import org.horizon.util.ReflectionUtil; Modified: core/branches/flat/src/main/java/org/horizon/factories/ComponentFactory.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/ComponentFactory.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/factories/ComponentFactory.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,13 +21,13 @@ */ package org.horizon.factories; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.Configuration; import org.horizon.config.ConfigurationException; import org.horizon.factories.annotations.Inject; import org.horizon.factories.scopes.Scope; import org.horizon.factories.scopes.Scopes; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; /** * Factory that creates components used internally within JBoss Cache, and also wires dependencies into the components. Modified: core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.factories; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.Configuration; import org.horizon.container.DataContainer; import org.horizon.container.MVCCEntry; @@ -35,6 +33,8 @@ import org.horizon.lock.IsolationLevel; import org.horizon.lock.LockManager; import org.horizon.lock.TimeoutException; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.notifications.Notifier; /** Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheStoreInterceptor.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,7 +21,6 @@ */ package org.horizon.interceptors; -import org.apache.commons.logging.LogFactory; import org.horizon.commands.AbstractVisitor; import org.horizon.commands.VisitableCommand; import org.horizon.commands.tx.CommitCommand; @@ -43,6 +42,7 @@ import org.horizon.loader.CacheLoaderManager; import org.horizon.loader.Modification; import org.horizon.loader.Modification.ModificationType; +import org.horizon.logging.LogFactory; import org.horizon.transaction.GlobalTransaction; import javax.transaction.SystemException; Modified: core/branches/flat/src/main/java/org/horizon/interceptors/InterceptorChain.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/InterceptorChain.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/interceptors/InterceptorChain.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.interceptors; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import org.horizon.commands.VisitableCommand; import org.horizon.context.InvocationContext; @@ -32,6 +30,8 @@ import org.horizon.factories.scopes.Scopes; import org.horizon.interceptors.base.CommandInterceptor; import org.horizon.invocation.InvocationContextContainer; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.ArrayList; import java.util.Collections; Modified: core/branches/flat/src/main/java/org/horizon/interceptors/base/CommandInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/base/CommandInterceptor.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/interceptors/base/CommandInterceptor.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.interceptors.base; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.commands.AbstractVisitor; import org.horizon.commands.VisitableCommand; import org.horizon.config.Configuration; @@ -30,6 +28,8 @@ import org.horizon.factories.annotations.Inject; import org.horizon.factories.scopes.Scope; import org.horizon.factories.scopes.Scopes; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; /** * This is the base class for all interceptors to extend, and implements the {@link org.horizon.commands.Visitor} Modified: core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/jmx/JmxRegistrationManager.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,13 +21,13 @@ */ package org.horizon.jmx; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.Cache; import org.horizon.CacheException; import org.horizon.CacheSPI; import org.horizon.config.Configuration; import org.horizon.factories.ComponentRegistry; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; Modified: core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/jmx/PlatformMBeanServerRegistration.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,14 +21,14 @@ */ package org.horizon.jmx; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheSPI; import org.horizon.config.Configuration; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.NonVolatile; import org.horizon.factories.annotations.Start; import org.horizon.factories.annotations.Stop; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; /** * If {@link Configuration#getExposeManagementStatistics()} is true, then class will register all the MBeans from the Modified: core/branches/flat/src/main/java/org/horizon/jmx/ResourceDMBean.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/jmx/ResourceDMBean.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/jmx/ResourceDMBean.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,11 +21,11 @@ */ package org.horizon.jmx; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.jmx.annotations.MBean; import org.horizon.jmx.annotations.ManagedAttribute; import org.horizon.jmx.annotations.ManagedOperation; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import javax.management.Attribute; import javax.management.AttributeList; Modified: core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/loader/AbstractCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,10 +21,10 @@ */ package org.horizon.loader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import org.horizon.CacheSPI; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.marshall.EntryData; import org.horizon.marshall.EntryDataExceptionMarker; import org.horizon.marshall.EntryDataMarker; Modified: core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/loader/AsyncCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,10 +21,10 @@ */ package org.horizon.loader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.ArrayList; import java.util.List; Modified: core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/loader/CacheLoaderManager.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.loader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import org.horizon.CacheSPI; import org.horizon.config.CacheLoaderConfig; @@ -34,6 +32,8 @@ import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; import org.horizon.factories.annotations.Stop; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.util.ReflectionUtil; import java.util.ArrayList; Modified: core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/loader/ClusteredCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -22,14 +22,14 @@ package org.horizon.loader; import net.jcip.annotations.ThreadSafe; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheStatus; import org.horizon.commands.CommandsFactory; import org.horizon.commands.DataCommand; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; import org.horizon.factories.annotations.Inject; import org.horizon.lock.StripedLock; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.tree.Fqn; import org.jgroups.Address; import org.jgroups.blocks.RspFilter; Modified: core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/loader/FileCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -22,11 +22,11 @@ package org.horizon.loader; import net.jcip.annotations.ThreadSafe; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig; import org.horizon.lock.StripedLock; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.marshall.EntryData; import org.jboss.util.stream.MarshalledValueInputStream; Modified: core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/loader/ReadOnlyDelegatingCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,8 @@ */ package org.horizon.loader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.io.ObjectInputStream; import java.util.List; Modified: core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/loader/SingletonStoreCacheLoader.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,10 +21,10 @@ */ package org.horizon.loader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.CacheLoaderConfig; import org.horizon.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.notifications.annotation.CacheListener; import org.horizon.notifications.annotation.CacheStarted; import org.horizon.notifications.annotation.CacheStopped; Modified: core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/lock/StripedLockManager.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,13 +21,13 @@ */ package org.horizon.lock; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.Configuration; import org.horizon.context.InvocationContext; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; import org.horizon.invocation.InvocationContextContainer; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.util.concurrent.locks.LockContainer; import org.horizon.util.concurrent.locks.OwnableReentrantLock; import org.horizon.util.concurrent.locks.OwnableReentrantLockContainer; Added: core/branches/flat/src/main/java/org/horizon/logging/AbstractLogImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/logging/AbstractLogImpl.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/logging/AbstractLogImpl.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -0,0 +1,70 @@ +package org.horizon.logging; + +/** + * Abstract log implementation that handles message interpolation + * + * @author Manik Surtani + */ +public abstract class AbstractLogImpl implements Log { + public void trace(Object message, Object... params) { + if (isTraceEnabled()) trace(substitute(message, params)); + } + + public void debug(Object message, Object... params) { + if (isDebugEnabled()) debug(substitute(message, params)); + } + + public void info(Object message, Object... params) { + if (isInfoEnabled()) info(substitute(message, params)); + } + + public void warn(Object message, Object... params) { + if (isWarnEnabled()) warn(substitute(message, params)); + } + + public void error(Object message, Object... params) { + if (isErrorEnabled()) error(substitute(message, params)); + } + + public void fatal(Object message, Object... params) { + if (isFatalEnabled()) fatal(substitute(message, params)); + } + + public void trace(Object message, Throwable t, Object... params) { + if (isTraceEnabled()) trace(substitute(message, params), t); + } + + public void debug(Object message, Throwable t, Object... params) { + if (isDebugEnabled()) debug(substitute(message, params), t); + } + + public void info(Object message, Throwable t, Object... params) { + if (isInfoEnabled()) info(substitute(message, params), t); + } + + public void warn(Object message, Throwable t, Object... params) { + if (isWarnEnabled()) warn(substitute(message, params), t); + } + + public void error(Object message, Throwable t, Object... params) { + if (isErrorEnabled()) error(substitute(message, params), t); + } + + public void fatal(Object message, Throwable t, Object... params) { + if (isFatalEnabled()) fatal(substitute(message, params), t); + } + + private Object substitute(Object message, Object... params) { + if (params.length == 0) return message; + + StringBuilder value = new StringBuilder(String.valueOf(message)); + for (int i = 0; i < params.length; i++) { + String placeholder = "{" + i + "}"; + int phIndex; + if ((phIndex = value.indexOf(placeholder)) > -1) { + value = value.replace(phIndex, phIndex + placeholder.length(), String.valueOf(params[i])); + } + } + return value.toString(); + } +} Added: core/branches/flat/src/main/java/org/horizon/logging/JDKLogImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/logging/JDKLogImpl.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/logging/JDKLogImpl.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -0,0 +1,111 @@ +package org.horizon.logging; + +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * Logger that delivers messages to a JDK logger + * + * @author Manik Surtani + * @since 1.0 + */ +public class JDKLogImpl extends AbstractLogImpl { + + private final Logger logger; + + public JDKLogImpl(String category) { + logger = Logger.getLogger(category); + } + + private void log(Level level, Object object, Throwable ex) { + if (logger.isLoggable(level)) { + Throwable dummyException = new Throwable(); + StackTraceElement locations[] = dummyException.getStackTrace(); + String className = "unknown"; + String methodName = "unknown"; + int depth = 2; + if (locations != null && locations.length > depth) { + StackTraceElement caller = locations[depth]; + className = caller.getClassName(); + methodName = caller.getMethodName(); + } + if (ex == null) { + logger.logp(level, className, methodName, String.valueOf(object)); + } else { + logger.logp(level, className, methodName, String.valueOf(object), ex); + } + } + } + + public void trace(Object message) { + log(Level.FINER, message, null); + } + + public void debug(Object message) { + log(Level.FINE, message, null); + } + + public void info(Object message) { + log(Level.INFO, message, null); + } + + public void warn(Object message) { + log(Level.WARNING, message, null); + } + + public void error(Object message) { + log(Level.SEVERE, message, null); + } + + public void fatal(Object message) { + log(Level.SEVERE, message, null); + } + + public void trace(Object message, Throwable t) { + log(Level.FINER, message, t); + } + + public void debug(Object message, Throwable t) { + log(Level.FINE, message, t); + } + + public void info(Object message, Throwable t) { + log(Level.INFO, message, t); + } + + public void warn(Object message, Throwable t) { + log(Level.WARNING, message, t); + } + + public void error(Object message, Throwable t) { + log(Level.SEVERE, message, t); + } + + public void fatal(Object message, Throwable t) { + log(Level.SEVERE, message, t); + } + + public boolean isTraceEnabled() { + return logger.isLoggable(Level.FINER); + } + + public boolean isDebugEnabled() { + return logger.isLoggable(Level.FINE); + } + + public boolean isInfoEnabled() { + return logger.isLoggable(Level.INFO); + } + + public boolean isWarnEnabled() { + return logger.isLoggable(Level.WARNING); + } + + public boolean isErrorEnabled() { + return logger.isLoggable(Level.SEVERE); + } + + public boolean isFatalEnabled() { + return logger.isLoggable(Level.SEVERE); + } +} Added: core/branches/flat/src/main/java/org/horizon/logging/Log.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/logging/Log.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/logging/Log.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -0,0 +1,99 @@ +package org.horizon.logging; + +/** + * Horizon's log abstraction layer. + * <p/> + * Usage is very similar to Apache's Commons Logging, except that there are no additional dependencies beyond a JDK. + * <p/> + * <code> Log log = LogFactory.getLog( getClass() ); </code> The above will get you an instance of <tt>Log</tt>, which + * can be used to generate log messages either to Log4J (if the libraries are present) or (if not) the built-in JDK + * logger. + * <p/> + * In addition to the 6 log levels available, this framework also supports parameter interpolation, inspired by <a + * href="http://www.seamframework.org">SEAM</a>'s similar approach. What this means is, that the following block: + * <code> if (log.isTraceEnabled()) { log.trace("This is a message " + message + " and some other value is " + value); } + * </code> + * <p/> + * ... could be replaced with ... + * <p/> + * <code> log.trace("This is a message {0} and some other value is {1}", message, value); </code> + * <p/> + * with no performance penalty for when trace is not enabled. This greatly enhances code readability. + * <p/> + * However, if <tt>message</tt> or <tt>value</tt> need to be calculated especially for the log message, then the + * <tt>isTraceEnabled()</tt> paradigm should still be used. + * <p/> + * If you are passing a <tt>Throwable</tt>, note that this should be passed in <i>before</i> the vararg parameter list. + * <p/> + * + * @author Manik Surtani + * @since 1.0 + */ +public interface Log { + + // methods that support parameter substitution + + void trace(Object message, Object... params); + + void debug(Object message, Object... params); + + void info(Object message, Object... params); + + void warn(Object message, Object... params); + + void error(Object message, Object... params); + + void fatal(Object message, Object... params); + + void trace(Object message, Throwable t, Object... params); + + void debug(Object message, Throwable t, Object... params); + + void info(Object message, Throwable t, Object... params); + + void warn(Object message, Throwable t, Object... params); + + void error(Object message, Throwable t, Object... params); + + void fatal(Object message, Throwable t, Object... params); + + // methods that do not support parameter substitution + + void trace(Object message); + + void debug(Object message); + + void info(Object message); + + void warn(Object message); + + void error(Object message); + + void fatal(Object message); + + void trace(Object message, Throwable t); + + void debug(Object message, Throwable t); + + void info(Object message, Throwable t); + + void warn(Object message, Throwable t); + + void error(Object message, Throwable t); + + void fatal(Object message, Throwable t); + + // methods to test log levels + + boolean isTraceEnabled(); + + boolean isDebugEnabled(); + + boolean isInfoEnabled(); + + boolean isWarnEnabled(); + + boolean isErrorEnabled(); + + boolean isFatalEnabled(); +} Added: core/branches/flat/src/main/java/org/horizon/logging/Log4JLogImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/logging/Log4JLogImpl.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/logging/Log4JLogImpl.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -0,0 +1,104 @@ +package org.horizon.logging; + +import org.apache.log4j.Level; +import org.apache.log4j.Logger; + +/** + * Logger that delivers messages to a Log4J logger + * + * @author Manik Surtani + * @since 1.0 + */ +public class Log4JLogImpl extends AbstractLogImpl { + + private final Logger logger; + + private static final Level TRACE; + + static { + Object trace; + try { + trace = Level.class.getDeclaredField("TRACE").get(null); + } + catch (Exception e) { + trace = Level.DEBUG; + } + TRACE = (Level) trace; + } + + public Log4JLogImpl(String category) { + logger = Logger.getLogger(category); + } + + public void trace(Object message) { + logger.log(Log4JLogImpl.class.getName(), TRACE, message, null); + } + + public void debug(Object message) { + logger.log(Log4JLogImpl.class.getName(), Level.DEBUG, message, null); + } + + public void info(Object message) { + logger.log(Log4JLogImpl.class.getName(), Level.INFO, message, null); + } + + public void warn(Object message) { + logger.log(Log4JLogImpl.class.getName(), Level.WARN, message, null); + } + + public void error(Object message) { + logger.log(Log4JLogImpl.class.getName(), Level.ERROR, message, null); + } + + public void fatal(Object message) { + logger.log(Log4JLogImpl.class.getName(), Level.FATAL, message, null); + } + + public void trace(Object message, Throwable t) { + logger.log(Log4JLogImpl.class.getName(), TRACE, message, t); + } + + public void debug(Object message, Throwable t) { + logger.log(Log4JLogImpl.class.getName(), Level.DEBUG, message, t); + } + + public void info(Object message, Throwable t) { + logger.log(Log4JLogImpl.class.getName(), Level.INFO, message, t); + } + + public void warn(Object message, Throwable t) { + logger.log(Log4JLogImpl.class.getName(), Level.WARN, message, t); + } + + public void error(Object message, Throwable t) { + logger.log(Log4JLogImpl.class.getName(), Level.ERROR, message, t); + } + + public void fatal(Object message, Throwable t) { + logger.log(Log4JLogImpl.class.getName(), Level.FATAL, message, t); + } + + public boolean isTraceEnabled() { + return logger.isEnabledFor(TRACE); + } + + public boolean isDebugEnabled() { + return logger.isEnabledFor(Level.DEBUG); + } + + public boolean isInfoEnabled() { + return logger.isEnabledFor(Level.INFO); + } + + public boolean isWarnEnabled() { + return logger.isEnabledFor(Level.WARN); + } + + public boolean isErrorEnabled() { + return logger.isEnabledFor(Level.ERROR); + } + + public boolean isFatalEnabled() { + return logger.isEnabledFor(Level.FATAL); + } +} Added: core/branches/flat/src/main/java/org/horizon/logging/LogFactory.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/logging/LogFactory.java (rev 0) +++ core/branches/flat/src/main/java/org/horizon/logging/LogFactory.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -0,0 +1,36 @@ +package org.horizon.logging; + +/** + * Factory that creates {@link Log} instances. + * + * @author Manik Surtani + * @since 1.0 + */ +public class LogFactory { + + private static final boolean IS_LOG4J_AVAILABLE; + + static { + boolean available; + try { + Class.forName("org.apache.log4j.Logger"); + available = true; + } + catch (ClassNotFoundException cnfe) { + available = false; + } + IS_LOG4J_AVAILABLE = available; + } + + public static Log getLog(Class clazz) { + return getLog(clazz.getName()); + } + + public static Log getLog(String category) { + if (IS_LOG4J_AVAILABLE) { + return new Log4JLogImpl(category); + } else { + return new JDKLogImpl(category); + } + } +} Modified: core/branches/flat/src/main/java/org/horizon/marshall/CacheMarshallerStarobrno.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/marshall/CacheMarshallerStarobrno.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/marshall/CacheMarshallerStarobrno.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.marshall; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import org.horizon.atomic.DeltaAware; import org.horizon.commands.CommandsFactory; @@ -30,6 +28,8 @@ import org.horizon.config.Configuration; import org.horizon.io.ByteBuffer; import org.horizon.io.ExposedByteArrayOutputStream; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.transaction.GlobalTransaction; import org.horizon.util.FastCopyHashMap; import org.horizon.util.Immutables; Modified: core/branches/flat/src/main/java/org/horizon/marshall/VersionAwareMarshaller.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/marshall/VersionAwareMarshaller.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/marshall/VersionAwareMarshaller.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,13 +21,13 @@ */ package org.horizon.marshall; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.commands.CommandsFactory; import org.horizon.config.Configuration; import org.horizon.factories.annotations.Inject; import org.horizon.io.ByteBuffer; import org.horizon.io.ExposedByteArrayOutputStream; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.jboss.util.stream.MarshalledValueInputStream; import java.io.ByteArrayInputStream; Modified: core/branches/flat/src/main/java/org/horizon/notifications/NotifierImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/notifications/NotifierImpl.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/notifications/NotifierImpl.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.notifications; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.Cache; import org.horizon.CacheException; import org.horizon.CacheSPI; @@ -35,6 +33,8 @@ import org.horizon.factories.annotations.Stop; import org.horizon.factories.scopes.Scope; import org.horizon.factories.scopes.Scopes; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.notifications.annotation.*; import org.horizon.notifications.event.*; import static org.horizon.notifications.event.Event.Type.*; Modified: core/branches/flat/src/main/java/org/horizon/remoting/ChannelMessageListener.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/remoting/ChannelMessageListener.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/remoting/ChannelMessageListener.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,13 +21,13 @@ */ package org.horizon.remoting; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import org.horizon.config.Configuration; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.NonVolatile; import org.horizon.io.ExposedByteArrayOutputStream; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.statetransfer.DefaultStateTransferManager; import org.horizon.statetransfer.StateTransferManager; import org.horizon.tree.Fqn; Modified: core/branches/flat/src/main/java/org/horizon/remoting/RPCManagerImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/remoting/RPCManagerImpl.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/remoting/RPCManagerImpl.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.remoting; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import org.horizon.CacheSPI; import org.horizon.annotations.MBean; @@ -40,6 +38,8 @@ import org.horizon.invocation.InvocationContextContainer; import org.horizon.lock.LockManager; import org.horizon.lock.TimeoutException; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.marshall.CommandAwareRpcDispatcher; import org.horizon.marshall.Marshaller; import org.horizon.notifications.Notifier; Modified: core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/statetransfer/DefaultStateTransferManager.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,13 +21,13 @@ */ package org.horizon.statetransfer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheSPI; import org.horizon.config.Configuration; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.Start; import org.horizon.loader.CacheLoaderManager; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.marshall.Marshaller; import org.horizon.marshall.NodeData; import org.horizon.marshall.NodeDataMarker; Modified: core/branches/flat/src/main/java/org/horizon/transaction/BatchModeTransactionManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/transaction/BatchModeTransactionManager.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/transaction/BatchModeTransactionManager.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,8 @@ */ package org.horizon.transaction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; /** * Not really a transaction manager in the truest sense of the word. Only used to batch up operations. Proper Modified: core/branches/flat/src/main/java/org/horizon/transaction/DummyBaseTransactionManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/transaction/DummyBaseTransactionManager.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/transaction/DummyBaseTransactionManager.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,8 @@ */ package org.horizon.transaction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; Modified: core/branches/flat/src/main/java/org/horizon/transaction/DummyTransaction.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/transaction/DummyTransaction.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/transaction/DummyTransaction.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,8 @@ */ package org.horizon.transaction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; Modified: core/branches/flat/src/main/java/org/horizon/transaction/DummyTransactionManager.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/transaction/DummyTransactionManager.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/transaction/DummyTransactionManager.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,8 @@ */ package org.horizon.transaction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import javax.naming.Context; import javax.naming.InitialContext; Modified: core/branches/flat/src/main/java/org/horizon/transaction/DummyUserTransaction.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/transaction/DummyUserTransaction.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/transaction/DummyUserTransaction.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,8 @@ */ package org.horizon.transaction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; Modified: core/branches/flat/src/main/java/org/horizon/transaction/GenericTransactionManagerLookup.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/transaction/GenericTransactionManagerLookup.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/transaction/GenericTransactionManagerLookup.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,8 @@ */ package org.horizon.transaction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import javax.naming.InitialContext; import javax.naming.NamingException; Modified: core/branches/flat/src/main/java/org/horizon/transaction/TransactionTable.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/transaction/TransactionTable.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/transaction/TransactionTable.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,14 +21,14 @@ */ package org.horizon.transaction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import org.horizon.context.InvocationContext; import org.horizon.context.TransactionContext; import org.horizon.factories.annotations.Inject; import org.horizon.factories.annotations.NonVolatile; import org.horizon.factories.context.ContextFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.remoting.RPCManager; import org.jgroups.Address; Modified: core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/tree/TreeCacheImpl.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,6 @@ */ package org.horizon.tree; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.Cache; import org.horizon.CacheException; import org.horizon.CacheStatus; @@ -30,6 +28,8 @@ import org.horizon.config.Configuration; import org.horizon.context.InvocationContext; import org.horizon.interceptors.base.CommandInterceptor; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.jgroups.Address; import java.util.List; Modified: core/branches/flat/src/main/java/org/horizon/util/FileLookup.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/util/FileLookup.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/util/FileLookup.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,8 +21,8 @@ */ package org.horizon.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.io.File; import java.io.FileInputStream; Modified: core/branches/flat/src/main/java/org/horizon/util/ReflectionUtil.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/util/ReflectionUtil.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/util/ReflectionUtil.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,9 +21,9 @@ */ package org.horizon.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.lang.annotation.Annotation; import java.lang.reflect.Field; Modified: core/branches/flat/src/main/java/org/horizon/util/TypedProperties.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/util/TypedProperties.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/util/TypedProperties.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -1,7 +1,7 @@ package org.horizon.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import java.util.Properties; Modified: core/branches/flat/src/main/java/org/horizon/util/internals/ReplicationListener.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/util/internals/ReplicationListener.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/main/java/org/horizon/util/internals/ReplicationListener.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -1,7 +1,5 @@ package org.horizon.util.internals; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.Cache; import org.horizon.commands.ReplicableCommand; import org.horizon.commands.remote.ReplicateCommand; @@ -11,6 +9,8 @@ import org.horizon.context.InvocationContext; import org.horizon.factories.ComponentRegistry; import org.horizon.io.ByteBuffer; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.marshall.CacheMarshallerStarobrno; import org.horizon.marshall.CommandAwareRpcDispatcher; import org.horizon.marshall.Marshaller; Modified: core/branches/flat/src/test/java/org/horizon/BasicTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/BasicTest.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/test/java/org/horizon/BasicTest.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -21,9 +21,9 @@ */ package org.horizon; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.Configuration; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.manager.CacheManager; import org.horizon.manager.NamedCacheNotFoundException; import org.horizon.util.TestingUtil; Modified: core/branches/flat/src/test/java/org/horizon/UnitTestCacheFactory.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/UnitTestCacheFactory.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/test/java/org/horizon/UnitTestCacheFactory.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -6,11 +6,11 @@ */ package org.horizon; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.config.Configuration; import org.horizon.config.ConfigurationException; import org.horizon.config.parsing.XmlConfigurationParserJBC3; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.manager.CacheManager; import org.horizon.util.TestingUtil; import org.jgroups.conf.XmlConfigurator; Modified: core/branches/flat/src/test/java/org/horizon/api/mvcc/LockTestBase.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/api/mvcc/LockTestBase.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/test/java/org/horizon/api/mvcc/LockTestBase.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -1,7 +1,5 @@ package org.horizon.api.mvcc; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.Cache; import org.horizon.UnitTestCacheFactory; import org.horizon.config.Configuration; @@ -9,6 +7,8 @@ import org.horizon.lock.IsolationLevel; import org.horizon.lock.LockManager; import org.horizon.lock.TimeoutException; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.transaction.DummyTransactionManagerLookup; import org.horizon.util.TestingUtil; import org.testng.annotations.AfterMethod; 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-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/test/java/org/horizon/api/tree/NodeMoveAPITest.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -1,7 +1,5 @@ package org.horizon.api.tree; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.Cache; import org.horizon.CacheSPI; import org.horizon.UnitTestCacheFactory; @@ -13,6 +11,8 @@ import org.horizon.factories.ComponentRegistry; import org.horizon.invocation.InvocationContextContainer; import org.horizon.lock.LockManager; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.tree.Fqn; import org.horizon.tree.Node; import org.horizon.tree.NodeNotExistsException; Modified: core/branches/flat/src/test/java/org/horizon/profiling/ProfileTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/profiling/ProfileTest.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/test/java/org/horizon/profiling/ProfileTest.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -1,10 +1,10 @@ package org.horizon.profiling; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.Cache; import org.horizon.config.Configuration; import org.horizon.lock.IsolationLevel; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.profiling.testinternals.Generator; import org.horizon.profiling.testinternals.TaskRunner; import org.horizon.util.TestingUtil; Modified: core/branches/flat/src/test/java/org/horizon/profiling/TreeProfileTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/profiling/TreeProfileTest.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/test/java/org/horizon/profiling/TreeProfileTest.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -1,11 +1,11 @@ package org.horizon.profiling; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.Cache; import org.horizon.UnitTestCacheFactory; import org.horizon.config.Configuration; import org.horizon.lock.IsolationLevel; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.profiling.testinternals.Generator; import org.horizon.profiling.testinternals.TaskRunner; import org.horizon.transaction.DummyTransactionManager; Modified: core/branches/flat/src/test/java/org/horizon/replication/SyncCacheListenerTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/replication/SyncCacheListenerTest.java 2009-01-16 15:47:54 UTC (rev 7492) +++ core/branches/flat/src/test/java/org/horizon/replication/SyncCacheListenerTest.java 2009-01-16 17:13:29 UTC (rev 7493) @@ -7,13 +7,13 @@ */ package org.horizon.replication; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.horizon.CacheException; import org.horizon.CacheSPI; import org.horizon.UnitTestCacheManager; import org.horizon.config.Configuration; import org.horizon.lock.IsolationLevel; +import org.horizon.logging.Log; +import org.horizon.logging.LogFactory; import org.horizon.notifications.annotation.CacheEntryModified; import org.horizon.notifications.annotation.CacheEntryRemoved; import org.horizon.notifications.annotation.CacheListener;