[infinispan-commits] Infinispan SVN: r211 - in trunk: cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje and 69 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue May 5 13:07:59 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-05-05 13:07:58 -0400 (Tue, 05 May 2009)
New Revision: 211
Added:
trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/package-info.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/package-info.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/package-info.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/package-info.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/package-info.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/package-info.java
trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/jclouds/package-info.java
trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/package-info.java
trunk/core/src/main/java/org/infinispan/atomic/package-info.java
trunk/core/src/main/java/org/infinispan/batch/package-info.java
trunk/core/src/main/java/org/infinispan/commands/package-info.java
trunk/core/src/main/java/org/infinispan/config/package-info.java
trunk/core/src/main/java/org/infinispan/container/package-info.java
trunk/core/src/main/java/org/infinispan/context/Flag.java
trunk/core/src/main/java/org/infinispan/context/InvocationContextContainer.java
trunk/core/src/main/java/org/infinispan/context/package-info.java
trunk/core/src/main/java/org/infinispan/distribution/package-info.java
trunk/core/src/main/java/org/infinispan/eviction/package-info.java
trunk/core/src/main/java/org/infinispan/executors/package-info.java
trunk/core/src/main/java/org/infinispan/factories/package-info.java
trunk/core/src/main/java/org/infinispan/interceptors/package-info.java
trunk/core/src/main/java/org/infinispan/jmx/package-info.java
trunk/core/src/main/java/org/infinispan/lifecycle/package-info.java
trunk/core/src/main/java/org/infinispan/loaders/package-info.java
trunk/core/src/main/java/org/infinispan/manager/package-info.java
trunk/core/src/main/java/org/infinispan/marshall/package-info.java
trunk/core/src/main/java/org/infinispan/notifications/package-info.java
trunk/core/src/main/java/org/infinispan/package-info.java
trunk/core/src/main/java/org/infinispan/remoting/package-info.java
trunk/core/src/main/java/org/infinispan/statetransfer/package-info.java
trunk/core/src/main/java/org/infinispan/transaction/package-info.java
trunk/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java
trunk/core/src/main/java/org/infinispan/util/concurrent/TimeoutException.java
trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManager.java
trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java
trunk/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java
trunk/core/src/main/java/org/infinispan/util/logging/
trunk/tree/src/main/java/org/infinispan/tree/package-info.java
Removed:
trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/bdbjc/
trunk/core/src/main/java/org/infinispan/invocation/
trunk/core/src/main/java/org/infinispan/lock/
trunk/core/src/main/java/org/infinispan/logging/
trunk/core/src/main/java/package-info/
Modified:
trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java
trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java
trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStore.java
trunk/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java
trunk/core/src/main/java/org/infinispan/AdvancedCache.java
trunk/core/src/main/java/org/infinispan/CacheDelegate.java
trunk/core/src/main/java/org/infinispan/CacheException.java
trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMap.java
trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java
trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java
trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java
trunk/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java
trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java
trunk/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java
trunk/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java
trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java
trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java
trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java
trunk/core/src/main/java/org/infinispan/config/Configuration.java
trunk/core/src/main/java/org/infinispan/config/parsing/RootElementBuilder.java
trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigHelper.java
trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java
trunk/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java
trunk/core/src/main/java/org/infinispan/container/entries/ReadCommittedEntry.java
trunk/core/src/main/java/org/infinispan/container/entries/RepeatableReadEntry.java
trunk/core/src/main/java/org/infinispan/context/AbstractContext.java
trunk/core/src/main/java/org/infinispan/context/FlagContainer.java
trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
trunk/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java
trunk/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java
trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java
trunk/core/src/main/java/org/infinispan/factories/ComponentRegistry.java
trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java
trunk/core/src/main/java/org/infinispan/factories/EntryFactory.java
trunk/core/src/main/java/org/infinispan/factories/EntryFactoryImpl.java
trunk/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java
trunk/core/src/main/java/org/infinispan/factories/LockManagerFactory.java
trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java
trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java
trunk/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/base/CommandInterceptor.java
trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java
trunk/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java
trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
trunk/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java
trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java
trunk/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java
trunk/core/src/main/java/org/infinispan/loaders/LockSupportCacheStore.java
trunk/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java
trunk/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java
trunk/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java
trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
trunk/core/src/main/java/org/infinispan/marshall/MarshallerImpl.java
trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java
trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java
trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java
trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java
trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java
trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
trunk/core/src/main/java/org/infinispan/remoting/RpcManagerImpl.java
trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsDistSync.java
trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java
trunk/core/src/main/java/org/infinispan/transaction/BatchModeTransactionManager.java
trunk/core/src/main/java/org/infinispan/transaction/DummyBaseTransactionManager.java
trunk/core/src/main/java/org/infinispan/transaction/DummyTransaction.java
trunk/core/src/main/java/org/infinispan/transaction/DummyTransactionManager.java
trunk/core/src/main/java/org/infinispan/transaction/DummyUserTransaction.java
trunk/core/src/main/java/org/infinispan/transaction/GenericTransactionManagerLookup.java
trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java
trunk/core/src/main/java/org/infinispan/transaction/TransactionTable.java
trunk/core/src/main/java/org/infinispan/util/FileLookup.java
trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java
trunk/core/src/main/java/org/infinispan/util/TypedProperties.java
trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantPerEntryLockContainer.java
trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantStripedLockContainer.java
trunk/core/src/main/java/org/infinispan/util/logging/AbstractLogImpl.java
trunk/core/src/main/java/org/infinispan/util/logging/JDKLogImpl.java
trunk/core/src/main/java/org/infinispan/util/logging/Log.java
trunk/core/src/main/java/org/infinispan/util/logging/Log4JLogImpl.java
trunk/core/src/main/java/org/infinispan/util/logging/LogFactory.java
trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java
trunk/core/src/test/java/org/infinispan/api/MixedModeTest.java
trunk/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java
trunk/core/src/test/java/org/infinispan/api/mvcc/LockPerEntryTest.java
trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java
trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
trunk/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIMVCCTest.java
trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIMVCCTest.java
trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java
trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java
trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java
trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
trunk/core/src/test/java/org/infinispan/loaders/decorators/SingletonStoreTest.java
trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java
trunk/core/src/test/java/org/infinispan/lock/StripedLockTest.java
trunk/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java
trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierImplTest.java
trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java
trunk/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java
trunk/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java
trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java
trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java
trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java
trunk/tree/src/main/java/org/infinispan/tree/Node.java
trunk/tree/src/main/java/org/infinispan/tree/NodeImpl.java
trunk/tree/src/main/java/org/infinispan/tree/TreeCache.java
trunk/tree/src/main/java/org/infinispan/tree/TreeCacheFactory.java
trunk/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java
trunk/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java
trunk/tree/src/test/java/org/infinispan/api/tree/NodeLockSupport.java
trunk/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPITest.java
trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTest.java
trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java
trunk/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java
Log:
Javadoc + some reorg
Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -19,10 +19,10 @@
import org.infinispan.loaders.CacheLoaderConfig;
import org.infinispan.loaders.CacheLoaderException;
import org.infinispan.loaders.modifications.Modification;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
import org.infinispan.util.ReflectionUtil;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.File;
import java.io.ObjectInput;
Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -12,8 +12,8 @@
import com.sleepycat.je.EnvironmentConfig;
import com.sleepycat.util.ExceptionUnwrapper;
import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.File;
Added: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/package-info.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/package-info.java (rev 0)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,5 @@
+/**
+ * This package contains a {@link org.infinispan.loaders.CacheStore} implementation based on
+ * Oracle's BDBJE storage engine.
+ */
+package org.infinispan.loaders.bdbje;
\ No newline at end of file
Property changes on: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -23,9 +23,9 @@
import org.infinispan.loaders.modifications.Modification;
import org.infinispan.loaders.modifications.Remove;
import org.infinispan.loaders.modifications.Store;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.test.TestingUtil;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeMethod;
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,9 +2,9 @@
import org.infinispan.io.ByteBuffer;
import org.infinispan.loaders.CacheLoaderException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.IOException;
import java.io.InputStream;
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,8 +2,8 @@
import org.infinispan.loaders.CacheLoaderException;
import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -10,9 +10,9 @@
import org.infinispan.loaders.jdbc.JdbcUtil;
import org.infinispan.loaders.jdbc.TableManipulation;
import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.IOException;
import java.io.InputStream;
Added: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/package-info.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/package-info.java (rev 0)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,5 @@
+/**
+ * This JDBC {@link CacheStore} implementation is optimized for storing binary (non-String)
+ * keys in the cache.
+ */
+package org.infinispan.loaders.jdbc.binary;
\ No newline at end of file
Property changes on: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -4,8 +4,8 @@
import com.mchange.v2.c3p0.DataSources;
import org.infinispan.loaders.CacheLoaderException;
import org.infinispan.loaders.jdbc.JdbcUtil;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.beans.PropertyVetoException;
import java.net.URL;
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,8 +1,8 @@
package org.infinispan.loaders.jdbc.connectionfactory;
import org.infinispan.loaders.CacheLoaderException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.sql.Connection;
import java.sql.DriverManager;
Added: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/package-info.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/package-info.java (rev 0)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,6 @@
+/**
+ * Connection factories for use with the JDBC Cache Store. Simple connection factories delegate
+ * to a data source if used within a Java EE environment, otherwise C3P0 pooling is used if
+ * outside of a Java EE environment.
+ */
+package org.infinispan.loaders.jdbc.connectionfactory;
\ No newline at end of file
Property changes on: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -32,9 +32,9 @@
* startup for warm caches), so performance drawback shouldn't be significant (again, most of the cases).
* <p/>
* Resource sharing - both aggregated cache loaders have locks and connection pools. The locking is not shared, each
- * loader keeping its own {@link org.infinispan.lock.StripedLock} instace. Also the tables (even though similar as
- * definition) are different in order to avoid key collision. On the other hand, the connection pooling is a shared
- * resource.
+ * loader keeping its own {@link org.infinispan.util.concurrent.locks.StripedLock} instace. Also the tables (even though
+ * similar as definition) are different in order to avoid key collision. On the other hand, the connection pooling is a
+ * shared resource.
*
* @author Mircea.Markus at jboss.com
* @see org.infinispan.loaders.jdbc.mixed.JdbcMixedCacheStoreConfig
Added: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/package-info.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/package-info.java (rev 0)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,5 @@
+/**
+ * This is a delegating {@link CacheStore} implementation that delegates either to a binary
+ * or String based JDBC cache store depending on the key used.
+ */
+package org.infinispan.loaders.jdbc.mixed;
\ No newline at end of file
Property changes on: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/package-info.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/package-info.java (rev 0)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,5 @@
+/**
+ * This package contains a {@link org.infinispan.loaders.CacheStore} implementation based on
+ * a JDBC database connection.
+ */
+package org.infinispan.loaders.jdbc;
\ No newline at end of file
Property changes on: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -9,9 +9,9 @@
import org.infinispan.loaders.jdbc.JdbcUtil;
import org.infinispan.loaders.jdbc.TableManipulation;
import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.IOException;
import java.io.InputStream;
Added: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/package-info.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/package-info.java (rev 0)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,7 @@
+/**
+ * This JDBC {@link CacheStore} implementation is optimized for storing String
+ * keys in the cache. If you can guarantee that your application would only use
+ * Strings as keys, then this implementation will perform better than binary or mixed
+ * implementations.
+ */
+package org.infinispan.loaders.jdbc.stringbased;
\ No newline at end of file
Property changes on: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStore.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStore.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/S3CacheStore.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -6,9 +6,9 @@
import org.infinispan.loaders.CacheLoaderException;
import org.infinispan.loaders.bucket.Bucket;
import org.infinispan.loaders.bucket.BucketBasedCacheStore;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.IOException;
import java.io.ObjectInput;
Added: trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/jclouds/package-info.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/jclouds/package-info.java (rev 0)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/jclouds/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * A bridge between Infinispan and JClouds - a fast S3 communication library.
+ */
+package org.infinispan.loaders.s3.jclouds;
\ No newline at end of file
Property changes on: trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/jclouds/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/package-info.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/package-info.java (rev 0)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,5 @@
+/**
+ * This package contains a {@link org.infinispan.loaders.CacheStore} implementation based on
+ * persisting to Amazon's S3 service.
+ */
+package org.infinispan.loaders.s3;
\ No newline at end of file
Property changes on: trunk/cachestore/s3/src/main/java/org/infinispan/loaders/s3/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,11 +2,11 @@
import org.infinispan.batch.BatchContainer;
import org.infinispan.container.DataContainer;
+import org.infinispan.context.Flag;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.eviction.EvictionManager;
import org.infinispan.factories.ComponentRegistry;
import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.invocation.Flag;
-import org.infinispan.invocation.InvocationContextContainer;
import org.infinispan.remoting.RpcManager;
import java.util.List;
Modified: trunk/core/src/main/java/org/infinispan/AdvancedCache.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/AdvancedCache.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/AdvancedCache.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,11 +2,11 @@
import org.infinispan.batch.BatchContainer;
import org.infinispan.container.DataContainer;
+import org.infinispan.context.Flag;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.eviction.EvictionManager;
import org.infinispan.factories.ComponentRegistry;
import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.invocation.Flag;
import org.infinispan.remoting.RpcManager;
import java.util.List;
Modified: trunk/core/src/main/java/org/infinispan/CacheDelegate.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/CacheDelegate.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/CacheDelegate.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -38,18 +38,16 @@
import org.infinispan.config.ConfigurationException;
import org.infinispan.container.DataContainer;
import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.context.Flag;
import org.infinispan.context.InvocationContext;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.eviction.EvictionManager;
import org.infinispan.factories.ComponentRegistry;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.NonVolatile;
import org.infinispan.interceptors.InterceptorChain;
import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.invocation.Flag;
-import org.infinispan.invocation.InvocationContextContainer;
import org.infinispan.lifecycle.ComponentStatus;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.manager.CacheManager;
import org.infinispan.marshall.MarshalledValue;
import org.infinispan.marshall.Marshaller;
@@ -57,6 +55,8 @@
import org.infinispan.remoting.RpcManager;
import org.infinispan.remoting.responses.ResponseGenerator;
import org.infinispan.statetransfer.StateTransferManager;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
Modified: trunk/core/src/main/java/org/infinispan/CacheException.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/CacheException.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/CacheException.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -24,7 +24,7 @@
/**
* Thrown when operations on {@link Cache} fail unexpectedly.
* <p/>
- * Specific subclasses such as {@link org.infinispan.lock.TimeoutException} and {@link
+ * Specific subclasses such as {@link org.infinispan.util.concurrent.TimeoutException} and {@link
* org.infinispan.config.ConfigurationException} have more specific uses.
*
* @author <a href="mailto:bela at jboss.org">Bela Ban</a>
Modified: trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMap.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMap.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -24,7 +24,7 @@
import net.jcip.annotations.NotThreadSafe;
import org.infinispan.Cache;
import org.infinispan.batch.BatchContainer;
-import org.infinispan.invocation.InvocationContextContainer;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.util.FastCopyHashMap;
import java.util.Collection;
Modified: trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -21,8 +21,8 @@
*/
package org.infinispan.atomic;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.IOException;
import java.io.ObjectInput;
Modified: trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -24,10 +24,10 @@
import org.infinispan.Cache;
import org.infinispan.batch.AutoBatchSupport;
import org.infinispan.batch.BatchContainer;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.invocation.Flag;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.context.Flag;
+import org.infinispan.context.InvocationContextContainer;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.Collection;
import java.util.Map;
Added: trunk/core/src/main/java/org/infinispan/atomic/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/atomic/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,5 @@
+/**
+ * This package contains the AtomicMap interfaces and API that Infinispan exposes as building
+ * blocks in creating other public interface such as the tree API.
+ */
+package org.infinispan.atomic;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/atomic/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/core/src/main/java/org/infinispan/batch/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/batch/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/batch/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,5 @@
+/**
+ * Support for batching calls using the {@link org.infinispan.Cache#startBatch()} and {@link org.infinispan.Cache#endBatch(boolean)}
+ * API.
+ */
+package org.infinispan.batch;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/batch/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/core/src/main/java/org/infinispan/commands/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/commands/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * Commands that operate on the cache, either locally or remotely.
+ */
+package org.infinispan.commands;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/commands/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -24,9 +24,9 @@
import org.infinispan.commands.Visitor;
import org.infinispan.container.entries.CacheEntry;
import org.infinispan.context.InvocationContext;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
* // TODO: MANIK: Document this
Modified: trunk/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/commands/remote/BaseRpcCommand.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -4,8 +4,8 @@
import org.infinispan.commands.VisitableCommand;
import org.infinispan.context.InvocationContext;
import org.infinispan.interceptors.InterceptorChain;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
* Base class for RPC commands.
Modified: trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -27,8 +27,8 @@
import org.infinispan.container.entries.InternalCacheEntry;
import org.infinispan.context.InvocationContext;
import org.infinispan.loaders.CacheLoaderManager;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
* Issues a clustered get call, for use primarily by the {@link org.infinispan.loaders.cluster.ClusterCacheLoader}. This
Modified: trunk/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -24,8 +24,8 @@
import org.infinispan.commands.ReplicableCommand;
import org.infinispan.commands.VisitableCommand;
import org.infinispan.context.InvocationContext;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.Arrays;
import java.util.List;
Modified: trunk/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,8 +2,8 @@
import org.infinispan.commands.ReplicableCommand;
import org.infinispan.context.InvocationContext;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
* Similar to {@link org.infinispan.commands.remote.MultipleRpcCommand}, but it only aggregates a single command for
Modified: trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -23,9 +23,9 @@
import org.infinispan.commands.Visitor;
import org.infinispan.context.InvocationContext;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.Arrays;
Modified: trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -25,9 +25,9 @@
import org.infinispan.commands.read.AbstractDataCommand;
import org.infinispan.container.entries.MVCCEntry;
import org.infinispan.context.InvocationContext;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
Modified: trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -23,9 +23,9 @@
import org.infinispan.factories.scopes.Scope;
import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.util.TypedProperties;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Modified: trunk/core/src/main/java/org/infinispan/config/Configuration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/Configuration.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/config/Configuration.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -26,8 +26,8 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.NonVolatile;
import org.infinispan.factories.annotations.Start;
-import org.infinispan.lock.IsolationLevel;
import org.infinispan.util.ReflectionUtil;
+import org.infinispan.util.concurrent.IsolationLevel;
import java.util.Collections;
import java.util.List;
Added: trunk/core/src/main/java/org/infinispan/config/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/config/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * Cache configuration beans and parsers.
+ */
+package org.infinispan.config;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/config/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/config/parsing/RootElementBuilder.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/RootElementBuilder.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/RootElementBuilder.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -22,8 +22,8 @@
package org.infinispan.config.parsing;
import org.infinispan.config.ConfigurationException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.jboss.util.xml.JBossEntityResolver;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigHelper.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigHelper.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigHelper.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -22,10 +22,10 @@
package org.infinispan.config.parsing;
import org.infinispan.config.ConfigurationException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.util.BeanUtils;
import org.infinispan.util.TypedProperties;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.jboss.util.StringPropertyReplacer;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -9,9 +9,9 @@
import org.infinispan.config.parsing.element.CustomInterceptorsElementParser;
import org.infinispan.config.parsing.element.LoadersElementParser;
import org.infinispan.eviction.EvictionStrategy;
-import org.infinispan.lock.IsolationLevel;
import org.infinispan.transaction.GenericTransactionManagerLookup;
import org.infinispan.util.FileLookup;
+import org.infinispan.util.concurrent.IsolationLevel;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
Modified: trunk/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -12,9 +12,10 @@
/**
* Makes internal copies of the entry for updates
- * @param container data container
- * @param writeSkewCheck if true, write skews are tested for and exceptions are thrown if detected. Only applicable to
- * {@link org.infinispan.lock.IsolationLevel#REPEATABLE_READ}.
+ *
+ * @param container data container
+ * @param writeSkewCheck if true, write skews are tested for and exceptions are thrown if detected. Only applicable
+ * to {@link org.infinispan.util.concurrent.IsolationLevel#REPEATABLE_READ}.
*/
void copyForUpdate(DataContainer container, boolean writeSkewCheck);
}
Modified: trunk/core/src/main/java/org/infinispan/container/entries/ReadCommittedEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/ReadCommittedEntry.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/container/entries/ReadCommittedEntry.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -23,8 +23,8 @@
import org.infinispan.container.DataContainer;
import static org.infinispan.container.entries.ReadCommittedEntry.Flags.*;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
* A wrapper around a cached entry that encapsulates read committed semantics when writes are initiated, committed or
@@ -140,8 +140,9 @@
public final void commit(DataContainer container) {
// only do stuff if there are changes.
if (isChanged()) {
- if (trace) log.trace("Updating entry (key={0} removed={1} valid={2} changed={3} created={4} value={5}]", getKey(),
- isRemoved(), isValid(), isChanged(), isCreated(), value);
+ if (trace)
+ log.trace("Updating entry (key={0} removed={1} valid={2} changed={3} created={4} value={5}]", getKey(),
+ isRemoved(), isValid(), isChanged(), isCreated(), value);
if (isRemoved()) {
container.remove(key);
} else {
Modified: trunk/core/src/main/java/org/infinispan/container/entries/RepeatableReadEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/RepeatableReadEntry.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/container/entries/RepeatableReadEntry.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -23,8 +23,8 @@
import org.infinispan.CacheException;
import org.infinispan.container.DataContainer;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
* An extension of {@link org.infinispan.container.ReadCommittedEntry} that provides Repeatable Read semantics
Added: trunk/core/src/main/java/org/infinispan/container/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/container/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,6 @@
+/**
+ * Data containers which store cache entries. This package contains different implementations of
+ * containers based on their performance and ordering characteristics, as well as the entries
+ * that live in the containers.
+ */
+package org.infinispan.container;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/container/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/context/AbstractContext.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/AbstractContext.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/context/AbstractContext.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,7 +1,6 @@
package org.infinispan.context;
import org.infinispan.container.entries.CacheEntry;
-import org.infinispan.invocation.Flag;
import org.infinispan.util.BidirectionalLinkedHashMap;
import org.infinispan.util.BidirectionalMap;
@@ -23,7 +22,7 @@
// these flags pertain to the context and are set internally. Not to be confused with Flag, which is set by user
// invocations on AdvancedCache.
- protected byte contextFlags;
+ protected byte contextFlags;
protected BidirectionalLinkedHashMap<Object, CacheEntry> lookedUpEntries = null;
protected static enum ContextFlags {
Copied: trunk/core/src/main/java/org/infinispan/context/Flag.java (from rev 209, trunk/core/src/main/java/org/infinispan/invocation/Flag.java)
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/Flag.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/context/Flag.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,37 @@
+package org.infinispan.context;
+
+/**
+ * Available flags, which may be set on a per-invocation basis. These are provided using the {@link
+ * org.infinispan.AdvancedCache} interface, using some of the overloaded methods that allow passing in of a variable
+ * number of Flags.
+ * <p/>
+ * <ul> <li>{@link #ZERO_LOCK_ACQUISITION_TIMEOUT} - overrides the {@link org.infinispan.config.Configuration#setLockAcquisitionTimeout(long)}
+ * configuration setting by ensuring lock managers use a 0 lock acquisition timeout.</li> <li>{@link #CACHE_MODE_LOCAL}
+ * - forces local mode even if the cache is configured to use a clustered mode like replication, invalidation or
+ * distribution</li> <li>{@link #SKIP_LOCKING} - bypasses lock acquisition altogether</li> <li>{@link #FORCE_WRITE_LOCK}
+ * - forces a write lock, even if the call is a read. Useful when reading an entry to later update it within the same
+ * transaction</li> <li>{@link #SKIP_CACHE_STATUS_CHECK} - skips checking whether a cache is in a receptive state, i.e.
+ * is {@link org.infinispan.lifecycle.ComponentStatus#RUNNING}. May break operation in weird ways!</li> <li>{@link
+ * #FORCE_ASYNCHRONOUS} - forces asynchronous network calls where possible</li> <li>{@link #FORCE_SYNCHRONOUS} - forces
+ * synchronous network calls where possible</li> <li>{@link #SKIP_CACHE_STORE} - skips storing an entry to any
+ * configured {@link org.infinispan.loaders.CacheStore}s</li> <li>{@link #FAIL_SILENTLY} - swallows any exceptions,
+ * logging them instead at a low log level</li> <li>{@link #SKIP_REMOTE_LOOKUP} - when used with DIST cache mode, will
+ * skip retrieving a remote value either when doing a get() or exists(), or to provide an overwritten value with a put()
+ * or remove(). This could render return values for some operations (such as {@link org.infinispan.Cache#put(Object,
+ * Object)} or {@link org.infinispan.Cache#remove(Object)} unusable.</li> </ul>
+ *
+ * @author Manik Surtani
+ * @since 4.0
+ */
+public enum Flag {
+ ZERO_LOCK_ACQUISITION_TIMEOUT,
+ CACHE_MODE_LOCAL,
+ SKIP_LOCKING,
+ FORCE_WRITE_LOCK,
+ SKIP_CACHE_STATUS_CHECK,
+ FORCE_ASYNCHRONOUS,
+ FORCE_SYNCHRONOUS,
+ SKIP_CACHE_STORE,
+ FAIL_SILENTLY,
+ SKIP_REMOTE_LOOKUP
+}
Property changes on: trunk/core/src/main/java/org/infinispan/context/Flag.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/context/FlagContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/FlagContainer.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/context/FlagContainer.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,12 +1,10 @@
package org.infinispan.context;
-import org.infinispan.invocation.Flag;
-
import java.util.Collection;
import java.util.Set;
/**
- * Interface that defines access to and manipulation of {@link org.infinispan.invocation.Flag}.
+ * Interface that defines access to and manipulation of {@link Flag}.
*
* @author Manik Surtani
* @since 4.0
Copied: trunk/core/src/main/java/org/infinispan/context/InvocationContextContainer.java (from rev 208, trunk/core/src/main/java/org/infinispan/invocation/InvocationContextContainer.java)
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/InvocationContextContainer.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/context/InvocationContextContainer.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.infinispan.context;
+
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.NonVolatile;
+import org.infinispan.factories.context.ContextFactory;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+
+
+/**
+ * Container and factory for thread locals
+ *
+ * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
+ * @since 4.0
+ */
+ at NonVolatile
+ at Scope(Scopes.NAMED_CACHE)
+public class InvocationContextContainer extends ThreadLocal<InvocationContext> {
+ ContextFactory contextFactory;
+
+ @Inject
+ public void injectContextFactory(ContextFactory contextFactory) {
+ this.contextFactory = contextFactory;
+ }
+
+ @Override
+ protected final InvocationContext initialValue() {
+ // create if this is initially unset
+ return contextFactory.createInvocationContext();
+ }
+
+ public void reset() {
+ set(initialValue());
+ }
+}
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/context/InvocationContextContainer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/core/src/main/java/org/infinispan/context/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/context/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,5 @@
+/**
+ * Contexts contain information of a specific invocation on the cache, such as its origins, scope
+ * (transactional or non-transactional), as well as invocation-specific flags.
+ */
+package org.infinispan.context;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/context/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -8,8 +8,6 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.factories.annotations.Stop;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
@@ -22,6 +20,8 @@
import org.infinispan.remoting.responses.SuccessfulResponse;
import org.infinispan.remoting.transport.Address;
import org.infinispan.util.Util;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.Collection;
import java.util.List;
Added: trunk/core/src/main/java/org/infinispan/distribution/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/distribution/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * Classes relating to the distributed cache mode.
+ */
+package org.infinispan.distribution;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/distribution/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -12,8 +12,8 @@
import org.infinispan.factories.annotations.Stop;
import org.infinispan.loaders.CacheLoaderManager;
import org.infinispan.loaders.CacheStore;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
Added: trunk/core/src/main/java/org/infinispan/eviction/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/eviction/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/eviction/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * Classes related to eviction.
+ */
+package org.infinispan.eviction;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/eviction/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/core/src/main/java/org/infinispan/executors/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/executors/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/executors/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * Implementations of different executors used for asynchronous operation.
+ */
+package org.infinispan.executors;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/executors/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -26,8 +26,8 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.scopes.Scope;
import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
* Factory that creates components used internally within Infinispan, and also wires dependencies into the components.
Modified: trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -37,9 +37,9 @@
import org.infinispan.factories.scopes.Scopes;
import org.infinispan.lifecycle.ComponentStatus;
import org.infinispan.lifecycle.Lifecycle;
-import org.infinispan.logging.Log;
import org.infinispan.util.BeanUtils;
import org.infinispan.util.ReflectionUtil;
+import org.infinispan.util.logging.Log;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -203,8 +203,8 @@
addComponentDependencies(c);
// inject dependencies for this component
c.injectDependencies();
-
- if (old == null) getLog().trace("Registering component {0} under name {1}", c, name);
+
+ if (old == null) getLog().trace("Registering component {0} under name {1}", c, name);
}
/**
Modified: trunk/core/src/main/java/org/infinispan/factories/ComponentRegistry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/ComponentRegistry.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/factories/ComponentRegistry.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -8,9 +8,9 @@
import org.infinispan.factories.scopes.ScopeDetector;
import org.infinispan.factories.scopes.Scopes;
import org.infinispan.lifecycle.ComponentStatus;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.HashMap;
import java.util.Map;
Modified: trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -25,9 +25,9 @@
import org.infinispan.batch.BatchContainer;
import org.infinispan.commands.CommandsFactory;
import org.infinispan.config.ConfigurationException;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.eviction.EvictionManager;
import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.invocation.InvocationContextContainer;
import org.infinispan.loaders.CacheLoaderManager;
import org.infinispan.marshall.Marshaller;
import org.infinispan.marshall.VersionAwareMarshaller;
Modified: trunk/core/src/main/java/org/infinispan/factories/EntryFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/EntryFactory.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/factories/EntryFactory.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -24,7 +24,7 @@
import org.infinispan.container.entries.CacheEntry;
import org.infinispan.container.entries.MVCCEntry;
import org.infinispan.context.InvocationContext;
-import org.infinispan.lock.TimeoutException;
+import org.infinispan.util.concurrent.TimeoutException;
/**
* // TODO: MANIK: Document this
@@ -44,7 +44,7 @@
* @return true if a lock was needed and acquired, false if it didn't need to acquire the lock (i.e., lock was
* already held)
* @throws InterruptedException if interrupted
- * @throws org.infinispan.lock.TimeoutException
+ * @throws org.infinispan.util.concurrent.TimeoutException
* if we are unable to acquire the lock after a specified timeout.
*/
boolean acquireLock(InvocationContext ctx, Object key) throws InterruptedException, TimeoutException;
Modified: trunk/core/src/main/java/org/infinispan/factories/EntryFactoryImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/EntryFactoryImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/factories/EntryFactoryImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -29,16 +29,16 @@
import org.infinispan.container.entries.NullMarkerEntryForRemoval;
import org.infinispan.container.entries.ReadCommittedEntry;
import org.infinispan.container.entries.RepeatableReadEntry;
+import org.infinispan.context.Flag;
import org.infinispan.context.InvocationContext;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
-import org.infinispan.invocation.Flag;
-import org.infinispan.lock.IsolationLevel;
-import org.infinispan.lock.LockManager;
-import org.infinispan.lock.TimeoutException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.util.concurrent.IsolationLevel;
+import org.infinispan.util.concurrent.TimeoutException;
+import org.infinispan.util.concurrent.locks.LockManager;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
public class EntryFactoryImpl implements EntryFactory {
private boolean useRepeatableRead;
@@ -129,7 +129,7 @@
if (mvccEntry != cacheEntry) mvccEntry = (MVCCEntry) cacheEntry;
mvccEntry.setRemoved(false);
mvccEntry.setValid(true);
- }
+ }
return mvccEntry;
@@ -178,7 +178,7 @@
* @return true if a lock was needed and acquired, false if it didn't need to acquire the lock (i.e., lock was
* already held)
* @throws InterruptedException if interrupted
- * @throws org.infinispan.lock.TimeoutException
+ * @throws org.infinispan.util.concurrent.TimeoutException
* if we are unable to acquire the lock after a specified timeout.
*/
public final boolean acquireLock(InvocationContext ctx, Object key) throws InterruptedException, TimeoutException {
Modified: trunk/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -8,9 +8,9 @@
import org.infinispan.factories.scopes.Scope;
import org.infinispan.factories.scopes.Scopes;
import org.infinispan.jmx.CacheManagerJmxRegistration;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.manager.CacheManager;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.management.MBeanServerFactory;
import java.util.ArrayList;
Modified: trunk/core/src/main/java/org/infinispan/factories/LockManagerFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/LockManagerFactory.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/factories/LockManagerFactory.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -22,8 +22,8 @@
package org.infinispan.factories;
import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.lock.LockManager;
-import org.infinispan.lock.LockManagerImpl;
+import org.infinispan.util.concurrent.locks.LockManager;
+import org.infinispan.util.concurrent.locks.LockManagerImpl;
/**
* // TODO: MANIK: Document this
Modified: trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -30,9 +30,9 @@
* This annotation is used for components that will be registered in the {@link org.infinispan.factories.ComponentRegistry},
* that are resilient to changes in configuration. Examples are the {@link org.infinispan.factories.ComponentRegistry}
* implementation used, which does not change regardless of the configuration. Components such as the {@link
- * org.infinispan.lock.LockManager}, though, should <b>never</b> be marked as <tt>@NonVolatile</tt> since based on the
- * configuration, different lock manager implementations may be selected. LockManager is, hence, <b>not</b> resilient
- * to changes in the configuration.
+ * org.infinispan.util.concurrent.locks.LockManager}, though, should <b>never</b> be marked as <tt>@NonVolatile</tt>
+ * since based on the configuration, different lock manager implementations may be selected. LockManager is, hence,
+ * <b>not</b> resilient to changes in the configuration.
*
* @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
* @since 4.0
Added: trunk/core/src/main/java/org/infinispan/factories/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/factories/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,6 @@
+/**
+ * Factories are internal components used to create other components based on a cache's
+ * configuration. This package also contains the ComponentRegistry classes, a light injection
+ * framework used to build and inject components based on what is needed.
+ */
+package org.infinispan.factories;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/factories/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -36,12 +36,12 @@
import org.infinispan.container.entries.CacheEntry;
import org.infinispan.container.entries.InternalCacheEntry;
import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.context.Flag;
import org.infinispan.context.InvocationContext;
import org.infinispan.context.TransactionContext;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
-import org.infinispan.invocation.Flag;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
import org.infinispan.loaders.CacheLoaderManager;
@@ -50,8 +50,8 @@
import org.infinispan.loaders.modifications.Modification;
import org.infinispan.loaders.modifications.Remove;
import org.infinispan.loaders.modifications.Store;
-import org.infinispan.logging.LogFactory;
import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.util.logging.LogFactory;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
Modified: trunk/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -14,13 +14,13 @@
import org.infinispan.commands.write.WriteCommand;
import org.infinispan.container.DataContainer;
import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.context.Flag;
import org.infinispan.context.InvocationContext;
import org.infinispan.context.TransactionContext;
import org.infinispan.distribution.DistributionManager;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.interceptors.base.BaseRpcInterceptor;
-import org.infinispan.invocation.Flag;
import org.infinispan.remoting.transport.Address;
import org.infinispan.util.Immutables;
Modified: trunk/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -24,14 +24,14 @@
import org.infinispan.CacheException;
import org.infinispan.commands.VisitableCommand;
import org.infinispan.context.InvocationContext;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.factories.scopes.Scope;
import org.infinispan.factories.scopes.Scopes;
import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.ArrayList;
import java.util.Collections;
@@ -249,7 +249,7 @@
/**
* Similar to {@link #invoke(InvocationContext , VisitableCommand)}, but constructs a invocation context on the fly,
- * using {@link InvocationContextContainer#get()}
+ * using {@link org.infinispan.context.InvocationContextContainer#get()}
*/
public Object invokeRemote(VisitableCommand cacheCommand) throws Throwable {
InvocationContext ctxt = invocationContextContainer.get();
@@ -259,7 +259,8 @@
/**
* Similar to {@link #invoke(InvocationContext , VisitableCommand)}, but constructs a invocation context on the fly,
- * using {@link InvocationContextContainer#get()} and setting the origin local flag to its default value.
+ * using {@link org.infinispan.context.InvocationContextContainer#get()} and setting the origin local flag to its
+ * default value.
*/
public Object invoke(VisitableCommand cacheCommand) throws Throwable {
InvocationContext ctxt = invocationContextContainer.get();
Modified: trunk/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -31,10 +31,10 @@
import org.infinispan.commands.write.PutMapCommand;
import org.infinispan.commands.write.RemoveCommand;
import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.context.Flag;
import org.infinispan.context.InvocationContext;
import org.infinispan.context.TransactionContext;
import org.infinispan.factories.annotations.Inject;
-import org.infinispan.invocation.Flag;
import org.infinispan.remoting.RpcManager;
import org.infinispan.transaction.GlobalTransaction;
import org.infinispan.transaction.TransactionTable;
Modified: trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -40,9 +40,9 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.lock.IsolationLevel;
-import org.infinispan.lock.LockManager;
import org.infinispan.util.ReversibleOrderedSet;
+import org.infinispan.util.concurrent.IsolationLevel;
+import org.infinispan.util.concurrent.locks.LockManager;
import java.util.ArrayList;
import java.util.Iterator;
Modified: trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -29,16 +29,15 @@
import org.infinispan.commands.tx.PrepareCommand;
import org.infinispan.commands.tx.RollbackCommand;
import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.context.Flag;
import org.infinispan.context.InvocationContext;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.context.TransactionContext;
import org.infinispan.factories.ComponentRegistry;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.context.ContextFactory;
-import org.infinispan.invocation.Flag;
-import org.infinispan.invocation.InvocationContextContainer;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
-import org.infinispan.lock.LockManager;
import org.infinispan.manager.CacheManager;
import org.infinispan.notifications.cachelistener.CacheNotifier;
import org.infinispan.remoting.ReplicationException;
@@ -46,6 +45,7 @@
import org.infinispan.transaction.TransactionLog;
import org.infinispan.transaction.TransactionTable;
import org.infinispan.util.concurrent.ConcurrentHashSet;
+import org.infinispan.util.concurrent.locks.LockManager;
import javax.transaction.InvalidTransactionException;
import javax.transaction.Status;
Modified: trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -25,11 +25,11 @@
import org.infinispan.commands.ReplicableCommand;
import org.infinispan.commands.remote.CacheRpcCommand;
import org.infinispan.commands.remote.SingleRpcCommand;
+import org.infinispan.context.Flag;
import org.infinispan.context.InvocationContext;
import org.infinispan.context.TransactionContext;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
-import org.infinispan.invocation.Flag;
import org.infinispan.remoting.ReplicationQueue;
import org.infinispan.remoting.ResponseMode;
import org.infinispan.remoting.RpcManager;
Modified: trunk/core/src/main/java/org/infinispan/interceptors/base/CommandInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/base/CommandInterceptor.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/interceptors/base/CommandInterceptor.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -28,27 +28,27 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.scopes.Scope;
import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
* This is the base class for all interceptors to extend, and implements the {@link org.infinispan.commands.Visitor}
* interface allowing it to intercept invocations on {@link org.infinispan.commands.VisitableCommand}s.
* <p/>
* Commands are either created by the {@link org.infinispan.CacheDelegate} (for invocations on the {@link
- * org.infinispan.Cache} public interface), or by the {@link org.infinispan.marshall.CommandAwareRpcDispatcher} for remotely
- * originating invocations, and are passed up the interceptor chain by using the {@link
+ * org.infinispan.Cache} public interface), or by the {@link org.infinispan.marshall.CommandAwareRpcDispatcher} for
+ * remotely originating invocations, and are passed up the interceptor chain by using the {@link
* org.infinispan.interceptors.InterceptorChain} helper class.
* <p/>
* When writing interceptors, authors can either override a specific visitXXX() method (such as {@link
- * #visitGetKeyValueCommand(org.infinispan.context.InvocationContext, org.infinispan.commands.read.GetKeyValueCommand)}) or
- * the more generic {@link #handleDefault(org.infinispan.context.InvocationContext, org.infinispan.commands.VisitableCommand)}
- * which is the default behaviour of any visit method, as defined in {@link AbstractVisitor#handleDefault(org.infinispan.context.InvocationContext,
- * org.infinispan.commands.VisitableCommand)}.
+ * #visitGetKeyValueCommand(org.infinispan.context.InvocationContext, org.infinispan.commands.read.GetKeyValueCommand)})
+ * or the more generic {@link #handleDefault(org.infinispan.context.InvocationContext,
+ * org.infinispan.commands.VisitableCommand)} which is the default behaviour of any visit method, as defined in {@link
+ * AbstractVisitor#handleDefault(org.infinispan.context.InvocationContext, org.infinispan.commands.VisitableCommand)}.
* <p/>
* The preferred approach is to override the specific visitXXX() methods that are of interest rather than to override
- * {@link #handleDefault(org.infinispan.context.InvocationContext, org.infinispan.commands.VisitableCommand)} and then write a
- * series of if statements or a switch block, if command-specific behaviour is needed.
+ * {@link #handleDefault(org.infinispan.context.InvocationContext, org.infinispan.commands.VisitableCommand)} and then
+ * write a series of if statements or a switch block, if command-specific behaviour is needed.
* <p/>
*
* @author Mircea.Markus at jboss.com
Added: trunk/core/src/main/java/org/infinispan/interceptors/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/interceptors/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,5 @@
+/**
+ * Infinispan is designed around a set of interceptors around a data container. These interceptors
+ * add behavioral aspects to the data container.
+ */
+package org.infinispan.interceptors;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/interceptors/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -31,9 +31,9 @@
import org.infinispan.factories.annotations.NonVolatile;
import org.infinispan.factories.annotations.Start;
import org.infinispan.factories.annotations.Stop;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.util.Util;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.management.MBeanServer;
import java.util.Set;
Modified: trunk/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -24,8 +24,8 @@
import org.infinispan.CacheException;
import org.infinispan.factories.AbstractComponentRegistry;
import org.infinispan.factories.ComponentRegistry;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.management.InstanceAlreadyExistsException;
import javax.management.MBeanServer;
Modified: trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -24,18 +24,18 @@
import org.infinispan.jmx.annotations.MBean;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.management.Attribute;
import javax.management.AttributeList;
+import javax.management.AttributeNotFoundException;
import javax.management.DynamicMBean;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanException;
import javax.management.MBeanInfo;
import javax.management.MBeanOperationInfo;
import javax.management.ReflectionException;
-import javax.management.AttributeNotFoundException;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
Added: trunk/core/src/main/java/org/infinispan/jmx/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/jmx/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * Helpers that allow easy exposure of attributes and operations via JMX.
+ */
+package org.infinispan.jmx;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/jmx/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -21,8 +21,8 @@
*/
package org.infinispan.lifecycle;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
* Different states a component may be in.
Added: trunk/core/src/main/java/org/infinispan/lifecycle/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/lifecycle/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/lifecycle/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * Component lifecycle.
+ */
+package org.infinispan.lifecycle;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/lifecycle/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -4,10 +4,10 @@
import org.infinispan.loaders.modifications.Modification;
import org.infinispan.loaders.modifications.Remove;
import org.infinispan.loaders.modifications.Store;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
import org.infinispan.util.concurrent.WithinThreadExecutor;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.transaction.Transaction;
import java.io.InputStream;
Modified: trunk/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -6,20 +6,20 @@
import org.infinispan.config.Configuration;
import org.infinispan.config.ConfigurationException;
import org.infinispan.container.entries.InternalCacheEntry;
+import static org.infinispan.context.Flag.SKIP_CACHE_STATUS_CHECK;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.factories.annotations.Stop;
-import static org.infinispan.invocation.Flag.SKIP_CACHE_STATUS_CHECK;
import org.infinispan.loaders.decorators.AsyncStore;
import org.infinispan.loaders.decorators.ChainingCacheStore;
import org.infinispan.loaders.decorators.ReadOnlyStore;
import org.infinispan.loaders.decorators.SingletonStore;
import org.infinispan.loaders.decorators.SingletonStoreConfig;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
import org.infinispan.util.ReflectionUtil;
import org.infinispan.util.Util;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.Set;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
Modified: trunk/core/src/main/java/org/infinispan/loaders/LockSupportCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/LockSupportCacheStore.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/loaders/LockSupportCacheStore.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,10 +2,10 @@
import org.infinispan.Cache;
import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.lock.StripedLock;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
+import org.infinispan.util.concurrent.locks.StripedLock;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.ObjectInput;
import java.io.ObjectOutput;
@@ -19,8 +19,8 @@
* manipulated data won't be corrupted by concurrent access to Store. It also assurce atomic data access for each stored
* entry.
* <p/>
- * Locking is based on a {@link org.infinispan.lock.StripedLock}. You can tune the concurrency level of the striped lock
- * (see the Javadocs of StripedLock for details on what this is) by using the {@link
+ * Locking is based on a {@link org.infinispan.util.concurrent.locks.StripedLock}. You can tune the concurrency level of
+ * the striped lock (see the Javadocs of StripedLock for details on what this is) by using the {@link
* org.infinispan.loaders.LockSupportCacheStore#setLockConcurrencyLevel(int)} setter.
* <p/>
*
Modified: trunk/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -9,8 +9,6 @@
import org.infinispan.loaders.AbstractCacheLoader;
import org.infinispan.loaders.CacheLoaderConfig;
import org.infinispan.loaders.CacheLoaderException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
import org.infinispan.remoting.ResponseFilter;
import org.infinispan.remoting.ResponseMode;
@@ -19,6 +17,8 @@
import org.infinispan.remoting.responses.Response;
import org.infinispan.remoting.responses.SuccessfulResponse;
import org.infinispan.remoting.transport.Address;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.Collections;
import java.util.HashSet;
Modified: trunk/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/loaders/decorators/AsyncStore.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -9,8 +9,8 @@
import org.infinispan.loaders.modifications.PurgeExpired;
import org.infinispan.loaders.modifications.Remove;
import org.infinispan.loaders.modifications.Store;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -6,8 +6,6 @@
import org.infinispan.loaders.CacheLoaderException;
import org.infinispan.loaders.CacheStore;
import org.infinispan.loaders.modifications.Modification;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.manager.CacheManager;
import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted;
@@ -15,6 +13,8 @@
import org.infinispan.notifications.cachemanagerlistener.event.Event;
import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
import org.infinispan.remoting.transport.Address;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.transaction.Transaction;
import java.io.ObjectInput;
Modified: trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -7,9 +7,9 @@
import org.infinispan.loaders.CacheLoaderException;
import org.infinispan.loaders.bucket.Bucket;
import org.infinispan.loaders.bucket.BucketBasedCacheStore;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.*;
import java.util.HashSet;
@@ -34,8 +34,7 @@
File root;
/**
- * @return root directory where all files for this {@link org.infinispan.loaders.CacheStore CacheStore} are
- * written.
+ * @return root directory where all files for this {@link org.infinispan.loaders.CacheStore CacheStore} are written.
*/
public File getRoot() {
return root;
Added: trunk/core/src/main/java/org/infinispan/loaders/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/loaders/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * This package contains loaders and stores, which are used for overflow or persistence.
+ */
+package org.infinispan.loaders;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/loaders/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/core/src/main/java/org/infinispan/manager/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/manager/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/manager/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * Cache manager package
+ */
+package org.infinispan.manager;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/manager/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/marshall/MarshallerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/MarshallerImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/marshall/MarshallerImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -30,8 +30,6 @@
import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.io.ByteBuffer;
import org.infinispan.io.ExposedByteArrayOutputStream;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.remoting.responses.ExceptionResponse;
import org.infinispan.remoting.responses.ExtendedResponse;
import org.infinispan.remoting.responses.RequestIgnoredResponse;
@@ -45,6 +43,8 @@
import org.infinispan.util.FastCopyHashMap;
import org.infinispan.util.Immutables;
import org.infinispan.util.Util;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.jboss.util.NotImplementedException;
import org.jboss.util.stream.MarshalledValueInputStream;
Modified: trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -25,8 +25,8 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.io.ByteBuffer;
import org.infinispan.io.ExposedByteArrayOutputStream;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.jboss.util.stream.MarshalledValueInputStream;
import java.io.ByteArrayInputStream;
@@ -110,11 +110,11 @@
}
return defaultMarshaller.objectFromObjectStream(in);
}
-
+
public ObjectOutput startObjectOutput(OutputStream os) throws IOException {
return defaultMarshaller.startObjectOutput(os);
}
-
+
public void finishObjectOutput(ObjectOutput oo) {
defaultMarshaller.finishObjectOutput(oo);
}
@@ -124,11 +124,11 @@
log.trace("Wrote version {0}", VERSION_400);
defaultMarshaller.objectToObjectStream(obj, out);
}
-
+
public ObjectInput startObjectInput(InputStream is) throws IOException {
return defaultMarshaller.startObjectInput(is);
}
-
+
public void finishObjectInput(ObjectInput oi) {
defaultMarshaller.finishObjectInput(oi);
}
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -21,13 +21,6 @@
*/
package org.infinispan.marshall.jboss;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.OutputStream;
-
import org.infinispan.CacheException;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Stop;
@@ -35,11 +28,11 @@
import org.infinispan.factories.scopes.Scopes;
import org.infinispan.io.ByteBuffer;
import org.infinispan.io.ExposedByteArrayOutputStream;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
import org.infinispan.remoting.RpcManager;
import org.infinispan.util.Util;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.jboss.marshalling.ContextClassResolver;
import org.jboss.marshalling.MarshallerFactory;
import org.jboss.marshalling.Marshalling;
@@ -47,9 +40,16 @@
import org.jboss.marshalling.Unmarshaller;
import org.jboss.marshalling.reflect.SunReflectiveCreator;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.OutputStream;
+
/**
* JBossMarshaller.
- *
+ *
* @author Galder Zamarreño
* @since 4.0
*/
@@ -57,8 +57,8 @@
public class JBossMarshaller implements Marshaller {
private static final Log log = LogFactory.getLog(JBossMarshaller.class);
private static final String DEFAULT_MARSHALLER_FACTORY = "org.jboss.marshalling.river.RiverMarshallerFactory";
-// private static final int VERSION_400 = 400;
-// private static final int DEFAULT_VERSION = VERSION_400;
+ // private static final int VERSION_400 = 400;
+ // private static final int DEFAULT_VERSION = VERSION_400;
private ClassLoader defaultClassLoader;
private MarshallingConfiguration configuration;
private MarshallerFactory factory;
@@ -66,18 +66,18 @@
private CustomObjectTable objectTable;
private ExternalizerClassFactory externalizerFactoryAndObjectTable;
/// private boolean trace;
-
+
@Inject
public void init(ClassLoader defaultCl, RpcManager rpcManager) {
log.debug("Using JBoss Marshalling based marshaller.");
-
+
// trace = log.isTraceEnabled();
defaultClassLoader = defaultCl;
try {
// Todo: Enable different marshaller factories via configuration
- factory = (MarshallerFactory)Util.getInstance(DEFAULT_MARSHALLER_FACTORY);
- } catch(Exception e) {
+ factory = (MarshallerFactory) Util.getInstance(DEFAULT_MARSHALLER_FACTORY);
+ } catch (Exception e) {
throw new CacheException("Unable to load JBoss Marshalling marshaller factory " + DEFAULT_MARSHALLER_FACTORY, e);
}
@@ -96,7 +96,7 @@
// // Todo: This is the JBMAR underlying protocol version, don't touch! Think about how to get VAM into JBMAR
// configuration.setVersion(DEFAULT_VERSION);
}
-
+
@Stop
public void stop() {
// Do not leak classloader when cache is stopped.
@@ -112,7 +112,7 @@
System.arraycopy(b.getBuf(), b.getOffset(), bytes, 0, b.getLength());
return bytes;
}
-
+
public ByteBuffer objectToBuffer(Object o) throws IOException {
ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream(128);
ObjectOutput marshaller = startObjectOutput(baos);
@@ -120,13 +120,13 @@
finishObjectOutput(marshaller);
return new ByteBuffer(baos.getRawBuffer(), 0, baos.size());
}
-
+
public ObjectOutput startObjectOutput(OutputStream os) throws IOException {
org.jboss.marshalling.Marshaller marshaller = factory.createMarshaller(configuration);
marshaller.start(Marshalling.createByteOutput(os));
return marshaller;
}
-
+
public void finishObjectOutput(ObjectOutput oo) {
try {
((org.jboss.marshalling.Marshaller) oo).finish();
@@ -139,7 +139,7 @@
Thread current = Thread.currentThread();
ClassLoader old = current.getContextClassLoader();
if (old != null) toUse = old;
-
+
try {
current.setContextClassLoader(toUse);
out.writeObject(obj);
@@ -148,26 +148,26 @@
current.setContextClassLoader(old);
}
}
-
+
public Object objectFromByteBuffer(byte[] buf) throws IOException, ClassNotFoundException {
return objectFromByteBuffer(buf, 0, buf.length);
}
-
+
public Object objectFromByteBuffer(byte[] buf, int offset, int length) throws IOException,
- ClassNotFoundException {
+ ClassNotFoundException {
ByteArrayInputStream is = new ByteArrayInputStream(buf, offset, length);
ObjectInput unmarshaller = startObjectInput(is);
Object o = objectFromObjectStream(unmarshaller);
finishObjectInput(unmarshaller);
return o;
}
-
+
public ObjectInput startObjectInput(InputStream is) throws IOException {
Unmarshaller unmarshaller = factory.createUnmarshaller(configuration);
unmarshaller.start(Marshalling.createByteInput(is));
- return unmarshaller;
+ return unmarshaller;
}
-
+
public void finishObjectInput(ObjectInput oi) {
try {
((Unmarshaller) oi).finish();
@@ -191,7 +191,7 @@
classTable.init();
return classTable;
}
-
+
protected ExternalizerClassFactory createCustomExternalizerFactory(RpcManager rpcManager, CustomObjectTable objectTable) {
ExternalizerClassFactory externalizerFactory = new ExternalizerClassFactory(rpcManager, objectTable);
externalizerFactory.init();
Added: trunk/core/src/main/java/org/infinispan/marshall/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/marshall/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,6 @@
+/**
+ * Infinispan makes use of custom marshalling to serialize and deserialize state wherever
+ * possible, rather than falling back to the JDK to do this. This package contains the necessary
+ * classes for this.
+ */
+package org.infinispan.marshall;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/marshall/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -6,9 +6,9 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.factories.annotations.Stop;
-import org.infinispan.logging.Log;
import org.infinispan.util.ReflectionUtil;
import org.infinispan.util.concurrent.WithinThreadExecutor;
+import org.infinispan.util.logging.Log;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -23,14 +23,14 @@
import org.infinispan.Cache;
import org.infinispan.context.InvocationContext;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.factories.annotations.Inject;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.notifications.AbstractListenerImpl;
import org.infinispan.notifications.cachelistener.annotation.*;
import org.infinispan.notifications.cachelistener.event.*;
import static org.infinispan.notifications.cachelistener.event.Event.Type.*;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.transaction.Transaction;
import java.lang.annotation.Annotation;
Modified: trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,8 +1,6 @@
package org.infinispan.notifications.cachemanagerlistener;
import org.infinispan.factories.annotations.Stop;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.manager.CacheManager;
import org.infinispan.notifications.AbstractListenerImpl;
import org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted;
@@ -14,6 +12,8 @@
import org.infinispan.notifications.cachemanagerlistener.event.EventImpl;
import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
import org.infinispan.remoting.transport.Address;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.lang.annotation.Annotation;
import java.util.HashMap;
Added: trunk/core/src/main/java/org/infinispan/notifications/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/notifications/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * Notifications and eventing for listeners on both the Cache and CacheManager interfaces.
+ */
+package org.infinispan.notifications;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/notifications/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/core/src/main/java/org/infinispan/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,6 @@
+/**
+ * This is the core of Infinispan, a distributed, transactional, highly scalable data grid
+ * platform. For more information on Infinispan, please read the documentation, tutorials
+ * and sample code on <a href="http://www.jboss.org/infinispan">the Infinispan project page</a>.
+ */
+package org.infinispan;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -3,21 +3,21 @@
import org.infinispan.commands.CommandsFactory;
import org.infinispan.commands.remote.CacheRpcCommand;
import org.infinispan.config.Configuration;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.factories.ComponentRegistry;
import org.infinispan.factories.GlobalComponentRegistry;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.NonVolatile;
import org.infinispan.factories.scopes.Scope;
import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.remoting.responses.ExceptionResponse;
import org.infinispan.remoting.responses.RequestIgnoredResponse;
import org.infinispan.remoting.responses.Response;
import org.infinispan.remoting.responses.ResponseGenerator;
import org.infinispan.statetransfer.StateTransferException;
import org.infinispan.statetransfer.StateTransferManager;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.InputStream;
import java.io.OutputStream;
Modified: trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -30,8 +30,8 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.factories.annotations.Stop;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.ArrayList;
import java.util.LinkedList;
Modified: trunk/core/src/main/java/org/infinispan/remoting/RpcManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/RpcManagerImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/remoting/RpcManagerImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -11,14 +11,14 @@
import org.infinispan.jmx.annotations.MBean;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
import org.infinispan.remoting.responses.Response;
import org.infinispan.remoting.transport.Address;
import org.infinispan.remoting.transport.Transport;
import org.infinispan.statetransfer.StateTransferException;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.text.NumberFormat;
import java.util.List;
Added: trunk/core/src/main/java/org/infinispan/remoting/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/remoting/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * Remote communication between cache instances.
+ */
+package org.infinispan.remoting;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/remoting/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -24,13 +24,13 @@
import org.infinispan.CacheException;
import org.infinispan.commands.ReplicableCommand;
import org.infinispan.commands.remote.CacheRpcCommand;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.remoting.InboundInvocationHandler;
import org.infinispan.remoting.responses.ExtendedResponse;
import org.infinispan.remoting.responses.RequestIgnoredResponse;
import org.infinispan.remoting.responses.Response;
import org.infinispan.remoting.transport.DistributedSync;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.jgroups.Address;
import org.jgroups.Channel;
import org.jgroups.Message;
Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsDistSync.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsDistSync.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsDistSync.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,11 +1,11 @@
package org.infinispan.remoting.transport.jgroups;
import net.jcip.annotations.ThreadSafe;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.remoting.transport.DistributedSync;
import org.infinispan.util.Util;
import org.infinispan.util.concurrent.ReclosableLatch;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -4,9 +4,6 @@
import org.infinispan.commands.ReplicableCommand;
import org.infinispan.config.GlobalConfiguration;
import org.infinispan.config.parsing.XmlConfigHelper;
-import org.infinispan.lock.TimeoutException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
import org.infinispan.remoting.InboundInvocationHandler;
@@ -21,6 +18,9 @@
import org.infinispan.statetransfer.StateTransferException;
import org.infinispan.util.FileLookup;
import org.infinispan.util.Util;
+import org.infinispan.util.concurrent.TimeoutException;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.jgroups.Channel;
import org.jgroups.ChannelException;
import org.jgroups.ExtendedMembershipListener;
Modified: trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -29,19 +29,17 @@
import org.infinispan.config.Configuration;
import org.infinispan.container.DataContainer;
import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.context.Flag;
import org.infinispan.context.InvocationContext;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.factories.annotations.Inject;
import org.infinispan.factories.annotations.Start;
import org.infinispan.interceptors.InterceptorChain;
-import org.infinispan.invocation.Flag;
-import org.infinispan.invocation.InvocationContextContainer;
import org.infinispan.io.UnclosableObjectInputStream;
import org.infinispan.io.UnclosableObjectOutputStream;
import org.infinispan.loaders.CacheLoaderException;
import org.infinispan.loaders.CacheLoaderManager;
import org.infinispan.loaders.CacheStore;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
import org.infinispan.remoting.ResponseMode;
import org.infinispan.remoting.RpcManager;
@@ -49,6 +47,8 @@
import org.infinispan.remoting.transport.DistributedSync;
import org.infinispan.transaction.TransactionLog;
import org.infinispan.util.Util;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.IOException;
import java.io.InputStream;
Added: trunk/core/src/main/java/org/infinispan/statetransfer/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/statetransfer/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/statetransfer/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * Transfer of state to new caches in a cluster.
+ */
+package org.infinispan.statetransfer;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/statetransfer/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/transaction/BatchModeTransactionManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/BatchModeTransactionManager.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/transaction/BatchModeTransactionManager.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -21,8 +21,8 @@
*/
package org.infinispan.transaction;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
* Not really a transaction manager in the truest sense of the word. Only used to batch up operations. Proper
Modified: trunk/core/src/main/java/org/infinispan/transaction/DummyBaseTransactionManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/DummyBaseTransactionManager.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/transaction/DummyBaseTransactionManager.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -21,8 +21,8 @@
*/
package org.infinispan.transaction;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
Modified: trunk/core/src/main/java/org/infinispan/transaction/DummyTransaction.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/DummyTransaction.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/transaction/DummyTransaction.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -21,8 +21,8 @@
*/
package org.infinispan.transaction;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
Modified: trunk/core/src/main/java/org/infinispan/transaction/DummyTransactionManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/DummyTransactionManager.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/transaction/DummyTransactionManager.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -21,8 +21,8 @@
*/
package org.infinispan.transaction;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.naming.Context;
import javax.naming.InitialContext;
Modified: trunk/core/src/main/java/org/infinispan/transaction/DummyUserTransaction.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/DummyUserTransaction.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/transaction/DummyUserTransaction.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -21,8 +21,8 @@
*/
package org.infinispan.transaction;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
Modified: trunk/core/src/main/java/org/infinispan/transaction/GenericTransactionManagerLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/GenericTransactionManagerLookup.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/transaction/GenericTransactionManagerLookup.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -21,8 +21,8 @@
*/
package org.infinispan.transaction;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.naming.InitialContext;
import javax.naming.NamingException;
Modified: trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -23,12 +23,11 @@
import org.infinispan.commands.tx.PrepareCommand;
import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
Modified: trunk/core/src/main/java/org/infinispan/transaction/TransactionTable.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/TransactionTable.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/transaction/TransactionTable.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -28,11 +28,11 @@
import org.infinispan.factories.annotations.NonVolatile;
import org.infinispan.factories.annotations.Start;
import org.infinispan.factories.context.ContextFactory;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.remoting.RpcManager;
import org.infinispan.remoting.transport.Address;
import org.infinispan.remoting.transport.Transport;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.transaction.Status;
import javax.transaction.SystemException;
Added: trunk/core/src/main/java/org/infinispan/transaction/package-info.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/package-info.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/transaction/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,4 @@
+/**
+ * JTA transaction support.
+ */
+package org.infinispan.transaction;
\ No newline at end of file
Property changes on: trunk/core/src/main/java/org/infinispan/transaction/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/util/FileLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/FileLookup.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/util/FileLookup.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -21,8 +21,8 @@
*/
package org.infinispan.util;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.File;
import java.io.FileInputStream;
Modified: trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -22,8 +22,8 @@
package org.infinispan.util;
import org.infinispan.CacheException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
Modified: trunk/core/src/main/java/org/infinispan/util/TypedProperties.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/TypedProperties.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/util/TypedProperties.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,7 +1,7 @@
package org.infinispan.util;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.Properties;
Copied: trunk/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java (from rev 208, trunk/core/src/main/java/org/infinispan/lock/IsolationLevel.java)
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.infinispan.util.concurrent;
+
+/**
+ * Various transaction isolation levels as an enumerated class. Note that <a href="http://wiki.jboss.org/wiki/JBossCacheMVCC">MVCC</a>
+ * only supports {@link #READ_COMMITTED} and {@link #REPEATABLE_READ}, upgrading where possible.
+ * <p/>
+ * Also note that Infinispan defaults to {@link #READ_COMMITTED}.
+ * <p/>
+ *
+ * @author (various)
+ * @see <a href="http://en.wikipedia.org/wiki/Isolation_%28computer_science%29">Isolation levels</a>
+ * @since 4.0
+ */
+public enum IsolationLevel {
+ /**
+ * No isolation.
+ */
+ NONE,
+ SERIALIZABLE,
+ REPEATABLE_READ,
+ READ_COMMITTED,
+ READ_UNCOMMITTED
+}
Property changes on: trunk/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/core/src/main/java/org/infinispan/util/concurrent/TimeoutException.java (from rev 208, trunk/core/src/main/java/org/infinispan/lock/TimeoutException.java)
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/TimeoutException.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/TimeoutException.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.infinispan.util.concurrent;
+
+import org.infinispan.CacheException;
+
+
+/**
+ * Thrown when a timeout occurred. used by operations with timeouts, e.g. lock acquisition, or waiting for responses
+ * from all members.
+ *
+ * @author <a href="mailto:bela at jboss.org">Bela Ban</a>.
+ * <p/>
+ * <p/>
+ * <p><b>Revisions:</b>
+ * <p/>
+ * <p>Dec 28 2002 Bela Ban: first implementation
+ * @since 4.0
+ */
+public class TimeoutException extends CacheException {
+
+ /**
+ * The serialVersionUID
+ */
+ private static final long serialVersionUID = -8096787619908687038L;
+
+ public TimeoutException() {
+ super();
+ }
+
+ public TimeoutException(String msg) {
+ super(msg);
+ }
+
+ public TimeoutException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+
+ @Override
+ public String toString() {
+ return super.toString();
+ }
+}
Property changes on: trunk/core/src/main/java/org/infinispan/util/concurrent/TimeoutException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManager.java (from rev 208, trunk/core/src/main/java/org/infinispan/lock/LockManager.java)
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManager.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManager.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,121 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.infinispan.util.concurrent.locks;
+
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.context.InvocationContext;
+
+/**
+ * An interface to deal with all aspects of acquiring and releasing locks for cache entries.
+ *
+ * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
+ * @since 4.0
+ */
+public interface LockManager {
+ /**
+ * Determines the owner to be used when obtaining locks, given an invocation context. This is typically a {@link
+ * org.infinispan.transaction.GlobalTransaction} if one is present in the context, or {@link Thread#currentThread()}
+ * if one is not present.
+ *
+ * @param ctx invocation context
+ * @return owner to be used for acquiring locks.
+ */
+ Object getLockOwner(InvocationContext ctx);
+
+ /**
+ * Acquires a lock of type lockType, on a specific entry in the cache. This method will try for a period of time and
+ * give up if it is unable to acquire the required lock. The period of time is specified in {@link
+ * org.infinispan.config.Configuration#getLockAcquisitionTimeout()}.
+ * <p/>
+ * The owner for the lock is determined by passing the invocation context to {@link
+ * #getLockOwner(InvocationContext)}.
+ * <p/>
+ *
+ * @param key key to lock
+ * @param ctx invocation context associated with this invocation
+ * @return true if the lock was acquired, false otherwise.
+ * @throws InterruptedException if interrupted
+ */
+ boolean lockAndRecord(Object key, InvocationContext ctx) throws InterruptedException;
+
+ /**
+ * Releases the lock passed in, held by the specified owner
+ *
+ * @param owner lock owner
+ */
+ void unlock(Object key, Object owner);
+
+ /**
+ * Releases locks present in an invocation context and transaction entry, if one is available.
+ * <p/>
+ * Locks are released in reverse order of which they are acquired and registered.
+ * <p/>
+ * Lock owner is determined by passing the invocation context to {@link #getLockOwner(InvocationContext)}
+ * <p/>
+ *
+ * @param ctx invocation context to inspect
+ */
+ void unlock(InvocationContext ctx);
+
+ /**
+ * Tests whether a given owner owns a lock of lockType on a particular cache entry.
+ *
+ * @param owner owner
+ * @return true if the owner does own the specified lock type on the specified cache entry, false otherwise.
+ */
+ boolean ownsLock(Object key, Object owner);
+
+ /**
+ * Returns true if the cache entry is locked (either for reading or writing) by anyone, and false otherwise.
+ *
+ * @return true of locked; false if not.
+ */
+ boolean isLocked(Object key);
+
+ /**
+ * Retrieves the write lock owner, if any, for the specified cache entry.
+ *
+ * @return the owner of the lock, or null if not locked.
+ */
+ Object getOwner(Object key);
+
+ /**
+ * Prints lock information for all locks.
+ *
+ * @return lock information
+ */
+ String printLockInfo();
+
+ /**
+ * Inspects the entry for signs that it is possibly locked, and hence would need to be unlocked. Note that this is
+ * not deterministic, and is pessimistic in that even if an entry is not locked but *might* be locked, this will
+ * return true.
+ * <p/>
+ * As such, this should only be used to determine whether *unlocking* is necessary, not whether locking is necessary.
+ * Unlocking an entry that has not been locked has no effect, so this is just an optimisation.
+ * <p/>
+ *
+ * @param entry entry to inspect
+ * @return true if the entry *might* be locked, false if the entry definitely is *not* locked.
+ */
+ boolean possiblyLocked(CacheEntry entry);
+}
Property changes on: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManager.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java (from rev 208, trunk/core/src/main/java/org/infinispan/lock/LockManagerImpl.java)
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,165 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.infinispan.util.concurrent.locks;
+
+import org.infinispan.config.Configuration;
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.context.Flag;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.context.InvocationContextContainer;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.jmx.annotations.MBean;
+import org.infinispan.jmx.annotations.ManagedAttribute;
+import org.infinispan.util.ReversibleOrderedSet;
+import org.infinispan.util.concurrent.locks.containers.LockContainer;
+import org.infinispan.util.concurrent.locks.containers.OwnableReentrantPerEntryLockContainer;
+import org.infinispan.util.concurrent.locks.containers.OwnableReentrantStripedLockContainer;
+import org.infinispan.util.concurrent.locks.containers.ReentrantPerEntryLockContainer;
+import org.infinispan.util.concurrent.locks.containers.ReentrantStripedLockContainer;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
+
+import javax.transaction.TransactionManager;
+import java.util.Iterator;
+import java.util.Map;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import java.util.concurrent.locks.Lock;
+
+/**
+ * Handles locks for the MVCC based LockingInterceptor
+ *
+ * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
+ * @since 4.0
+ */
+ at MBean(objectName = "MvccLockManager")
+public class LockManagerImpl implements LockManager {
+ protected Configuration configuration;
+ LockContainer lockContainer;
+ private TransactionManager transactionManager;
+ private InvocationContextContainer invocationContextContainer;
+ private static final Log log = LogFactory.getLog(LockManagerImpl.class);
+ private static final boolean trace = log.isTraceEnabled();
+
+ @Inject
+ public void injectDependencies(Configuration configuration, TransactionManager transactionManager, InvocationContextContainer invocationContextContainer) {
+ this.configuration = configuration;
+ this.transactionManager = transactionManager;
+ this.invocationContextContainer = invocationContextContainer;
+ }
+
+ @Start
+ public void startLockManager() {
+ lockContainer = configuration.isUseLockStriping() ?
+ transactionManager == null ? new ReentrantStripedLockContainer(configuration.getConcurrencyLevel()) : new OwnableReentrantStripedLockContainer(configuration.getConcurrencyLevel(), invocationContextContainer) :
+ transactionManager == null ? new ReentrantPerEntryLockContainer(configuration.getConcurrencyLevel()) : new OwnableReentrantPerEntryLockContainer(configuration.getConcurrencyLevel(), invocationContextContainer);
+ }
+
+ public Object getLockOwner(InvocationContext ctx) {
+ return ctx.getGlobalTransaction() != null ? ctx.getGlobalTransaction() : Thread.currentThread();
+ }
+
+ public boolean lockAndRecord(Object key, InvocationContext ctx) throws InterruptedException {
+ long lockTimeout = getLockAcquisitionTimeout(ctx);
+ if (trace) log.trace("Attempting to lock {0} with acquisition timeout of {1} millis", key, lockTimeout);
+ if (lockContainer.acquireLock(key, lockTimeout, MILLISECONDS)) {
+ ctx.setContainsLocks(true);
+ return true;
+ }
+
+ // couldn't acquire lock!
+ return false;
+ }
+
+ private long getLockAcquisitionTimeout(InvocationContext ctx) {
+ return ctx.hasFlag(Flag.ZERO_LOCK_ACQUISITION_TIMEOUT) ?
+ 0 : configuration.getLockAcquisitionTimeout();
+ }
+
+ public void unlock(Object key, Object owner) {
+ if (trace) log.trace("Attempting to unlock " + key);
+ lockContainer.releaseLock(key);
+ }
+
+ @SuppressWarnings("unchecked")
+ public void unlock(InvocationContext ctx) {
+ ReversibleOrderedSet<Map.Entry<Object, CacheEntry>> entries = ctx.getLookedUpEntries().entrySet();
+ if (!entries.isEmpty()) {
+ // unlocking needs to be done in reverse order.
+ Iterator<Map.Entry<Object, CacheEntry>> it = entries.reverseIterator();
+ while (it.hasNext()) {
+ Map.Entry<Object, CacheEntry> e = it.next();
+ CacheEntry entry = e.getValue();
+ if (possiblyLocked(entry)) {
+ // has been locked!
+ Object k = e.getKey();
+ if (trace) log.trace("Attempting to unlock " + k);
+ lockContainer.releaseLock(k);
+ }
+ }
+ }
+ }
+
+ public boolean ownsLock(Object key, Object owner) {
+ return lockContainer.ownsLock(key, owner);
+ }
+
+ public boolean isLocked(Object key) {
+ return lockContainer.isLocked(key);
+ }
+
+ public Object getOwner(Object key) {
+ if (lockContainer.isLocked(key)) {
+ Lock l = lockContainer.getLock(key);
+
+ if (l instanceof OwnableReentrantLock) {
+ return ((OwnableReentrantLock) l).getOwner();
+ } else {
+ // cannot determine owner.
+ return null;
+ }
+ } else return null;
+ }
+
+ public String printLockInfo() {
+ return lockContainer.toString();
+ }
+
+ public final boolean possiblyLocked(CacheEntry entry) {
+ return entry == null || entry.isChanged() || entry.isNull();
+ }
+
+ @ManagedAttribute(writable = false, description = "The concurrency level that the MVCC Lock Manager has been configured with.")
+ public int getConcurrencyLevel() {
+ return configuration.getConcurrencyLevel();
+ }
+
+ @ManagedAttribute(writable = false, description = "The number of exclusive locks that are held.")
+ public int getNumberOfLocksHeld() {
+ return lockContainer.getNumLocksHeld();
+ }
+
+ @ManagedAttribute(writable = false, description = "The number of exclusive locks that are available.")
+ public int getNumberOfLocksAvailable() {
+ return lockContainer.size() - lockContainer.getNumLocksHeld();
+ }
+}
Property changes on: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/LockManagerImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -22,7 +22,7 @@
package org.infinispan.util.concurrent.locks;
import net.jcip.annotations.ThreadSafe;
-import org.infinispan.invocation.InvocationContextContainer;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.transaction.GlobalTransaction;
import java.util.concurrent.TimeUnit;
@@ -31,8 +31,8 @@
/**
* A lock that supports reentrancy based on owner (and not on current thread). For this to work, the lock needs to be
- * constructed with a reference to the {@link InvocationContextContainer}, so it is able to determine whether the
- * caller's "owner" reference is the current thread or a {@link GlobalTransaction} instance.
+ * constructed with a reference to the {@link org.infinispan.context.InvocationContextContainer}, so it is able to
+ * determine whether the caller's "owner" reference is the current thread or a {@link GlobalTransaction} instance.
* <p/>
* This makes this lock implementation very closely tied to Infinispan internals, but it provides for a very clean,
* efficient and moreover familiar interface to work with, since it implements {@link java.util.concurrent.locks.Lock}.
Copied: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java (from rev 209, trunk/core/src/main/java/org/infinispan/lock/StripedLock.java)
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,238 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.infinispan.util.concurrent.locks;
+
+import net.jcip.annotations.ThreadSafe;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+/**
+ * A simple implementation of lock striping, using cache entry keys to lock on, primarily used to help make {@link
+ * org.infinispan.loaders.CacheLoader} implemtations thread safe.
+ * <p/>
+ * Backed by a set of {@link java.util.concurrent.locks.ReentrantReadWriteLock} instances, and using the key hashcodes
+ * to determine buckets.
+ * <p/>
+ * Since buckets are used, it doesn't matter that the key in question is not removed from the lock map when no longer in
+ * use, since the key is not referenced in this class. Rather, the hash code is used.
+ * <p/>
+ *
+ * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
+ * @author Mircea.Markus at jboss.com
+ * @since 4.0
+ */
+ at ThreadSafe
+public class StripedLock {
+
+ private static Log log = LogFactory.getLog(StripedLock.class);
+
+ private static final int DEFAULT_CONCURRENCY = 20;
+ private final int lockSegmentMask;
+ private final int lockSegmentShift;
+
+ final ReentrantReadWriteLock[] sharedLocks;
+
+ /**
+ * This constructor just calls {@link #StripedLock(int)} with a default concurrency value of 20.
+ */
+ public StripedLock() {
+ this(DEFAULT_CONCURRENCY);
+ }
+
+ /**
+ * Creates a new StripedLock which uses a certain number of shared locks across all elements that need to be locked.
+ *
+ * @param concurrency number of threads expected to use this class concurrently.
+ */
+ public StripedLock(int concurrency) {
+ int tempLockSegShift = 0;
+ int numLocks = 1;
+ while (numLocks < concurrency) {
+ ++tempLockSegShift;
+ numLocks <<= 1;
+ }
+ lockSegmentShift = 32 - tempLockSegShift;
+ lockSegmentMask = numLocks - 1;
+
+ sharedLocks = new ReentrantReadWriteLock[numLocks];
+
+ for (int i = 0; i < numLocks; i++) sharedLocks[i] = new ReentrantReadWriteLock();
+ }
+
+ /**
+ * Blocks until a lock is acquired.
+ *
+ * @param exclusive if true, a write (exclusive) lock is attempted, otherwise a read (shared) lock is used.
+ */
+ public void acquireLock(Object key, boolean exclusive) {
+ ReentrantReadWriteLock lock = getLock(key);
+ if (exclusive) {
+ lock.writeLock().lock();
+ if (log.isTraceEnabled()) log.trace("WL acquired for '" + key + "'");
+ } else {
+ lock.readLock().lock();
+ if (log.isTraceEnabled()) log.trace("RL acquired for '" + key + "'");
+ }
+ }
+
+ public boolean acquireLock(String key, boolean exclusive, long millis) {
+ ReentrantReadWriteLock lock = getLock(key);
+ try {
+ if (exclusive) {
+ return lock.writeLock().tryLock(millis, TimeUnit.MILLISECONDS);
+ } else {
+ return lock.readLock().tryLock(millis, TimeUnit.MILLISECONDS);
+ }
+ } catch (InterruptedException e) {
+ log.warn("Thread insterrupted while trying to acquire lock", e);
+ return false;
+ }
+ }
+
+ /**
+ * Releases a lock the caller may be holding. This method is idempotent.
+ */
+ public void releaseLock(Object key) {
+ ReentrantReadWriteLock lock = getLock(key);
+ if (lock.isWriteLockedByCurrentThread()) {
+ lock.writeLock().unlock();
+ if (log.isTraceEnabled()) log.trace("WL released for '" + key + "'");
+ } else {
+ lock.readLock().unlock();
+ if (log.isTraceEnabled()) log.trace("RL released for '" + key + "'");
+ }
+ }
+
+ final ReentrantReadWriteLock getLock(Object o) {
+ return sharedLocks[hashToIndex(o)];
+ }
+
+ final int hashToIndex(Object o) {
+ return (hash(o) >>> lockSegmentShift) & lockSegmentMask;
+ }
+
+ /**
+ * Returns a hash code for non-null Object x. Uses the same hash code spreader as most other java.util hash tables,
+ * except that this uses the string representation of the object passed in.
+ *
+ * @param x the object serving as a key
+ * @return the hash code
+ */
+ final int hash(Object x) {
+ int h = x.hashCode();
+ h ^= (h >>> 20) ^ (h >>> 12);
+ return h ^ (h >>> 7) ^ (h >>> 4);
+ }
+
+ /**
+ * Releases locks on all keys passed in. Makes multiple calls to {@link #releaseLock(Object)}. This method is
+ * idempotent.
+ *
+ * @param keys keys to unlock
+ */
+ public void releaseAllLocks(List<Object> keys) {
+ for (Object k : keys) releaseLock(k);
+ }
+
+ /**
+ * Acquires locks on keys passed in. Makes multiple calls to {@link #acquireLock(Object, boolean)}
+ *
+ * @param keys keys to unlock
+ * @param exclusive whether locks are exclusive.
+ */
+ public void acquireAllLocks(List<Object> keys, boolean exclusive) {
+ for (Object k : keys) acquireLock(k, exclusive);
+ }
+
+ /**
+ * Returns the total number of locks held by this class.
+ */
+ public int getTotalLockCount() {
+ int count = 0;
+ for (ReentrantReadWriteLock lock : sharedLocks) {
+ count += lock.getReadLockCount();
+ count += lock.isWriteLocked() ? 1 : 0;
+ }
+ return count;
+ }
+
+ /**
+ * Acquires RL on all locks agregated by this StripedLock, in the given timeout.
+ */
+ public boolean aquireGlobalLock(boolean exclusive, long timeout) {
+ boolean success = true;
+ for (int i = 0; i < sharedLocks.length; i++) {
+ Lock toAcquire = exclusive ? sharedLocks[i].writeLock() : sharedLocks[i].readLock();
+ try {
+ success = toAcquire.tryLock(timeout, TimeUnit.MILLISECONDS);
+ if (!success) {
+ if (log.isTraceEnabled())
+ log.trace("Could not aquire lock on " + toAcquire + ". Exclusive?" + exclusive);
+ break;
+ }
+ } catch (InterruptedException e) {
+ if (log.isTraceEnabled()) log.trace("Cought InterruptedException while trying to aquire global lock", e);
+ success = false;
+ } finally {
+ if (!success) {
+ for (int j = 0; j < i; j++) {
+ Lock toRelease = exclusive ? sharedLocks[j].writeLock() : sharedLocks[j].readLock();
+ toRelease.unlock();
+ }
+ }
+ }
+ }
+ return success;
+ }
+
+ public void releaseGlobalLock(boolean exclusive) {
+ for (ReentrantReadWriteLock lock : sharedLocks) {
+ Lock toRelease = exclusive ? lock.writeLock() : lock.readLock();
+ toRelease.unlock();
+ }
+ }
+
+ public int getTotalReadLockCount() {
+ int count = 0;
+ for (ReentrantReadWriteLock lock : sharedLocks) {
+ count += lock.getReadLockCount();
+ }
+ return count;
+ }
+
+ public int getSharedLockCount() {
+ return sharedLocks.length;
+ }
+
+ public int getTotalWriteLockCount() {
+ int count = 0;
+ for (ReentrantReadWriteLock lock : sharedLocks) {
+ count += lock.isWriteLocked() ? 1 : 0;
+ }
+ return count;
+ }
+}
Property changes on: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantPerEntryLockContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantPerEntryLockContainer.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantPerEntryLockContainer.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,6 +1,6 @@
package org.infinispan.util.concurrent.locks.containers;
-import org.infinispan.invocation.InvocationContextContainer;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.util.concurrent.locks.OwnableReentrantLock;
import java.util.concurrent.locks.Lock;
Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantStripedLockContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantStripedLockContainer.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantStripedLockContainer.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -22,7 +22,7 @@
package org.infinispan.util.concurrent.locks.containers;
import net.jcip.annotations.ThreadSafe;
-import org.infinispan.invocation.InvocationContextContainer;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.util.concurrent.locks.OwnableReentrantLock;
import java.util.Arrays;
Copied: trunk/core/src/main/java/org/infinispan/util/logging (from rev 208, trunk/core/src/main/java/org/infinispan/logging)
Modified: trunk/core/src/main/java/org/infinispan/util/logging/AbstractLogImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/logging/AbstractLogImpl.java 2009-05-02 20:45:30 UTC (rev 208)
+++ trunk/core/src/main/java/org/infinispan/util/logging/AbstractLogImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,4 +1,4 @@
-package org.infinispan.logging;
+package org.infinispan.util.logging;
/**
* Abstract log implementation that handles message interpolation
Modified: trunk/core/src/main/java/org/infinispan/util/logging/JDKLogImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/logging/JDKLogImpl.java 2009-05-02 20:45:30 UTC (rev 208)
+++ trunk/core/src/main/java/org/infinispan/util/logging/JDKLogImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,4 +1,4 @@
-package org.infinispan.logging;
+package org.infinispan.util.logging;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: trunk/core/src/main/java/org/infinispan/util/logging/Log.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/logging/Log.java 2009-05-02 20:45:30 UTC (rev 208)
+++ trunk/core/src/main/java/org/infinispan/util/logging/Log.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,4 +1,4 @@
-package org.infinispan.logging;
+package org.infinispan.util.logging;
/**
* Infinispan's log abstraction layer.
Modified: trunk/core/src/main/java/org/infinispan/util/logging/Log4JLogImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/logging/Log4JLogImpl.java 2009-05-02 20:45:30 UTC (rev 208)
+++ trunk/core/src/main/java/org/infinispan/util/logging/Log4JLogImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,4 +1,4 @@
-package org.infinispan.logging;
+package org.infinispan.util.logging;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
Modified: trunk/core/src/main/java/org/infinispan/util/logging/LogFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/logging/LogFactory.java 2009-05-02 20:45:30 UTC (rev 208)
+++ trunk/core/src/main/java/org/infinispan/util/logging/LogFactory.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,4 +1,4 @@
-package org.infinispan.logging;
+package org.infinispan.util.logging;
/**
* Factory that creates {@link Log} instances.
Modified: trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,14 +1,14 @@
package org.infinispan.api;
import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.config.Configuration;
import org.infinispan.config.ConfigurationException;
-import org.infinispan.lock.IsolationLevel;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.transaction.DummyTransactionManager;
import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.util.concurrent.IsolationLevel;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;
import org.testng.annotations.Test;
Modified: trunk/core/src/test/java/org/infinispan/api/MixedModeTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/MixedModeTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/api/MixedModeTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,7 +2,7 @@
import org.infinispan.AdvancedCache;
import org.infinispan.config.Configuration;
-import org.infinispan.invocation.Flag;
+import org.infinispan.context.Flag;
import org.infinispan.test.MultipleCacheManagersTest;
import org.testng.annotations.Test;
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,9 +1,9 @@
package org.infinispan.api.mvcc;
import org.infinispan.Cache;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.lock.LockManager;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.test.TestingUtil;
+import org.infinispan.util.concurrent.locks.LockManager;
import org.infinispan.util.concurrent.locks.containers.LockContainer;
/**
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/LockPerEntryTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/LockPerEntryTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/LockPerEntryTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,13 +1,13 @@
package org.infinispan.api.mvcc;
import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.config.Configuration;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.lock.LockManager;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.SingleCacheManagerTest;
import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.util.concurrent.locks.LockManager;
import org.infinispan.util.concurrent.locks.containers.LockContainer;
import org.testng.annotations.Test;
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,16 +2,16 @@
import org.infinispan.Cache;
import org.infinispan.config.Configuration;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.lock.IsolationLevel;
-import org.infinispan.lock.LockManager;
-import org.infinispan.lock.TimeoutException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.TestingUtil;
import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.util.concurrent.IsolationLevel;
+import org.infinispan.util.concurrent.TimeoutException;
+import org.infinispan.util.concurrent.locks.LockManager;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -7,10 +7,11 @@
import org.infinispan.commands.write.PutKeyValueCommand;
import org.infinispan.commands.write.RemoveCommand;
import org.infinispan.config.Configuration;
-import org.infinispan.invocation.Flag;
+import org.infinispan.context.Flag;
+import org.infinispan.remoting.ResponseFilter;
+import org.infinispan.remoting.ResponseMode;
+import org.infinispan.remoting.RpcManager;
import org.infinispan.remoting.RpcManagerImpl;
-import org.infinispan.remoting.RpcManager;
-import org.infinispan.remoting.*;
import org.infinispan.remoting.transport.Address;
import org.infinispan.remoting.transport.Transport;
import org.infinispan.test.MultipleCacheManagersTest;
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIMVCCTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIMVCCTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIMVCCTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,7 +1,7 @@
package org.infinispan.api.mvcc.read_committed;
import org.infinispan.api.CacheAPITest;
-import org.infinispan.lock.IsolationLevel;
+import org.infinispan.util.concurrent.IsolationLevel;
import org.testng.annotations.Test;
@Test(groups = "functional", testName = "api.mvcc.read_committed.CacheAPIMVCCTest")
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIMVCCTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIMVCCTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIMVCCTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,7 +1,7 @@
package org.infinispan.api.mvcc.repeatable_read;
import org.infinispan.api.CacheAPITest;
-import org.infinispan.lock.IsolationLevel;
+import org.infinispan.util.concurrent.IsolationLevel;
import org.testng.annotations.Test;
@Test(groups = "functional", testName = "api.mvcc.repeatable_read.CacheAPIMVCCTest")
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,15 +1,15 @@
package org.infinispan.api.mvcc.repeatable_read;
import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.api.mvcc.LockAssert;
import org.infinispan.config.Configuration;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.lock.IsolationLevel;
-import org.infinispan.lock.LockManager;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.util.concurrent.IsolationLevel;
+import org.infinispan.util.concurrent.locks.LockManager;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
Modified: trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,11 +2,11 @@
import org.infinispan.Cache;
import org.infinispan.config.Configuration;
-import org.infinispan.lock.TimeoutException;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.TestingUtil;
import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.util.concurrent.TimeoutException;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -18,7 +18,7 @@
/**
* Tester class for AtomicMapCache.
*
- * @author Mircea.Markus at jboss.com
+ * @author Mircea.Markus at jboss.com
*/
@Test(groups = "functional", testName = "atomic.AtomicHashMapConcurrencyTest")
public class AtomicHashMapConcurrencyTest {
@@ -67,7 +67,7 @@
public void testConcurrentModifications() throws Exception {
AtomicMap<Integer, String> atomicMap = cache.getAtomicMap(KEY);
tm.begin();
- atomicMap.put(1,"");
+ atomicMap.put(1, "");
OtherThread ot = new OtherThread();
ot.start();
ot.toExecute.put(Operation.PUT);
@@ -79,7 +79,7 @@
AtomicMap<Integer, String> atomicMap = cache.getAtomicMap(KEY);
atomicMap.put(1, "existing");
tm.begin();
- atomicMap.put(1,"newVal");
+ atomicMap.put(1, "newVal");
OtherThread ot = new OtherThread();
ot.start();
ot.toExecute.put(Operation.READ);
Modified: trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,15 +2,15 @@
import org.infinispan.Cache;
import org.infinispan.config.Configuration;
+import static org.infinispan.context.Flag.SKIP_LOCKING;
import org.infinispan.context.InvocationContext;
-import static org.infinispan.invocation.Flag.SKIP_LOCKING;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.TestingUtil;
import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
Modified: trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -9,8 +9,8 @@
import org.infinispan.loaders.decorators.SingletonStoreConfig;
import org.infinispan.loaders.file.FileCacheStore;
import org.infinispan.loaders.file.FileCacheStoreConfig;
-import org.infinispan.lock.IsolationLevel;
import org.infinispan.transaction.GenericTransactionManagerLookup;
+import org.infinispan.util.concurrent.IsolationLevel;
import org.testng.annotations.Test;
import org.w3c.dom.Element;
Modified: trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -5,7 +5,7 @@
import org.infinispan.config.GlobalConfiguration;
import org.infinispan.distribution.DefaultConsistentHash;
import org.infinispan.loaders.file.FileCacheStoreConfig;
-import org.infinispan.lock.IsolationLevel;
+import org.infinispan.util.concurrent.IsolationLevel;
import org.testng.annotations.Test;
import java.io.IOException;
Modified: trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -10,11 +10,11 @@
import org.infinispan.container.entries.ImmortalCacheEntry;
import org.infinispan.container.entries.InternalCacheEntry;
import org.infinispan.container.entries.MortalCacheEntry;
-import org.infinispan.lock.IsolationLevel;
import org.infinispan.remoting.transport.Address;
import org.infinispan.test.MultipleCacheManagersTest;
import org.infinispan.test.TestingUtil;
import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.util.concurrent.IsolationLevel;
import org.testng.annotations.Test;
import javax.transaction.TransactionManager;
Modified: trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -8,7 +8,7 @@
import org.infinispan.commands.write.ClearCommand;
import org.infinispan.commands.write.InvalidateCommand;
import org.infinispan.config.Configuration;
-import org.infinispan.invocation.Flag;
+import org.infinispan.context.Flag;
import org.infinispan.remoting.ResponseFilter;
import org.infinispan.remoting.ResponseMode;
import org.infinispan.remoting.RpcManager;
Modified: trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -14,7 +14,7 @@
import javax.transaction.TransactionManager;
/**
- * Test the JMX functionality in {@link org.infinispan.lock.LockManagerImpl}.
+ * Test the JMX functionality in {@link org.infinispan.util.concurrent.locks.LockManagerImpl}.
*
* @author Mircea.Markus at jboss.com
*/
Modified: trunk/core/src/test/java/org/infinispan/loaders/decorators/SingletonStoreTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/decorators/SingletonStoreTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/loaders/decorators/SingletonStoreTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -8,12 +8,12 @@
import org.infinispan.loaders.CacheLoaderManager;
import org.infinispan.loaders.CacheStore;
import org.infinispan.loaders.dummy.DummyInMemoryCacheStore;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.MultipleCacheManagersTest;
import org.infinispan.test.TestingUtil;
import org.infinispan.test.ViewChangeListener;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.fail;
import org.testng.annotations.Test;
Modified: trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStore.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -6,10 +6,10 @@
import org.infinispan.loaders.AbstractCacheStoreConfig;
import org.infinispan.loaders.CacheLoaderConfig;
import org.infinispan.loaders.CacheLoaderException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.marshall.Marshaller;
import org.infinispan.marshall.ObjectStreamMarshaller;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.io.ObjectInput;
import java.io.ObjectOutput;
Modified: trunk/core/src/test/java/org/infinispan/lock/StripedLockTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/lock/StripedLockTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/lock/StripedLockTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,5 +1,6 @@
package org.infinispan.lock;
+import org.infinispan.util.concurrent.locks.StripedLock;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -7,11 +8,11 @@
import java.util.concurrent.BlockingQueue;
/**
- * Tester class for {@link org.infinispan.lock.StripedLock}.
+ * Tester class for {@link org.infinispan.util.concurrent.locks.StripedLock}.
*
* @author Mircea.Markus at jboss.com
*/
- at Test (groups = "unit", testName = "lock.StripedLockTest")
+ at Test(groups = "unit", testName = "lock.StripedLockTest")
public class StripedLockTest {
StripedLock stripedLock;
@@ -82,7 +83,6 @@
assert stripedLock.getTotalWriteLockCount() == 0;
-
}
private boolean aquireWL() throws Exception {
Modified: trunk/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,9 +1,6 @@
package org.infinispan.notifications;
import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.manager.CacheManager;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified;
@@ -11,6 +8,9 @@
import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
import org.infinispan.notifications.cachelistener.event.Event;
import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
Modified: trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierImplTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierImplTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierImplTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -4,9 +4,9 @@
import static org.easymock.EasyMock.createNiceMock;
import org.infinispan.Cache;
import org.infinispan.context.InvocationContext;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.context.InvocationContextImpl;
import org.infinispan.factories.context.DefaultContextFactory;
-import org.infinispan.invocation.InvocationContextContainer;
import org.infinispan.notifications.cachelistener.event.CacheEntryEvent;
import org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent;
import org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent;
Modified: trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -4,11 +4,11 @@
import org.infinispan.Cache;
import org.infinispan.config.Configuration;
import org.infinispan.context.InvocationContext;
-import org.infinispan.lock.IsolationLevel;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.TestingUtil;
import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.util.concurrent.IsolationLevel;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeMethod;
Modified: trunk/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -8,7 +8,7 @@
import org.infinispan.commands.write.RemoveCommand;
import org.infinispan.commands.write.ReplaceCommand;
import org.infinispan.config.Configuration;
-import org.infinispan.invocation.Flag;
+import org.infinispan.context.Flag;
import org.infinispan.test.MultipleCacheManagersTest;
import org.infinispan.transaction.DummyTransactionManagerLookup;
Modified: trunk/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -13,11 +13,11 @@
import org.infinispan.config.Configuration;
import org.infinispan.context.InvocationContext;
import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.lock.IsolationLevel;
-import org.infinispan.lock.TimeoutException;
import org.infinispan.test.MultipleCacheManagersTest;
import org.infinispan.test.TestingUtil;
import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.util.concurrent.IsolationLevel;
+import org.infinispan.util.concurrent.TimeoutException;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.fail;
import org.testng.annotations.Test;
Modified: trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -10,9 +10,6 @@
import org.infinispan.Cache;
import org.infinispan.CacheException;
import org.infinispan.config.Configuration;
-import org.infinispan.lock.IsolationLevel;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved;
@@ -21,6 +18,9 @@
import org.infinispan.test.MultipleCacheManagersTest;
import org.infinispan.test.TestingUtil;
import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.util.concurrent.IsolationLevel;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.Test;
Modified: trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,12 +2,12 @@
import org.infinispan.Cache;
import org.infinispan.config.Configuration;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.MultipleCacheManagersTest;
import org.infinispan.test.TestingUtil;
import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.testng.annotations.Test;
import javax.transaction.TransactionManager;
Modified: trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -7,12 +7,12 @@
import org.infinispan.context.InvocationContext;
import org.infinispan.lifecycle.ComponentStatus;
import org.infinispan.loaders.CacheLoaderManager;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.manager.CacheManager;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.remoting.ReplicationQueue;
import org.infinispan.remoting.transport.Address;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.transaction.TransactionManager;
import java.util.Collections;
Modified: trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/TestingUtil.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/test/TestingUtil.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -19,9 +19,9 @@
import org.infinispan.lifecycle.ComponentStatus;
import org.infinispan.loaders.CacheLoader;
import org.infinispan.loaders.CacheLoaderManager;
-import org.infinispan.lock.LockManager;
import org.infinispan.manager.CacheManager;
import org.infinispan.remoting.transport.Address;
+import org.infinispan.util.concurrent.locks.LockManager;
import javax.transaction.TransactionManager;
import java.io.File;
@@ -123,10 +123,10 @@
/**
* Waits for the given memebrs to be removed from the cluster. The difference between this and {@link
- * #blockUntilViewsReceived(long, org.infinispan.manager.CacheManager[])} methods(s) is that it does not barf if
- * more than expected memebers is in the cluster - this is because we expect to start with a grater number fo
- * memebers than we eventually expect. It will barf though, if the number of members is not the one expected but
- * only after the timeout expieres.
+ * #blockUntilViewsReceived(long, org.infinispan.manager.CacheManager[])} methods(s) is that it does not barf if more
+ * than expected memebers is in the cluster - this is because we expect to start with a grater number fo memebers
+ * than we eventually expect. It will barf though, if the number of members is not the one expected but only after
+ * the timeout expieres.
*/
public static void blockForMemberToFail(long timeout, CacheManager... cacheManagers) {
blockUntilViewsReceived(timeout, false, cacheManagers);
Modified: trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,14 +1,11 @@
package org.infinispan.test.testng;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
-import java.io.File;
-
/**
* This class makes sure that all files are being deleted after each test run. It also logs testsuite information.
*
@@ -17,7 +14,7 @@
*/
@Test(groups = "functional", testName = "test.testng.SuiteResourcesAndLogTest")
public class SuiteResourcesAndLogTest {
-
+
private static Log log = LogFactory.getLog(SuiteResourcesAndLogTest.class);
Modified: trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,7 +1,7 @@
package org.infinispan.test.testng;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.testng.IClass;
import org.testng.ITestContext;
import org.testng.ITestListener;
Modified: trunk/tree/src/main/java/org/infinispan/tree/Node.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/Node.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/tree/src/main/java/org/infinispan/tree/Node.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -22,7 +22,7 @@
package org.infinispan.tree;
import net.jcip.annotations.ThreadSafe;
-import org.infinispan.invocation.Flag;
+import org.infinispan.context.Flag;
import java.util.Map;
import java.util.Set;
Modified: trunk/tree/src/main/java/org/infinispan/tree/NodeImpl.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/NodeImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/tree/src/main/java/org/infinispan/tree/NodeImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -24,8 +24,8 @@
import org.infinispan.Cache;
import org.infinispan.atomic.AtomicMap;
import org.infinispan.batch.BatchContainer;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.invocation.Flag;
+import org.infinispan.context.Flag;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.util.Immutables;
import org.infinispan.util.Util;
Modified: trunk/tree/src/main/java/org/infinispan/tree/TreeCache.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/TreeCache.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/tree/src/main/java/org/infinispan/tree/TreeCache.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -23,7 +23,7 @@
import org.infinispan.Cache;
import org.infinispan.CacheException;
-import org.infinispan.invocation.Flag;
+import org.infinispan.context.Flag;
import org.infinispan.lifecycle.Lifecycle;
import java.util.Map;
@@ -44,6 +44,12 @@
* locking, is coarse grained. At the same time, replication is fine grained, and only modified attributes in a Node
* are replicated.
* <p/>
+ * Obtaining a TreeCache is done using the {@link TreeCacheFactory}.
+ * <pre>
+ * Cache cache = new DefaultCacheFactory().getCache();
+ * TreeCacheFactory tcf = new TreeCacheFactory();
+ * TreeCache tree = tcf.createTreeCache(cache);
+ * </pre>
*
* @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
* @see Node
Modified: trunk/tree/src/main/java/org/infinispan/tree/TreeCacheFactory.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/TreeCacheFactory.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/tree/src/main/java/org/infinispan/tree/TreeCacheFactory.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -8,8 +8,6 @@
*
* @author Navin Surtani
*/
-
-
public class TreeCacheFactory {
/**
@@ -17,16 +15,15 @@
*
* @param cache
* @return instance of a {@link TreeCache}
- * @throws NullPointerException if the cache parameter is null
+ * @throws NullPointerException if the cache parameter is null
* @throws ConfigurationException if the invocation batching configuration is not enabled.
- *
*/
public <K, V> TreeCache<K, V> createTreeCache(Cache<K, V> cache) {
// Validation to make sure that the cache is not null.
- if (cache == null){
+ if (cache == null) {
throw new NullPointerException("The cache parameter passed in is null");
}
Modified: trunk/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -25,9 +25,9 @@
import org.infinispan.Cache;
import org.infinispan.CacheException;
import org.infinispan.atomic.AtomicMap;
-import org.infinispan.invocation.Flag;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.context.Flag;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import java.util.Map;
import java.util.Set;
@@ -208,7 +208,8 @@
public void move(Fqn nodeToMoveFqn, Fqn newParentFqn) throws NodeNotExistsException {
if (trace) log.trace("Moving node '" + nodeToMoveFqn + "' to '" + newParentFqn + "'");
- if (nodeToMoveFqn == null || newParentFqn == null) throw new NullPointerException("Cannot accept null parameters!");
+ if (nodeToMoveFqn == null || newParentFqn == null)
+ throw new NullPointerException("Cannot accept null parameters!");
if (nodeToMoveFqn.getParent().equals(newParentFqn)) {
if (trace) log.trace("Not doing anything as this node is equal with its parent");
@@ -227,7 +228,7 @@
if (!exists(newParentFqn)) {
// then we need to silently create the new parent
createNodeInCache(newParentFqn);
- if (trace) log.trace("The new parent ("+newParentFqn +") did not exists, was created");
+ if (trace) log.trace("The new parent (" + newParentFqn + ") did not exists, was created");
}
// create an empty node for this new parent
Modified: trunk/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -26,11 +26,11 @@
import org.infinispan.atomic.AtomicMapCache;
import org.infinispan.batch.AutoBatchSupport;
import org.infinispan.batch.BatchContainer;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.invocation.Flag;
-import org.infinispan.lock.LockManager;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.context.Flag;
+import org.infinispan.context.InvocationContextContainer;
+import org.infinispan.util.concurrent.locks.LockManager;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
public class TreeStructureSupport extends AutoBatchSupport {
private static Log log = LogFactory.getLog(TreeStructureSupport.class);
Added: trunk/tree/src/main/java/org/infinispan/tree/package-info.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/package-info.java (rev 0)
+++ trunk/tree/src/main/java/org/infinispan/tree/package-info.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -0,0 +1,9 @@
+/**
+ * This package contains the {@link TreeCache}. For usage, see the {@link TreeCache} and
+ * {@link org.infinispan.tree.TreeCacheFactory} classes and their javadocs.
+ * <p />
+ * This package is intended as a compatibility layer between JBoss Cache and Infinispan, and also
+ * as an API for when a tree structure is useful. In general though, this will not perform as
+ * well as the core Infinispan API.
+ */
+package org.infinispan.tree;
\ No newline at end of file
Property changes on: trunk/tree/src/main/java/org/infinispan/tree/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/tree/src/test/java/org/infinispan/api/tree/NodeLockSupport.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/NodeLockSupport.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/NodeLockSupport.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -25,10 +25,10 @@
import org.infinispan.Cache;
import org.infinispan.test.TestingUtil;
-import org.infinispan.lock.LockManager;
import org.infinispan.tree.Fqn;
import org.infinispan.tree.TreeCache;
import org.infinispan.tree.TreeStructureSupport;
+import org.infinispan.util.concurrent.locks.LockManager;
import javax.transaction.TransactionManager;
Modified: trunk/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPITest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPITest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPITest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -3,19 +3,19 @@
import org.infinispan.api.mvcc.LockAssert;
import org.infinispan.config.Configuration;
import org.infinispan.container.DataContainer;
+import org.infinispan.context.InvocationContextContainer;
import org.infinispan.factories.ComponentRegistry;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.lock.LockManager;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.SingleCacheManagerTest;
import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.tree.Fqn;
import org.infinispan.tree.Node;
import org.infinispan.tree.TreeCacheImpl;
import org.infinispan.tree.TreeStructureSupport;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.util.concurrent.locks.LockManager;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.Test;
Modified: trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -9,7 +9,7 @@
import org.infinispan.Cache;
import org.infinispan.config.Configuration;
-import org.infinispan.invocation.Flag;
+import org.infinispan.context.Flag;
import org.infinispan.test.MultipleCacheManagersTest;
import org.infinispan.tree.Fqn;
import org.infinispan.tree.Node;
Modified: trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -1,20 +1,20 @@
package org.infinispan.api.tree;
import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.atomic.AtomicMap;
import org.infinispan.atomic.AtomicMapCache;
import org.infinispan.config.Configuration;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.manager.CacheManager;
import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.transaction.DummyTransactionManagerLookup;
import org.infinispan.tree.Fqn;
import org.infinispan.tree.Node;
import org.infinispan.tree.NodeKey;
import org.infinispan.tree.TreeCache;
import org.infinispan.tree.TreeCacheImpl;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
Modified: trunk/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java 2009-05-05 15:53:50 UTC (rev 210)
+++ trunk/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java 2009-05-05 17:07:58 UTC (rev 211)
@@ -2,9 +2,6 @@
import org.infinispan.Cache;
import org.infinispan.config.Configuration;
-import org.infinispan.lock.IsolationLevel;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
import org.infinispan.manager.CacheManager;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.profiling.testinternals.FqnGenerator;
@@ -16,6 +13,9 @@
import org.infinispan.tree.Fqn;
import org.infinispan.tree.TreeCache;
import org.infinispan.tree.TreeCacheImpl;
+import org.infinispan.util.concurrent.IsolationLevel;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -26,7 +26,7 @@
import java.util.concurrent.atomic.AtomicLong;
/**
- * * Test to use with a profiler to profile replication. To be used in conjunction with ProfileSlaveTest.
+ * * Test to use with a profiler to profile replication. To be used in conjunction with ProfileSlaveTest.
* <p/>
* Typical usage pattern:
* <p/>
@@ -42,7 +42,7 @@
Log log = LogFactory.getLog(TreeProfileTest.class);
/**
- Test configuration options
+ * Test configuration options
*/
protected static final long NUM_OPERATIONS = 1000000; // DURATION is replaced with a fixed number of operations instead.
protected static final int NUM_THREADS = 25;
@@ -58,7 +58,6 @@
protected TreeCache cache;
-
@BeforeMethod
public void setUp() {
Configuration cfg = new Configuration();
@@ -276,7 +275,7 @@
}
duration.getAndAdd(d);
- }
+ }
}
More information about the infinispan-commits
mailing list