[infinispan-commits] Infinispan SVN: r91 - in trunk: cachestore/bdbje and 129 other directories.

infinispan-commits at lists.jboss.org infinispan-commits at lists.jboss.org
Tue Apr 7 06:54:34 EDT 2009


Author: manik.surtani at jboss.com
Date: 2009-04-07 06:54:33 -0400 (Tue, 07 Apr 2009)
New Revision: 91

Added:
   trunk/cachestore/bdbje/src/main/java/org/infinispan/
   trunk/cachestore/bdbje/src/test/java/org/infinispan/
   trunk/cachestore/jdbc/src/main/java/org/infinispan/
   trunk/cachestore/jdbc/src/test/java/org/infinispan/
   trunk/cachestore/s3/src/main/java/org/infinispan/
   trunk/cachestore/s3/src/test/java/org/infinispan/
   trunk/core/src/main/java/org/infinispan/
   trunk/core/src/test/java/org/infinispan/
   trunk/tree/src/main/java/org/infinispan/
   trunk/tree/src/test/java/org/infinispan/
Removed:
   trunk/cachestore/bdbje/src/main/java/org/infinispan/
   trunk/cachestore/bdbje/src/test/java/org/infinispan/
   trunk/cachestore/jdbc/src/main/java/org/infinispan/
   trunk/cachestore/jdbc/src/test/java/org/infinispan/
   trunk/cachestore/s3/src/main/java/org/infinispan/
   trunk/cachestore/s3/src/test/java/org/infinispan/
   trunk/core/src/main/java/org/infinispan/
   trunk/core/src/test/java/org/infinispan/
   trunk/tree/src/main/java/org/infinispan/
   trunk/tree/src/test/java/org/infinispan/
Modified:
   trunk/cachestore/bdbje/pom.xml
   trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeCacheStore.java
   trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeCacheStoreConfig.java
   trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeResourceFactory.java
   trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/ModificationsTransactionWorker.java
   trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/PreparableTransactionRunner.java
   trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreConfigTest.java
   trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreIntegrationTest.java
   trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreTest.java
   trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeLearningTest.java
   trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeResourceFactoryTest.java
   trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/ModificationsTransactionWorkerTest.java
   trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/PreparableTransactionRunnerTest.java
   trunk/cachestore/bdbje/src/test/java/org/infinispan/test/fwk/BdbjeTestNameVerifier.java
   trunk/cachestore/jdbc/pom.xml
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/JdbcUtil.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/TableManipulation.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/binary/JdbcBinaryCacheStore.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/binary/JdbcBinaryCacheStoreConfig.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/ConnectionFactory.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/ConnectionFactoryConfig.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/PooledConnectionFactory.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/SimpleConnectionFactory.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStore.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreConfig.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/DefaultKey2StringMapper.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStore.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/Key2StringMapper.java
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/UnsupportedKeyTypeException.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/JdbcBinaryCacheStoreTest.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/PooledConnectionFactoryTest.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/TableManipulationTest.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreTest.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreTest2.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/DefaultKey2StringMapperTest.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreTest.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreTest2.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/Person.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/PersonKey2StringMapper.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/JdbcTestNameVerifier.java
   trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java
   trunk/cachestore/s3/pom.xml
   trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/Jets3tS3Connection.java
   trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3CacheStore.java
   trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3CacheStoreConfig.java
   trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3Connection.java
   trunk/cachestore/s3/src/test/java/org/infinispan/s3/MockS3Connection.java
   trunk/cachestore/s3/src/test/java/org/infinispan/s3/S3CacheStoreIntegrationTest.java
   trunk/cachestore/s3/src/test/java/org/infinispan/test/fwk/S3TestNameVerifier.java
   trunk/core/pom.xml
   trunk/core/src/main/java/org/infinispan/AdvancedCache.java
   trunk/core/src/main/java/org/infinispan/Cache.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/Version.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/atomic/AtomicMap.java
   trunk/core/src/main/java/org/infinispan/atomic/AtomicMapCache.java
   trunk/core/src/main/java/org/infinispan/atomic/ClearOperation.java
   trunk/core/src/main/java/org/infinispan/atomic/Delta.java
   trunk/core/src/main/java/org/infinispan/atomic/DeltaAware.java
   trunk/core/src/main/java/org/infinispan/atomic/NullDelta.java
   trunk/core/src/main/java/org/infinispan/atomic/Operation.java
   trunk/core/src/main/java/org/infinispan/atomic/PutOperation.java
   trunk/core/src/main/java/org/infinispan/atomic/RemoveOperation.java
   trunk/core/src/main/java/org/infinispan/batch/AutoBatchSupport.java
   trunk/core/src/main/java/org/infinispan/batch/BatchContainer.java
   trunk/core/src/main/java/org/infinispan/commands/AbstractVisitor.java
   trunk/core/src/main/java/org/infinispan/commands/CacheRpcCommand.java
   trunk/core/src/main/java/org/infinispan/commands/CommandsFactory.java
   trunk/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java
   trunk/core/src/main/java/org/infinispan/commands/DataCommand.java
   trunk/core/src/main/java/org/infinispan/commands/RemoteCommandFactory.java
   trunk/core/src/main/java/org/infinispan/commands/ReplicableCommand.java
   trunk/core/src/main/java/org/infinispan/commands/TransactionBoundaryCommand.java
   trunk/core/src/main/java/org/infinispan/commands/VisitableCommand.java
   trunk/core/src/main/java/org/infinispan/commands/Visitor.java
   trunk/core/src/main/java/org/infinispan/commands/control/StateTransferControlCommand.java
   trunk/core/src/main/java/org/infinispan/commands/read/AbstractDataCommand.java
   trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java
   trunk/core/src/main/java/org/infinispan/commands/read/SizeCommand.java
   trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java
   trunk/core/src/main/java/org/infinispan/commands/remote/ReplicateCommand.java
   trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
   trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java
   trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
   trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/DataWriteCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/EvictCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java
   trunk/core/src/main/java/org/infinispan/commands/write/WriteCommand.java
   trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java
   trunk/core/src/main/java/org/infinispan/config/AbstractNamedCacheConfigurationBean.java
   trunk/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java
   trunk/core/src/main/java/org/infinispan/config/CloneableConfigurationComponent.java
   trunk/core/src/main/java/org/infinispan/config/Configuration.java
   trunk/core/src/main/java/org/infinispan/config/ConfigurationException.java
   trunk/core/src/main/java/org/infinispan/config/ConfigurationRegistry.java
   trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java
   trunk/core/src/main/java/org/infinispan/config/DuplicateCacheNameException.java
   trunk/core/src/main/java/org/infinispan/config/Dynamic.java
   trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
   trunk/core/src/main/java/org/infinispan/config/PluggableConfigurationComponent.java
   trunk/core/src/main/java/org/infinispan/config/RuntimeConfig.java
   trunk/core/src/main/java/org/infinispan/config/parsing/JGroupsStackParser.java
   trunk/core/src/main/java/org/infinispan/config/parsing/ParsedAttributes.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/XmlConfigurationParser.java
   trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java
   trunk/core/src/main/java/org/infinispan/config/parsing/XmlParserBase.java
   trunk/core/src/main/java/org/infinispan/config/parsing/element/CustomInterceptorsElementParser.java
   trunk/core/src/main/java/org/infinispan/config/parsing/element/LoadersElementParser.java
   trunk/core/src/main/java/org/infinispan/container/DataContainer.java
   trunk/core/src/main/java/org/infinispan/container/FIFODataContainer.java
   trunk/core/src/main/java/org/infinispan/container/LRUDataContainer.java
   trunk/core/src/main/java/org/infinispan/container/SimpleDataContainer.java
   trunk/core/src/main/java/org/infinispan/container/entries/AbstractInternalCacheEntry.java
   trunk/core/src/main/java/org/infinispan/container/entries/CacheEntry.java
   trunk/core/src/main/java/org/infinispan/container/entries/ImmortalCacheEntry.java
   trunk/core/src/main/java/org/infinispan/container/entries/InternalCacheEntry.java
   trunk/core/src/main/java/org/infinispan/container/entries/InternalEntryFactory.java
   trunk/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java
   trunk/core/src/main/java/org/infinispan/container/entries/MortalCacheEntry.java
   trunk/core/src/main/java/org/infinispan/container/entries/NullMarkerEntry.java
   trunk/core/src/main/java/org/infinispan/container/entries/NullMarkerEntryForRemoval.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/container/entries/TransientCacheEntry.java
   trunk/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheEntry.java
   trunk/core/src/main/java/org/infinispan/context/AbstractContext.java
   trunk/core/src/main/java/org/infinispan/context/EntryLookup.java
   trunk/core/src/main/java/org/infinispan/context/FlagContainer.java
   trunk/core/src/main/java/org/infinispan/context/InvocationContext.java
   trunk/core/src/main/java/org/infinispan/context/InvocationContextImpl.java
   trunk/core/src/main/java/org/infinispan/context/TransactionContext.java
   trunk/core/src/main/java/org/infinispan/context/TransactionContextImpl.java
   trunk/core/src/main/java/org/infinispan/distribution/ConsistentHash.java
   trunk/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java
   trunk/core/src/main/java/org/infinispan/distribution/DistributionManager.java
   trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
   trunk/core/src/main/java/org/infinispan/eviction/EvictionManager.java
   trunk/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java
   trunk/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java
   trunk/core/src/main/java/org/infinispan/executors/DefaultExecutorFactory.java
   trunk/core/src/main/java/org/infinispan/executors/DefaultScheduledExecutorFactory.java
   trunk/core/src/main/java/org/infinispan/executors/ExecutorFactory.java
   trunk/core/src/main/java/org/infinispan/executors/ScheduledExecutorFactory.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/AbstractNamedCacheComponentFactory.java
   trunk/core/src/main/java/org/infinispan/factories/AutoInstantiableFactory.java
   trunk/core/src/main/java/org/infinispan/factories/BootstrapFactory.java
   trunk/core/src/main/java/org/infinispan/factories/ComponentRegistry.java
   trunk/core/src/main/java/org/infinispan/factories/DataContainerFactory.java
   trunk/core/src/main/java/org/infinispan/factories/DefaultCacheFactory.java
   trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.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/InterceptorChainFactory.java
   trunk/core/src/main/java/org/infinispan/factories/KnownComponentNames.java
   trunk/core/src/main/java/org/infinispan/factories/LockManagerFactory.java
   trunk/core/src/main/java/org/infinispan/factories/NamedComponentFactory.java
   trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
   trunk/core/src/main/java/org/infinispan/factories/ReplicationQueueFactory.java
   trunk/core/src/main/java/org/infinispan/factories/RpcManagerFactory.java
   trunk/core/src/main/java/org/infinispan/factories/StateTransferManagerFactory.java
   trunk/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java
   trunk/core/src/main/java/org/infinispan/factories/TransportFactory.java
   trunk/core/src/main/java/org/infinispan/factories/annotations/ComponentName.java
   trunk/core/src/main/java/org/infinispan/factories/annotations/DefaultFactoryFor.java
   trunk/core/src/main/java/org/infinispan/factories/annotations/Inject.java
   trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java
   trunk/core/src/main/java/org/infinispan/factories/annotations/Start.java
   trunk/core/src/main/java/org/infinispan/factories/annotations/Stop.java
   trunk/core/src/main/java/org/infinispan/factories/context/ContextFactory.java
   trunk/core/src/main/java/org/infinispan/factories/scopes/Scope.java
   trunk/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java
   trunk/core/src/main/java/org/infinispan/factories/scopes/Scopes.java
   trunk/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java
   trunk/core/src/main/java/org/infinispan/interceptors/BaseTransactionalContextInterceptor.java
   trunk/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java
   trunk/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java
   trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java
   trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
   trunk/core/src/main/java/org/infinispan/interceptors/CallInterceptor.java
   trunk/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java
   trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.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/MarshalledValueInterceptor.java
   trunk/core/src/main/java/org/infinispan/interceptors/NotificationInterceptor.java
   trunk/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java
   trunk/core/src/main/java/org/infinispan/interceptors/ReplicationInterceptor.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/interceptors/base/JmxStatsCommandInterceptor.java
   trunk/core/src/main/java/org/infinispan/interceptors/base/PrePostProcessingCommandInterceptor.java
   trunk/core/src/main/java/org/infinispan/invocation/Flag.java
   trunk/core/src/main/java/org/infinispan/invocation/InvocationContextContainer.java
   trunk/core/src/main/java/org/infinispan/io/ByteBuffer.java
   trunk/core/src/main/java/org/infinispan/io/ExposedByteArrayOutputStream.java
   trunk/core/src/main/java/org/infinispan/io/UnclosableObjectInputStream.java
   trunk/core/src/main/java/org/infinispan/io/UnclosableObjectOutputStream.java
   trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java
   trunk/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java
   trunk/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java
   trunk/core/src/main/java/org/infinispan/jmx/JmxDomainConflictException.java
   trunk/core/src/main/java/org/infinispan/jmx/JmxStatisticsExposer.java
   trunk/core/src/main/java/org/infinispan/jmx/MBeanServerLookup.java
   trunk/core/src/main/java/org/infinispan/jmx/PlatformMBeanServerLookup.java
   trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
   trunk/core/src/main/java/org/infinispan/jmx/annotations/MBean.java
   trunk/core/src/main/java/org/infinispan/jmx/annotations/ManagedAttribute.java
   trunk/core/src/main/java/org/infinispan/jmx/annotations/ManagedOperation.java
   trunk/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java
   trunk/core/src/main/java/org/infinispan/lifecycle/Lifecycle.java
   trunk/core/src/main/java/org/infinispan/loader/AbstractCacheLoader.java
   trunk/core/src/main/java/org/infinispan/loader/AbstractCacheLoaderConfig.java
   trunk/core/src/main/java/org/infinispan/loader/AbstractCacheStore.java
   trunk/core/src/main/java/org/infinispan/loader/AbstractCacheStoreConfig.java
   trunk/core/src/main/java/org/infinispan/loader/CacheLoader.java
   trunk/core/src/main/java/org/infinispan/loader/CacheLoaderConfig.java
   trunk/core/src/main/java/org/infinispan/loader/CacheLoaderException.java
   trunk/core/src/main/java/org/infinispan/loader/CacheLoaderManager.java
   trunk/core/src/main/java/org/infinispan/loader/CacheLoaderManagerImpl.java
   trunk/core/src/main/java/org/infinispan/loader/CacheStore.java
   trunk/core/src/main/java/org/infinispan/loader/CacheStoreConfig.java
   trunk/core/src/main/java/org/infinispan/loader/LockSupportCacheStore.java
   trunk/core/src/main/java/org/infinispan/loader/LockSupportCacheStoreConfig.java
   trunk/core/src/main/java/org/infinispan/loader/bucket/Bucket.java
   trunk/core/src/main/java/org/infinispan/loader/bucket/BucketBasedCacheStore.java
   trunk/core/src/main/java/org/infinispan/loader/cluster/ClusterCacheLoader.java
   trunk/core/src/main/java/org/infinispan/loader/cluster/ClusterCacheLoaderConfig.java
   trunk/core/src/main/java/org/infinispan/loader/decorators/AbstractDelegatingStore.java
   trunk/core/src/main/java/org/infinispan/loader/decorators/AsyncStore.java
   trunk/core/src/main/java/org/infinispan/loader/decorators/AsyncStoreConfig.java
   trunk/core/src/main/java/org/infinispan/loader/decorators/ChainingCacheStore.java
   trunk/core/src/main/java/org/infinispan/loader/decorators/ReadOnlyStore.java
   trunk/core/src/main/java/org/infinispan/loader/decorators/SingletonStore.java
   trunk/core/src/main/java/org/infinispan/loader/decorators/SingletonStoreConfig.java
   trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStore.java
   trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStoreConfig.java
   trunk/core/src/main/java/org/infinispan/loader/modifications/Clear.java
   trunk/core/src/main/java/org/infinispan/loader/modifications/Modification.java
   trunk/core/src/main/java/org/infinispan/loader/modifications/PurgeExpired.java
   trunk/core/src/main/java/org/infinispan/loader/modifications/Remove.java
   trunk/core/src/main/java/org/infinispan/loader/modifications/Store.java
   trunk/core/src/main/java/org/infinispan/lock/IsolationLevel.java
   trunk/core/src/main/java/org/infinispan/lock/LockManager.java
   trunk/core/src/main/java/org/infinispan/lock/LockManagerImpl.java
   trunk/core/src/main/java/org/infinispan/lock/StripedLock.java
   trunk/core/src/main/java/org/infinispan/lock/TimeoutException.java
   trunk/core/src/main/java/org/infinispan/logging/AbstractLogImpl.java
   trunk/core/src/main/java/org/infinispan/logging/JDKLogImpl.java
   trunk/core/src/main/java/org/infinispan/logging/Log.java
   trunk/core/src/main/java/org/infinispan/logging/Log4JLogImpl.java
   trunk/core/src/main/java/org/infinispan/logging/LogFactory.java
   trunk/core/src/main/java/org/infinispan/manager/CacheManager.java
   trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
   trunk/core/src/main/java/org/infinispan/manager/NamedCacheNotFoundException.java
   trunk/core/src/main/java/org/infinispan/marshall/EntryData.java
   trunk/core/src/main/java/org/infinispan/marshall/EntryDataExceptionMarker.java
   trunk/core/src/main/java/org/infinispan/marshall/EntryDataMarker.java
   trunk/core/src/main/java/org/infinispan/marshall/InfinispanMarshaller.java
   trunk/core/src/main/java/org/infinispan/marshall/MarshalledValue.java
   trunk/core/src/main/java/org/infinispan/marshall/Marshaller.java
   trunk/core/src/main/java/org/infinispan/marshall/UnmarshalledReferences.java
   trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
   trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java
   trunk/core/src/main/java/org/infinispan/notifications/IncorrectListenerException.java
   trunk/core/src/main/java/org/infinispan/notifications/Listenable.java
   trunk/core/src/main/java/org/infinispan/notifications/Listener.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifier.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryActivated.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryCreated.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryEvicted.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryInvalidated.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryLoaded.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryModified.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryPassivated.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryRemoved.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryVisited.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionCompleted.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionRegistered.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryActivatedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryCreatedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvictedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryInvalidatedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryLoadedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryModifiedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryPassivatedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryRemovedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryVisitedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/Event.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/EventImpl.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionCompletedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionRegisteredEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionalEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifier.java
   trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java
   trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStarted.java
   trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStopped.java
   trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/ViewChanged.java
   trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStartedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStoppedEvent.java
   trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/Event.java
   trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/EventImpl.java
   trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/ViewChangedEvent.java
   trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandler.java
   trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java
   trunk/core/src/main/java/org/infinispan/remoting/ReplicationException.java
   trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
   trunk/core/src/main/java/org/infinispan/remoting/ResponseFilter.java
   trunk/core/src/main/java/org/infinispan/remoting/ResponseMode.java
   trunk/core/src/main/java/org/infinispan/remoting/RpcManager.java
   trunk/core/src/main/java/org/infinispan/remoting/RpcManagerImpl.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/Address.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/DistributedSync.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/Transport.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/ExtendedResponse.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/FlushBasedDistributedSync.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsAddress.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsResponseFilterAdapter.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/RequestIgnoredResponse.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/StateTransferMonitor.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/SuspectException.java
   trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferException.java
   trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManager.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/DummyTransactionManagerLookup.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/GlobalTransaction.java
   trunk/core/src/main/java/org/infinispan/transaction/JBossStandaloneJTAManagerLookup.java
   trunk/core/src/main/java/org/infinispan/transaction/JBossTransactionManagerLookup.java
   trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java
   trunk/core/src/main/java/org/infinispan/transaction/TransactionManagerLookup.java
   trunk/core/src/main/java/org/infinispan/transaction/TransactionTable.java
   trunk/core/src/main/java/org/infinispan/util/AbstractMap.java
   trunk/core/src/main/java/org/infinispan/util/BeanUtils.java
   trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java
   trunk/core/src/main/java/org/infinispan/util/BidirectionalMap.java
   trunk/core/src/main/java/org/infinispan/util/FastCopyHashMap.java
   trunk/core/src/main/java/org/infinispan/util/FileLookup.java
   trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java
   trunk/core/src/main/java/org/infinispan/util/ImmutableListCopy.java
   trunk/core/src/main/java/org/infinispan/util/Immutables.java
   trunk/core/src/main/java/org/infinispan/util/ObjectDuplicator.java
   trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java
   trunk/core/src/main/java/org/infinispan/util/ReversibleOrderedSet.java
   trunk/core/src/main/java/org/infinispan/util/SimpleImmutableEntry.java
   trunk/core/src/main/java/org/infinispan/util/TypedProperties.java
   trunk/core/src/main/java/org/infinispan/util/Util.java
   trunk/core/src/main/java/org/infinispan/util/VisitableBidirectionalLinkedHashSet.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/BoundedExecutors.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/ReclosableLatch.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/SynchronizedRestarter.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/WithinThreadExecutor.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/LockContainer.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/concurrent/locks/containers/ReentrantPerEntryLockContainer.java
   trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantStripedLockContainer.java
   trunk/core/src/main/release/licenses/README-bdbje-lib.txt
   trunk/core/src/main/resources/config-samples/all.xml
   trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java
   trunk/core/src/test/java/org/infinispan/api/CacheClusterJoinTest.java
   trunk/core/src/test/java/org/infinispan/api/MixedModeTest.java
   trunk/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java
   trunk/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java
   trunk/core/src/test/java/org/infinispan/api/batch/BatchWithoutTMTest.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/read_committed/ReadCommittedLockTest.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/RepeatableReadLockTest.java
   trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java
   trunk/core/src/test/java/org/infinispan/atomic/APITest.java
   trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java
   trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTest.java
   trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java
   trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/atomic/ClusteredAPITest.java
   trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java
   trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java
   trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
   trunk/core/src/test/java/org/infinispan/container/FIFODataContainerTest.java
   trunk/core/src/test/java/org/infinispan/container/LRUDataContainerTest.java
   trunk/core/src/test/java/org/infinispan/container/SimpleDataContainerTest.java
   trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java
   trunk/core/src/test/java/org/infinispan/eviction/FIFOEvictionFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/eviction/LRUEvictionFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/expiry/ExpiryTest.java
   trunk/core/src/test/java/org/infinispan/expiry/ReplicatedExpiryTest.java
   trunk/core/src/test/java/org/infinispan/factories/scopes/ScopeDetectorTest.java
   trunk/core/src/test/java/org/infinispan/interceptors/MarshalledValueInterceptorTest.java
   trunk/core/src/test/java/org/infinispan/invalidation/AsyncInvalidationTest.java
   trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
   trunk/core/src/test/java/org/infinispan/invalidation/SyncInvalidationTest.java
   trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java
   trunk/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java
   trunk/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java
   trunk/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java
   trunk/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java
   trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
   trunk/core/src/test/java/org/infinispan/jmx/PerThreadMBeanServerLookup.java
   trunk/core/src/test/java/org/infinispan/jmx/ResourceDMBeanTest.java
   trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
   trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java
   trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreConfigTest.java
   trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreTest.java
   trunk/core/src/test/java/org/infinispan/loader/BaseCacheStoreTest.java
   trunk/core/src/test/java/org/infinispan/loader/CacheLoaderFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/loader/ClusterCacheLoaderTest.java
   trunk/core/src/test/java/org/infinispan/loader/ConcurrentLoadAndEvictTest.java
   trunk/core/src/test/java/org/infinispan/loader/PassivationFunctionalTest.java
   trunk/core/src/test/java/org/infinispan/loader/decorators/AsyncTest.java
   trunk/core/src/test/java/org/infinispan/loader/decorators/ChainingCacheLoaderTest.java
   trunk/core/src/test/java/org/infinispan/loader/decorators/ReadOnlyCacheStoreTest.java
   trunk/core/src/test/java/org/infinispan/loader/decorators/SingletonStoreTest.java
   trunk/core/src/test/java/org/infinispan/loader/dummy/DummyInMemoryCacheStore.java
   trunk/core/src/test/java/org/infinispan/loader/dummy/DummyInMemoryCacheStoreTest.java
   trunk/core/src/test/java/org/infinispan/loader/file/FileCacheStoreTest.java
   trunk/core/src/test/java/org/infinispan/lock/LockContainerHashingTest.java
   trunk/core/src/test/java/org/infinispan/lock/StripedLockTest.java
   trunk/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java
   trunk/core/src/test/java/org/infinispan/manager/CacheManagerTest.java
   trunk/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java
   trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java
   trunk/core/src/test/java/org/infinispan/marshall/ObjectStreamMarshaller.java
   trunk/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java
   trunk/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java
   trunk/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java
   trunk/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java
   trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheListener.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/notifications/cachelistener/ListenerRegistrationTest.java
   trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerListener.java
   trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImplTest.java
   trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierTest.java
   trunk/core/src/test/java/org/infinispan/profiling/AbstractProfileTest.java
   trunk/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java
   trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java
   trunk/core/src/test/java/org/infinispan/profiling/ProfileTestSlave.java
   trunk/core/src/test/java/org/infinispan/profiling/testinternals/Generator.java
   trunk/core/src/test/java/org/infinispan/profiling/testinternals/TaskRunner.java
   trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java
   trunk/core/src/test/java/org/infinispan/replication/AsyncReplicatedAPITest.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/ReplicationQueueTest.java
   trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
   trunk/core/src/test/java/org/infinispan/replication/SyncReplTest.java
   trunk/core/src/test/java/org/infinispan/replication/SyncReplicatedAPITest.java
   trunk/core/src/test/java/org/infinispan/statetransfer/Address.java
   trunk/core/src/test/java/org/infinispan/statetransfer/Person.java
   trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.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/MultipleCacheManagersTest.java
   trunk/core/src/test/java/org/infinispan/test/ReplListener.java
   trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
   trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
   trunk/core/src/test/java/org/infinispan/test/ViewChangeListener.java
   trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java
   trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
   trunk/core/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java
   trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java
   trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java
   trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java
   trunk/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java
   trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java
   trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCaches.java
   trunk/core/src/test/java/org/infinispan/util/BidirectionalLinkedHashMapTest.java
   trunk/core/src/test/java/org/infinispan/util/VisitableBidirectionalLinkedHashSetTest.java
   trunk/core/src/test/resources/configs/named-cache-test.xml
   trunk/core/src/test/resources/configs/string-property-replaced.xml
   trunk/core/src/test/resources/log4j.xml
   trunk/parent/pom.xml
   trunk/pom.xml
   trunk/tree/pom.xml
   trunk/tree/src/main/java/org/infinispan/tree/Fqn.java
   trunk/tree/src/main/java/org/infinispan/tree/FqnComparator.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/NodeKey.java
   trunk/tree/src/main/java/org/infinispan/tree/NodeNotExistsException.java
   trunk/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java
   trunk/tree/src/main/java/org/infinispan/tree/TreeCache.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/NodeAPITest.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/NodeReplicatedMoveTest.java
   trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTest.java
   trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java
   trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java
   trunk/tree/src/test/java/org/infinispan/api/tree/TreeStructureHashCodeTest.java
   trunk/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java
   trunk/tree/src/test/java/org/infinispan/profiling/testinternals/FqnGenerator.java
   trunk/tree/src/test/java/org/infinispan/test/TreeTestingUtil.java
   trunk/tree/src/test/java/org/infinispan/test/fwk/TreeTestNameVerifier.java
Log:
Renamed Infinispan to Infinispan

Modified: trunk/cachestore/bdbje/pom.xml
===================================================================
--- trunk/cachestore/bdbje/pom.xml	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/cachestore/bdbje/pom.xml	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,33 +1,29 @@
 <?xml version="1.0"?>
-
-<!-- This is the current pom for the cachestore/bdbje directory (or project) for Infinispan-->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-
    <parent>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-parent</artifactId>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-parent</artifactId>
       <version>4.0.0-SNAPSHOT</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
-   <groupId>org.infinispan</groupId>
-   <artifactId>infinispan-cachestore-bdbje</artifactId>
-   <name>Infinispan - Cachestore bdbje</name>
-   <description>Infinispan - Open Source Data Grids. This is the cachestore/bdbje package.</description>
+   <groupId>org.infinispan</groupId>
+   <artifactId>infinispan-cachestore-bdbje</artifactId>
+   <name>INFINISPAN - Cachestore bdbje</name>
+   <description>INFINISPAN - Open Source Data Grids. This is the cachestore/bdbje package.</description>
    <dependencies>
       <dependency>
          <groupId>${project-package}</groupId>
-         <artifactId>infinispan-core</artifactId>
+         <artifactId>infinispan-core</artifactId>
          <version>${project-version}</version>
       </dependency>
 
       <dependency>
          <groupId>${project-package}</groupId>
-         <artifactId>infinispan-core</artifactId>
+         <artifactId>infinispan-core</artifactId>
          <version>${project-version}</version>
          <type>test-jar</type>
          <scope>test</scope>

Copied: trunk/cachestore/bdbje/src/main/java/org/infinispan (from rev 88, trunk/cachestore/bdbje/src/main/java/org/infinispan)

Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeCacheStore.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeCacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeCacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
 import com.sleepycat.bind.serial.StoredClassCatalog;
 import com.sleepycat.collections.CurrentTransaction;
@@ -13,16 +13,16 @@
 import com.sleepycat.je.OperationStatus;
 import com.sleepycat.je.Transaction;
 import com.sleepycat.util.ExceptionUnwrapper;
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.AbstractCacheStore;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.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.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.AbstractCacheStore;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.marshall.Marshaller;
+import org.infinispan.util.ReflectionUtil;
 
 import java.io.File;
 import java.io.ObjectInput;
@@ -35,18 +35,18 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * An Oracle SleepyCat JE implementation of a {@link org.infinispan.loader.CacheStore}.  <p/>This implementation uses two
- * databases <ol> <li>stored entry database: <tt>/{location}/CacheInstance-{@link org.infinispan.Cache#getName()
- * name}</tt></li> {@link org.infinispan.container.entries.InternalCacheEntry stored entries} are stored here, keyed on {@link
- * org.infinispan.container.entries.InternalCacheEntry#getKey()} <li>class catalog database: <tt>/{location}/CacheInstance-{@link
- * org.infinispan.Cache#getName() name}_class_catalog</tt></li> class descriptions are stored here for efficiency reasons.
+ * An Oracle SleepyCat JE implementation of a {@link org.infinispan.loader.CacheStore}.  <p/>This implementation uses two
+ * databases <ol> <li>stored entry database: <tt>/{location}/CacheInstance-{@link org.infinispan.Cache#getName()
+ * name}</tt></li> {@link org.infinispan.container.entries.InternalCacheEntry stored entries} are stored here, keyed on {@link
+ * org.infinispan.container.entries.InternalCacheEntry#getKey()} <li>class catalog database: <tt>/{location}/CacheInstance-{@link
+ * org.infinispan.Cache#getName() name}_class_catalog</tt></li> class descriptions are stored here for efficiency reasons.
  * </ol> <p/> <p><tt>/{location}/je.properties</tt> is optional and will override any parameters to the internal
  * SleepyCat JE {@link EnvironmentConfig}.</p>
  * <p/>
  * All data access is transactional.  Any attempted reads to locked records will block.  The maximum duration of this is
- * set in nanoseconds via the parameter {@link org.infinispan.loader.bdbje.BdbjeCacheStoreConfig#getLockAcquistionTimeout()}.
+ * set in nanoseconds via the parameter {@link org.infinispan.loader.bdbje.BdbjeCacheStoreConfig#getLockAcquistionTimeout()}.
  * Calls to {@link BdbjeCacheStore#prepare(java.util.List, javax.transaction.Transaction, boolean) prepare} will attempt
- * to resolve deadlocks, retrying up to {@link org.infinispan.loader.bdbje.BdbjeCacheStoreConfig#getMaxTxRetries()}
+ * to resolve deadlocks, retrying up to {@link org.infinispan.loader.bdbje.BdbjeCacheStoreConfig#getMaxTxRetries()}
  * attempts.
  * <p/>
  * Unlike the C version of SleepyCat, JE does not support MVCC or READ_COMMITTED isolation.  In other words, readers
@@ -107,7 +107,7 @@
 
    /**
     * {@inheritDoc} Validates configuration, configures and opens the {@link Environment}, then {@link
-    * org.infinispan.loader.bdbje.BdbjeCacheStore#openSleepyCatResources() opens the databases}.  When this is finished,
+    * org.infinispan.loader.bdbje.BdbjeCacheStore#openSleepyCatResources() opens the databases}.  When this is finished,
     * transactional and purging services are instantiated.
     */
    public void start() throws CacheLoaderException {
@@ -187,7 +187,7 @@
    }
 
    /**
-    * Exceptions are ignored so that {@link org.infinispan.loader.bdbje.BdbjeCacheStore#closeEnvironment()}  will execute.
+    * Exceptions are ignored so that {@link org.infinispan.loader.bdbje.BdbjeCacheStore#closeEnvironment()}  will execute.
     */
    private void closeDatabases() {
       if (trace) log.trace("closing databases");
@@ -248,7 +248,7 @@
 
    /**
     * Looks up the {@link Transaction SleepyCat transaction} associated with <code>tx</code>.  Creates a {@link
-    * org.infinispan.loader.bdbje.ModificationsTransactionWorker} instance from <code>mods</code>.  Then prepares the
+    * org.infinispan.loader.bdbje.ModificationsTransactionWorker} instance from <code>mods</code>.  Then prepares the
     * transaction via {@link PreparableTransactionRunner#prepare(com.sleepycat.collections.TransactionWorker)}. Finally,
     * it invalidates {@link com.sleepycat.collections.CurrentTransaction#getTransaction()} so that no other thread can
     * accidentally commit this.

Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeCacheStoreConfig.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeCacheStoreConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeCacheStoreConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
-import org.infinispan.loader.AbstractCacheStoreConfig;
+import org.infinispan.loader.AbstractCacheStoreConfig;
 
 /**
- * Configures {@link org.infinispan.loader.bdbje.BdbjeCacheStore}.  This allows you to tune a number of characteristics of
+ * Configures {@link org.infinispan.loader.bdbje.BdbjeCacheStore}.  This allows you to tune a number of characteristics of
  * the {@link BdbjeCacheStore}.
  * <p/>
  * <ul> <li><tt>location</tt> - a location on disk where the store can write internal files.  This defaults to
@@ -13,8 +13,8 @@
  * throwing an exception.  By default, this is set to <tt>5</tt>.</li>
  * <p/>
  * <li><tt>cacheDbName</tt> - the name of the SleepyCat database persisting this store.  This defaults to <tt>{@link
- * org.infinispan.Cache#getName()} cache#name}</tt>.</li> <li><tt>catalogDbName</tt> - the name of the SleepyCat database
- * persisting the class information for objects in this store.  This defaults to <tt>{@link org.infinispan.Cache#getName()}
+ * org.infinispan.Cache#getName()} cache#name}</tt>.</li> <li><tt>catalogDbName</tt> - the name of the SleepyCat database
+ * persisting the class information for objects in this store.  This defaults to <tt>{@link org.infinispan.Cache#getName()}
  * cache#name}_class_catalog</tt>.</li>
  * <p/>
  * </ul>

Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeResourceFactory.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeResourceFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/BdbjeResourceFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
 import com.sleepycat.bind.EntryBinding;
 import com.sleepycat.bind.serial.SerialBinding;
@@ -11,9 +11,9 @@
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.EnvironmentConfig;
 import com.sleepycat.util.ExceptionUnwrapper;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.container.entries.InternalCacheEntry;
 
 import java.io.File;
 
@@ -48,7 +48,7 @@
    /**
     * Open the environment, creating it if it doesn't exist.
     * @param envLocation base directory where the Environment will write files
-    * @return open Environment with a lock timeout of {@link org.infinispan.loader.bdbje.BdbjeCacheStoreConfig#getLockAcquistionTimeout()} milliseconds.
+    * @return open Environment with a lock timeout of {@link org.infinispan.loader.bdbje.BdbjeCacheStoreConfig#getLockAcquistionTimeout()} milliseconds.
     */
    public Environment createEnvironment(File envLocation) throws DatabaseException {
       EnvironmentConfig envConfig = new EnvironmentConfig();

Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/ModificationsTransactionWorker.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/ModificationsTransactionWorker.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/ModificationsTransactionWorker.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
 import com.sleepycat.collections.TransactionWorker;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.loader.modifications.Remove;
-import org.infinispan.loader.modifications.Store;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.loader.modifications.Remove;
+import org.infinispan.loader.modifications.Store;
 
 import java.util.List;
 

Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/PreparableTransactionRunner.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/PreparableTransactionRunner.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loader/bdbje/PreparableTransactionRunner.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
 import com.sleepycat.collections.CurrentTransaction;
 import com.sleepycat.collections.TransactionRunner;

Copied: trunk/cachestore/bdbje/src/test/java/org/infinispan (from rev 88, trunk/cachestore/bdbje/src/test/java/org/infinispan)

Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreConfigTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreConfigTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreConfigTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
-import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheLoaderException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreIntegrationTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreIntegrationTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreIntegrationTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,15 +1,15 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
 import org.easymock.EasyMock;
-import org.infinispan.loader.BaseCacheStoreTest;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.modifications.Clear;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.loader.modifications.Remove;
-import org.infinispan.loader.modifications.Store;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.loader.BaseCacheStoreTest;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.modifications.Clear;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.loader.modifications.Remove;
+import org.infinispan.loader.modifications.Store;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.container.entries.InternalEntryFactory;
 import org.testng.annotations.Test;
 
 import javax.transaction.Transaction;

Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeCacheStoreTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
 import com.sleepycat.bind.serial.StoredClassCatalog;
 import com.sleepycat.collections.CurrentTransaction;
@@ -10,12 +10,12 @@
 import com.sleepycat.je.Environment;
 import com.sleepycat.util.RuntimeExceptionWrapper;
 import static org.easymock.classextension.EasyMock.*;
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.modifications.Store;
-import org.infinispan.util.ReflectionUtil;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.modifications.Store;
+import org.infinispan.util.ReflectionUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeLearningTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeLearningTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeLearningTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
 import com.sleepycat.bind.EntryBinding;
 import com.sleepycat.bind.serial.SerialBinding;
@@ -16,16 +16,16 @@
 import com.sleepycat.je.EnvironmentConfig;
 import com.sleepycat.je.OperationStatus;
 import org.easymock.EasyMock;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.modifications.Clear;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.loader.modifications.Remove;
-import org.infinispan.loader.modifications.Store;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.modifications.Clear;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.loader.modifications.Remove;
+import org.infinispan.loader.modifications.Store;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeResourceFactoryTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeResourceFactoryTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/BdbjeResourceFactoryTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
 import com.sleepycat.bind.serial.StoredClassCatalog;
 import com.sleepycat.je.Database;
 import com.sleepycat.je.DatabaseException;
 import com.sleepycat.je.Environment;
 import static org.easymock.classextension.EasyMock.createMock;
-import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheLoaderException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/ModificationsTransactionWorkerTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/ModificationsTransactionWorkerTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/ModificationsTransactionWorkerTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
 import static org.easymock.classextension.EasyMock.*;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.modifications.Clear;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.loader.modifications.PurgeExpired;
-import org.infinispan.loader.modifications.Remove;
-import org.infinispan.loader.modifications.Store;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.modifications.Clear;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.loader.modifications.PurgeExpired;
+import org.infinispan.loader.modifications.Remove;
+import org.infinispan.loader.modifications.Store;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.container.entries.InternalCacheEntry;
 import org.testng.annotations.Test;
 
 import java.util.Collections;

Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/PreparableTransactionRunnerTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/PreparableTransactionRunnerTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/bdbje/PreparableTransactionRunnerTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.bdbje;
+package org.infinispan.loader.bdbje;
 
 import com.sleepycat.collections.CurrentTransaction;
 import com.sleepycat.collections.TransactionWorker;
@@ -10,7 +10,7 @@
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.classextension.EasyMock.*;
-import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheLoaderException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/test/fwk/BdbjeTestNameVerifier.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/test/fwk/BdbjeTestNameVerifier.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/test/fwk/BdbjeTestNameVerifier.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.test.fwk;
+package org.infinispan.test.fwk;
 
 import org.testng.annotations.Test;
 

Modified: trunk/cachestore/jdbc/pom.xml
===================================================================
--- trunk/cachestore/jdbc/pom.xml	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/cachestore/jdbc/pom.xml	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,33 +1,29 @@
 <?xml version="1.0"?>
-
-<!-- This is the current pom for the cachestore/jdbc directory (or project) for Infinispan-->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-
    <parent>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-parent</artifactId>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-parent</artifactId>
       <version>4.0.0-SNAPSHOT</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
-   <groupId>org.infinispan</groupId>
-   <artifactId>infinispan-cachestore-jdbc</artifactId>
-   <name>Infinispan - Cachestore jdbc</name>
-   <description>Infinispan - Open Source Data Grids. This is the cachestore/jdbc package.</description>
+   <groupId>org.infinispan</groupId>
+   <artifactId>infinispan-cachestore-jdbc</artifactId>
+   <name>Infinispan - Cachestore jdbc</name>
+   <description>INFINISPAN - Open Source Data Grids. This is the cachestore/jdbc package.</description>
    <dependencies>
       <dependency>
          <groupId>${project-package}</groupId>
-         <artifactId>infinispan-core</artifactId>
+         <artifactId>infinispan-core</artifactId>
          <version>${project-version}</version>
       </dependency>
 
       <dependency>
          <groupId>${project-package}</groupId>
-         <artifactId>infinispan-core</artifactId>
+         <artifactId>infinispan-core</artifactId>
          <version>${project-version}</version>
          <type>test-jar</type>
          <scope>test</scope>

Copied: trunk/cachestore/jdbc/src/main/java/org/infinispan (from rev 88, trunk/cachestore/jdbc/src/main/java/org/infinispan)

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/JdbcUtil.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/JdbcUtil.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/JdbcUtil.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.loader.jdbc;
+package org.infinispan.loader.jdbc;
 
-import org.infinispan.io.ByteBuffer;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.marshall.Marshaller;
+import org.infinispan.io.ByteBuffer;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.marshall.Marshaller;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/TableManipulation.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/TableManipulation.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/TableManipulation.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.loader.jdbc;
+package org.infinispan.loader.jdbc;
 
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -339,7 +339,7 @@
    }
 
    /**
-    * For DB queries (e.g. {@link org.infinispan.loader.CacheStore#toStream(java.io.ObjectOutput)} ) the fetch size will be
+    * For DB queries (e.g. {@link org.infinispan.loader.CacheStore#toStream(java.io.ObjectOutput)} ) the fetch size will be
     * set on {@link java.sql.ResultSet#setFetchSize(int)}. This is optional parameter, if not specified will be
     * defaulted to {@link #DEFAULT_FETCH_SIZE}.
     */
@@ -355,7 +355,7 @@
    }
 
    /**
-    * When doing repetitive DB inserts (e.g. on {@link org.infinispan.loader.CacheStore#fromStream(java.io.ObjectInput)}
+    * When doing repetitive DB inserts (e.g. on {@link org.infinispan.loader.CacheStore#fromStream(java.io.ObjectInput)}
     * this will be batched according to this parameter. This is an optional parameter, and if it is not specified it
     * will be defaulted to {@link #DEFAULT_BATCH_SIZE}.
     */

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/binary/JdbcBinaryCacheStore.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/binary/JdbcBinaryCacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/binary/JdbcBinaryCacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,18 +1,18 @@
-package org.infinispan.loader.jdbc.binary;
+package org.infinispan.loader.jdbc.binary;
 
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.io.ByteBuffer;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.bucket.Bucket;
-import org.infinispan.loader.bucket.BucketBasedCacheStore;
-import org.infinispan.loader.jdbc.JdbcUtil;
-import org.infinispan.loader.jdbc.TableManipulation;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.marshall.Marshaller;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.io.ByteBuffer;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.bucket.Bucket;
+import org.infinispan.loader.bucket.BucketBasedCacheStore;
+import org.infinispan.loader.jdbc.JdbcUtil;
+import org.infinispan.loader.jdbc.TableManipulation;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.marshall.Marshaller;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,17 +29,17 @@
 
 /**
  * {@link BucketBasedCacheStore} implementation that will store all the buckets as rows in database, each row
- * coresponding to a bucket. This is in contrast to {@link org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore}
+ * coresponding to a bucket. This is in contrast to {@link org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore}
  * which stores each StoredEntry as an row in the database.
  * <p/>
  * This class has the benefit of being able to store StoredEntries that do not have String keys, at the cost of coarser
  * grained access granularity, and inherently performance.
  * <p/>
- * All the DB releated configurations are described in {@link org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStoreConfig}.
+ * All the DB releated configurations are described in {@link org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStoreConfig}.
  *
  * @author Mircea.Markus at jboss.com
  * @see JdbcBinaryCacheStoreConfig
- * @see org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore
+ * @see org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore
  */
 public class JdbcBinaryCacheStore extends BucketBasedCacheStore {
 
@@ -413,9 +413,9 @@
 
    /**
     * Keeps a reference to the connection factory for further use. Also initializes the {@link
-    * org.infinispan.loader.jdbc.TableManipulation} that needs connections. This method should be called when you don't
+    * org.infinispan.loader.jdbc.TableManipulation} that needs connections. This method should be called when you don't
     * want the store to manage the connection factory, perhaps because it is using an shared connection factory: see
-    * {@link org.infinispan.loader.jdbc.mixed.JdbcMixedCacheStore} for such an example of this.
+    * {@link org.infinispan.loader.jdbc.mixed.JdbcMixedCacheStore} for such an example of this.
     */
    public void doConnectionFactoryInitialization(ConnectionFactory connectionFactory) throws CacheLoaderException {
       this.connectionFactory = connectionFactory;

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/binary/JdbcBinaryCacheStoreConfig.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/binary/JdbcBinaryCacheStoreConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/binary/JdbcBinaryCacheStoreConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.loader.jdbc.binary;
+package org.infinispan.loader.jdbc.binary;
 
-import org.infinispan.loader.LockSupportCacheStoreConfig;
-import org.infinispan.loader.jdbc.TableManipulation;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.loader.LockSupportCacheStoreConfig;
+import org.infinispan.loader.jdbc.TableManipulation;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
 
 /**
- * Defines available configuration elements for {@link org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore}.
+ * Defines available configuration elements for {@link org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore}.
  *
  * @author Mircea.Markus at jboss.com
  */
@@ -109,7 +109,7 @@
    }
 
    /**
-    * Driver class, will be loaded before initializing the {@link org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory}
+    * Driver class, will be loaded before initializing the {@link org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory}
     */
    public void setDriverClass(String driverClass) {
       testImmutability("connectionFactoryConfig");
@@ -118,7 +118,7 @@
 
    /**
     * Name of the connection factory class.
-    * @see org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory
+    * @see org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory
     */
    public void setConnectionFactoryClass(String connectionFactoryClass) {
       testImmutability("connectionFactoryConfig");
@@ -148,7 +148,7 @@
    }
 
    /**
-    * @see org.infinispan.loader.jdbc.TableManipulation#getFetchSize()
+    * @see org.infinispan.loader.jdbc.TableManipulation#getFetchSize()
     */
    public void setFetchSize(int fetchSize) {
       testImmutability("tableManipulation");
@@ -156,7 +156,7 @@
    }
 
    /**
-    * @see org.infinispan.loader.jdbc.TableManipulation#getBatchSize()
+    * @see org.infinispan.loader.jdbc.TableManipulation#getBatchSize()
     */
    public void setBatchSize(int batchSize) {
       testImmutability("tableManipulation");
@@ -164,14 +164,14 @@
    }
 
    /**
-    * @see org.infinispan.loader.jdbc.TableManipulation#getFetchSize()
+    * @see org.infinispan.loader.jdbc.TableManipulation#getFetchSize()
     */
    public int getFetchSize() {
       return this.tableManipulation.getFetchSize();
    }
 
    /**
-    * @see org.infinispan.loader.jdbc.TableManipulation#getBatchSize()
+    * @see org.infinispan.loader.jdbc.TableManipulation#getBatchSize()
     */
    public int getBatchSize() {
       return this.tableManipulation.getBatchSize();

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/ConnectionFactory.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/ConnectionFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/ConnectionFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.loader.jdbc.connectionfactory;
+package org.infinispan.loader.jdbc.connectionfactory;
 
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.util.Util;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.util.Util;
 
 import java.sql.Connection;
 
@@ -13,7 +13,7 @@
 public abstract class ConnectionFactory {
 
    /**
-    * Constructs a {@link org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory} based on the supplied class name.
+    * Constructs a {@link org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory} based on the supplied class name.
     */
    public static ConnectionFactory getConnectionFactory(String connectionFactoryClass) throws CacheLoaderException {
       try {

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/ConnectionFactoryConfig.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/ConnectionFactoryConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/ConnectionFactoryConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.loader.jdbc.connectionfactory;
+package org.infinispan.loader.jdbc.connectionfactory;
 
 /**
- * Contains configuration elements for a {@link org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory}.
+ * Contains configuration elements for a {@link org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory}.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/PooledConnectionFactory.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/PooledConnectionFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/PooledConnectionFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.loader.jdbc.connectionfactory;
+package org.infinispan.loader.jdbc.connectionfactory;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 import com.mchange.v2.c3p0.DataSources;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.jdbc.JdbcUtil;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.jdbc.JdbcUtil;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import java.beans.PropertyVetoException;
 import java.net.URL;

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/SimpleConnectionFactory.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/SimpleConnectionFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/connectionfactory/SimpleConnectionFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.loader.jdbc.connectionfactory;
+package org.infinispan.loader.jdbc.connectionfactory;
 
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -10,7 +10,7 @@
 
 /**
  * Connection factory implementation that will create database connection on a per invocation basis. Not recommanded in
- * production, {@link org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory} should rather be used.
+ * production, {@link org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory} should rather be used.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStore.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,16 +1,16 @@
-package org.infinispan.loader.jdbc.mixed;
+package org.infinispan.loader.jdbc.mixed;
 
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.AbstractCacheStore;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore;
-import org.infinispan.marshall.Marshaller;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.AbstractCacheStore;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore;
+import org.infinispan.marshall.Marshaller;
 
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
@@ -20,10 +20,10 @@
  * Cache store that combines functionality of {@link JdbcBinaryCacheStore} and {@link JdbcStringBasedCacheStore}. It
  * aggregates an instance of JdbcBinaryCacheStore and JdbcStringBasedCacheStore, delegating work to one of them
  * (sometimes both, see below) based on the passed in key. In order to determine which store to use it will rely on the
- * configured {@link org.infinispan.loader.jdbc.stringbased.Key2StringMapper} )(see configuration).
+ * configured {@link org.infinispan.loader.jdbc.stringbased.Key2StringMapper} )(see configuration).
  * <p/>
- * The advantage it brings is the possibility of effeciently storing string(able) keyd {@link org.infinispan.container.entries.InternalCacheEntry}s, and at the same time being able to store any other keys, a la {@link
- * org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore}.
+ * The advantage it brings is the possibility of effeciently storing string(able) keyd {@link org.infinispan.container.entries.InternalCacheEntry}s, and at the same time being able to store any other keys, a la {@link
+ * org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore}.
  * <p/>
  * There will only be a performance cost for the aggregate operations: loadAll, fromStream, toStream and clear. For
  * these operations there will be two distinct database call, one for each JdbcStore implementation. Most of application
@@ -31,14 +31,14 @@
  * 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
+ * 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.
  *
  * @author Mircea.Markus at jboss.com
- * @see org.infinispan.loader.jdbc.mixed.JdbcMixedCacheStoreConfig
- * @see org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore
- * @see org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore
+ * @see org.infinispan.loader.jdbc.mixed.JdbcMixedCacheStoreConfig
+ * @see org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore
+ * @see org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore
  */
 public class JdbcMixedCacheStore extends AbstractCacheStore {
 

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreConfig.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.loader.jdbc.mixed;
+package org.infinispan.loader.jdbc.mixed;
 
-import org.infinispan.loader.AbstractCacheStoreConfig;
-import org.infinispan.loader.LockSupportCacheStoreConfig;
-import org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStoreConfig;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStoreConfig;
-import org.infinispan.loader.jdbc.TableManipulation;
+import org.infinispan.loader.AbstractCacheStoreConfig;
+import org.infinispan.loader.LockSupportCacheStoreConfig;
+import org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStoreConfig;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStoreConfig;
+import org.infinispan.loader.jdbc.TableManipulation;
 
 /**
- * Configureation for {@link org.infinispan.loader.jdbc.mixed.JdbcMixedCacheStore}.
+ * Configureation for {@link org.infinispan.loader.jdbc.mixed.JdbcMixedCacheStore}.
  *
  * @author Mircea.Markus at jboss.com
  */
@@ -208,7 +208,7 @@
    }
 
    /**
-    * @see org.infinispan.loader.jdbc.TableManipulation#getFetchSize()
+    * @see org.infinispan.loader.jdbc.TableManipulation#getFetchSize()
     */
    public void setFetchSize(int fetchSize) {
       testImmutability("tableManipulation");
@@ -217,7 +217,7 @@
    }
 
    /**
-    * @see org.infinispan.loader.jdbc.TableManipulation#getBatchSize()
+    * @see org.infinispan.loader.jdbc.TableManipulation#getBatchSize()
     */
    public void setBatchSize(int batchSize) {
       testImmutability("tableManipulation");

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/DefaultKey2StringMapper.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/DefaultKey2StringMapper.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/DefaultKey2StringMapper.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.loader.jdbc.stringbased;
+package org.infinispan.loader.jdbc.stringbased;
 
 /**
- * Default implementation for {@link org.infinispan.loader.jdbc.stringbased.Key2StringMapper}. It supports all the
+ * Default implementation for {@link org.infinispan.loader.jdbc.stringbased.Key2StringMapper}. It supports all the
  * primitive wrappers(e.g. Integer, Long etc).
  *
  * @author Mircea.Markus at jboss.com

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStore.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,17 +1,17 @@
-package org.infinispan.loader.jdbc.stringbased;
+package org.infinispan.loader.jdbc.stringbased;
 
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.io.ByteBuffer;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.LockSupportCacheStore;
-import org.infinispan.loader.jdbc.JdbcUtil;
-import org.infinispan.loader.jdbc.TableManipulation;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.marshall.Marshaller;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.io.ByteBuffer;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.LockSupportCacheStore;
+import org.infinispan.loader.jdbc.JdbcUtil;
+import org.infinispan.loader.jdbc.TableManipulation;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.marshall.Marshaller;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,8 +25,8 @@
 import java.util.Set;
 
 /**
- * {@link org.infinispan.loader.CacheStore} implementation that stores the entries in a database. In contrast to the {@link
- * org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore}, this cache store will store each entry within a row in the
+ * {@link org.infinispan.loader.CacheStore} implementation that stores the entries in a database. In contrast to the {@link
+ * org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore}, this cache store will store each entry within a row in the
  * table (rather than grouping multiple entries into an row). This assures a finer graned granularity for all operation,
  * and better performance. In order to be able to store non-string keys, it relies on an {@link Key2StringMapper}.
  * <p/>
@@ -316,9 +316,9 @@
 
    /**
     * Keeps a reference to the connection factory for further use. Also initializes the {@link
-    * org.infinispan.loader.jdbc.TableManipulation} that needs connections. This method should be called when you don't
+    * org.infinispan.loader.jdbc.TableManipulation} that needs connections. This method should be called when you don't
     * want the store to manage the connection factory, perhaps because it is using an shared connection factory: see
-    * {@link org.infinispan.loader.jdbc.mixed.JdbcMixedCacheStore} for such an example of this.
+    * {@link org.infinispan.loader.jdbc.mixed.JdbcMixedCacheStore} for such an example of this.
     */
    public void doConnectionFactoryInitialization(ConnectionFactory connectionFactory) throws CacheLoaderException {
       this.connectionFactory = connectionFactory;

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,15 +1,15 @@
-package org.infinispan.loader.jdbc.stringbased;
+package org.infinispan.loader.jdbc.stringbased;
 
-import org.infinispan.loader.LockSupportCacheStoreConfig;
-import org.infinispan.loader.jdbc.TableManipulation;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.util.Util;
+import org.infinispan.loader.LockSupportCacheStoreConfig;
+import org.infinispan.loader.jdbc.TableManipulation;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.util.Util;
 
 /**
- * Configuration for {@link org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore} cache store.
+ * Configuration for {@link org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore} cache store.
  *
  * @author Mircea.Markus at jboss.com
- * @see org.infinispan.loader.jdbc.stringbased.Key2StringMapper
+ * @see org.infinispan.loader.jdbc.stringbased.Key2StringMapper
  */
 public class JdbcStringBasedCacheStoreConfig extends LockSupportCacheStoreConfig {
 
@@ -46,9 +46,9 @@
    }
 
    /**
-    * Name of the class implementing Key2StringMapper. The default value is {@link org.infinispan.loader.jdbc.stringbased.DefaultKey2StringMapper}
+    * Name of the class implementing Key2StringMapper. The default value is {@link org.infinispan.loader.jdbc.stringbased.DefaultKey2StringMapper}
     *
-    * @see org.infinispan.loader.jdbc.stringbased.Key2StringMapper
+    * @see org.infinispan.loader.jdbc.stringbased.Key2StringMapper
     */
    public void setKey2StringMapperClass(String className) {
       testImmutability("key2StringMapper");
@@ -169,8 +169,8 @@
 
    /**
     * If this method returns false, then the connection factory should not be created by the {@link
-    * org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore}, but will be injected through {@link
-    * org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore#doConnectionFactoryInitialization(org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory)}
+    * org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore}, but will be injected through {@link
+    * org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore#doConnectionFactoryInitialization(org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory)}
     */
    boolean isManageConnectionFactory() {
       return manageConnectionFactory;
@@ -182,7 +182,7 @@
    }
 
    /**
-    * @see org.infinispan.loader.jdbc.TableManipulation#getFetchSize()
+    * @see org.infinispan.loader.jdbc.TableManipulation#getFetchSize()
     */
    public void setFetchSize(int fetchSize) {
       testImmutability("tableManipulation");
@@ -190,7 +190,7 @@
    }
 
    /**
-    * @see org.infinispan.loader.jdbc.TableManipulation#getBatchSize()
+    * @see org.infinispan.loader.jdbc.TableManipulation#getBatchSize()
     */
    public void setBatchSize(int batchSize) {
       testImmutability("tableManipulation");
@@ -198,14 +198,14 @@
    }
 
    /**
-    * @see org.infinispan.loader.jdbc.TableManipulation#getFetchSize()
+    * @see org.infinispan.loader.jdbc.TableManipulation#getFetchSize()
     */
    public int getFetchSize() {
       return this.tableManipulation.getFetchSize();
    }
 
    /**
-    * @see org.infinispan.loader.jdbc.TableManipulation#getBatchSize()
+    * @see org.infinispan.loader.jdbc.TableManipulation#getBatchSize()
     */
    public int getBatchSize() {
       return this.tableManipulation.getBatchSize();

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/Key2StringMapper.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/Key2StringMapper.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/Key2StringMapper.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.loader.jdbc.stringbased;
+package org.infinispan.loader.jdbc.stringbased;
 
 /**
  * Defines the logic of mapping an key object to a String. This is required {@link
- * org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore}, in order to map each {@link
- * org.infinispan.loader.StoredEntry} as an single row within a database. It bassically should generate an unique String PK
+ * org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore}, in order to map each {@link
+ * org.infinispan.loader.StoredEntry} as an single row within a database. It bassically should generate an unique String PK
  * based on the supplied key.
  *
  * @author Mircea.Markus at jboss.com

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/UnsupportedKeyTypeException.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/UnsupportedKeyTypeException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loader/jdbc/stringbased/UnsupportedKeyTypeException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.loader.jdbc.stringbased;
+package org.infinispan.loader.jdbc.stringbased;
 
-import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheLoaderException;
 
 /**
- * Exception thrown by {@link org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore} when one tries to persist
+ * Exception thrown by {@link org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore} when one tries to persist
  * a StoredEntry with an unsupported key type.
  *
- * @see org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore
+ * @see org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore
  * @author Mircea.Markus at jboss.com
  */
 public class UnsupportedKeyTypeException extends CacheLoaderException {

Copied: trunk/cachestore/jdbc/src/test/java/org/infinispan (from rev 88, trunk/cachestore/jdbc/src/test/java/org/infinispan)

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.config.parsing;
+package org.infinispan.config.parsing;
 
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.loader.CacheStoreConfig;
-import org.infinispan.loader.decorators.SingletonStoreConfig;
-import org.infinispan.loader.jdbc.TableManipulation;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory;
-import org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore;
-import org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStoreConfig;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.loader.CacheStoreConfig;
+import org.infinispan.loader.decorators.SingletonStoreConfig;
+import org.infinispan.loader.jdbc.TableManipulation;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory;
+import org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore;
+import org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStoreConfig;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
@@ -18,10 +18,10 @@
       XmlConfigurationParserImpl parser = new XmlConfigurationParserImpl();
       String xml =
             "      <loaders passivation=\"true\" shared=\"true\" preload=\"true\">\n" +
-                  "         <loader class=\"org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore\" fetchPersistentState=\"true\"\n" +
+                  "         <loader class=\"org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore\" fetchPersistentState=\"true\"\n" +
                   "                 ignoreModifications=\"true\" purgeOnStartup=\"true\">\n" +
                   "            <properties>\n" +
-                  "               <property name=\"connectionFactoryClass\" value=\"org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory\"/>\n" +
+                  "               <property name=\"connectionFactoryClass\" value=\"org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory\"/>\n" +
                   "               <property name=\"connectionUrl\" value=\"jdbc://some-url\"/>\n" +
                   "               <property name=\"userName\" value=\"root\"/>\n" +
                   "               <property name=\"driverClass\" value=\"org.dbms.Driver\"/>\n" +
@@ -59,7 +59,7 @@
 
       assert clc.getCacheLoaderConfigs().size() == 1;
       JdbcStringBasedCacheStoreConfig csConf = (JdbcStringBasedCacheStoreConfig) clc.getFirstCacheLoaderConfig();
-      assert csConf.getCacheLoaderClassName().equals("org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore");
+      assert csConf.getCacheLoaderClassName().equals("org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore");
       assert csConf.isFetchPersistentState();
       assert csConf.isIgnoreModifications();
       assert csConf.isPurgeOnStartup();

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/JdbcBinaryCacheStoreTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/JdbcBinaryCacheStoreTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/JdbcBinaryCacheStoreTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.loader.jdbc;
+package org.infinispan.loader.jdbc;
 
 import static org.easymock.classextension.EasyMock.*;
-import org.infinispan.loader.BaseCacheStoreTest;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore;
-import org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStoreConfig;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.marshall.ObjectStreamMarshaller;
-import org.infinispan.test.fwk.UnitTestDatabaseManager;
+import org.infinispan.loader.BaseCacheStoreTest;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStore;
+import org.infinispan.loader.jdbc.binary.JdbcBinaryCacheStoreConfig;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.marshall.ObjectStreamMarshaller;
+import org.infinispan.test.fwk.UnitTestDatabaseManager;
 import org.testng.annotations.Test;
 
 /**

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/PooledConnectionFactoryTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/PooledConnectionFactoryTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/PooledConnectionFactoryTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.loader.jdbc;
+package org.infinispan.loader.jdbc;
 
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory;
-import org.infinispan.test.fwk.UnitTestDatabaseManager;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory;
+import org.infinispan.test.fwk.UnitTestDatabaseManager;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
@@ -11,7 +11,7 @@
 import java.util.Set;
 
 /**
- * Tester class for {@link org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory}.
+ * Tester class for {@link org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory}.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/TableManipulationTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/TableManipulationTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/TableManipulationTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.loader.jdbc;
+package org.infinispan.loader.jdbc;
 
 import static org.easymock.EasyMock.*;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.test.fwk.UnitTestDatabaseManager;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.test.fwk.UnitTestDatabaseManager;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -16,7 +16,7 @@
 import java.sql.Statement;
 
 /**
- * Tester class for {@link org.infinispan.loader.jdbc.TableManipulation}.
+ * Tester class for {@link org.infinispan.loader.jdbc.TableManipulation}.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreConfigTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.loader.jdbc.mixed;
+package org.infinispan.loader.jdbc.mixed;
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import org.infinispan.loader.jdbc.stringbased.PersonKey2StringMapper;
-import org.infinispan.loader.LockSupportCacheStoreConfig;
+import org.infinispan.loader.jdbc.stringbased.PersonKey2StringMapper;
+import org.infinispan.loader.LockSupportCacheStoreConfig;
 
 /**
  * Tester class for {@link JdbcMixedCacheStoreConfig}.

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,16 +1,16 @@
-package org.infinispan.loader.jdbc.mixed;
+package org.infinispan.loader.jdbc.mixed;
 
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.jdbc.TableManipulation;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.loader.jdbc.stringbased.DefaultKey2StringMapper;
-import org.infinispan.loader.jdbc.stringbased.Person;
-import org.infinispan.marshall.ObjectStreamMarshaller;
-import org.infinispan.test.fwk.UnitTestDatabaseManager;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.jdbc.TableManipulation;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.loader.jdbc.stringbased.DefaultKey2StringMapper;
+import org.infinispan.loader.jdbc.stringbased.Person;
+import org.infinispan.marshall.ObjectStreamMarshaller;
+import org.infinispan.test.fwk.UnitTestDatabaseManager;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreTest2.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreTest2.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/mixed/JdbcMixedCacheStoreTest2.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.loader.jdbc.mixed;
+package org.infinispan.loader.jdbc.mixed;
 
-import org.infinispan.loader.BaseCacheStoreTest;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.jdbc.TableManipulation;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.test.fwk.UnitTestDatabaseManager;
+import org.infinispan.loader.BaseCacheStoreTest;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.jdbc.TableManipulation;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.test.fwk.UnitTestDatabaseManager;
 import org.testng.annotations.Test;
 
 @Test(groups = "functional", testName = "loader.jdbc.mixed.JdbcMixedCacheStoreTest2")

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/DefaultKey2StringMapperTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/DefaultKey2StringMapperTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/DefaultKey2StringMapperTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.loader.jdbc.stringbased;
+package org.infinispan.loader.jdbc.stringbased;
 
 import org.testng.annotations.Test;
 
 /**
- * Tester for {@link org.infinispan.loader.jdbc.stringbased.Key2StringMapper}.
+ * Tester for {@link org.infinispan.loader.jdbc.stringbased.Key2StringMapper}.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,17 +1,17 @@
-package org.infinispan.loader.jdbc.stringbased;
+package org.infinispan.loader.jdbc.stringbased;
 
 import static org.easymock.classextension.EasyMock.*;
-import org.infinispan.loader.BaseCacheStoreTest;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.jdbc.TableManipulation;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.marshall.ObjectStreamMarshaller;
-import org.infinispan.test.fwk.UnitTestDatabaseManager;
+import org.infinispan.loader.BaseCacheStoreTest;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.jdbc.TableManipulation;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.marshall.ObjectStreamMarshaller;
+import org.infinispan.test.fwk.UnitTestDatabaseManager;
 import org.testng.annotations.Test;
 
 /**
- * Tester class  for {@link org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore}.
+ * Tester class  for {@link org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore}.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreTest2.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreTest2.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/JdbcStringBasedCacheStoreTest2.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.loader.jdbc.stringbased;
+package org.infinispan.loader.jdbc.stringbased;
 
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.jdbc.TableManipulation;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.marshall.ObjectStreamMarshaller;
-import org.infinispan.test.fwk.UnitTestDatabaseManager;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.jdbc.TableManipulation;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.marshall.ObjectStreamMarshaller;
+import org.infinispan.test.fwk.UnitTestDatabaseManager;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
@@ -19,7 +19,7 @@
 import java.util.Set;
 
 /**
- * Tester for {@link JdbcStringBasedCacheStore} with an alternative {@link org.infinispan.loader.jdbc.stringbased.Key2StringMapper}.
+ * Tester for {@link JdbcStringBasedCacheStore} with an alternative {@link org.infinispan.loader.jdbc.stringbased.Key2StringMapper}.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/Person.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/Person.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/Person.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.jdbc.stringbased;
+package org.infinispan.loader.jdbc.stringbased;
 
 import java.io.Serializable;
 

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/PersonKey2StringMapper.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/PersonKey2StringMapper.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loader/jdbc/stringbased/PersonKey2StringMapper.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.jdbc.stringbased;
+package org.infinispan.loader.jdbc.stringbased;
 
 /**
  * Used for testing jdbc cache stores.

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/JdbcTestNameVerifier.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/JdbcTestNameVerifier.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/JdbcTestNameVerifier.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.test.fwk;
+package org.infinispan.test.fwk;
 
 import org.testng.annotations.Test;
 

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.test.fwk;
+package org.infinispan.test.fwk;
 
 
-import org.infinispan.loader.jdbc.JdbcUtil;
-import org.infinispan.loader.jdbc.TableManipulation;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
-import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.loader.jdbc.JdbcUtil;
+import org.infinispan.loader.jdbc.TableManipulation;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactory;
+import org.infinispan.loader.jdbc.connectionfactory.ConnectionFactoryConfig;
+import org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory;
+import org.infinispan.test.TestingUtil;
 
 import java.io.File;
 import java.sql.Connection;
@@ -40,7 +40,7 @@
          throw new RuntimeException(e);
       }
       realConfig.setDriverClass("org.hsqldb.jdbcDriver");
-      realConfig.setConnectionUrl("jdbc:hsqldb:mem:infinispan");
+      realConfig.setConnectionUrl("jdbc:hsqldb:mem:infinispan");
       realConfig.setConnectionFactoryClass(PooledConnectionFactory.class.getName());
       realConfig.setUserName("sa");
    }
@@ -121,7 +121,7 @@
       for (int i = stack.length - 1; i > 0; i--) {
          StackTraceElement e = stack[i];
          String className = e.getClassName();
-         if (className.indexOf("org.infinispan") != -1) return className.replace('.', '_') + "_" + e.getMethodName();
+         if (className.indexOf("org.infinispan") != -1) return className.replace('.', '_') + "_" + e.getMethodName();
       }
       return null;
    }

Modified: trunk/cachestore/s3/pom.xml
===================================================================
--- trunk/cachestore/s3/pom.xml	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/cachestore/s3/pom.xml	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,34 +1,29 @@
 <?xml version="1.0"?>
-
-<!-- This is the current pom for the cachestore-s3 directory (or project) for Infinispan-->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-
    <parent>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-parent</artifactId>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-parent</artifactId>
       <version>4.0.0-SNAPSHOT</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
+   <groupId>org.infinispan</groupId>
+   <artifactId>infinispan-cachestore-s3</artifactId>
+   <name>Infinispan - Cachestore S3</name>
+   <description>INFINISPAN - Open Source Data Grids. This is the cachestore-s3 package.</description>
 
-   <groupId>org.infinispan</groupId>
-   <artifactId>infinispan-cachestore-s3</artifactId>
-   <name>Infinispan - Cachestore S3</name>
-   <description>Infinispan - Open Source Data Grids. This is the cachestore-s3 package.</description>
-
    <dependencies>
       <dependency>
          <groupId>${project-package}</groupId>
-         <artifactId>infinispan-core</artifactId>
+         <artifactId>infinispan-core</artifactId>
          <version>${project-version}</version>
       </dependency>
 
       <dependency>
          <groupId>${project-package}</groupId>
-         <artifactId>infinispan-core</artifactId>
+         <artifactId>infinispan-core</artifactId>
          <version>${project-version}</version>
          <type>test-jar</type>
          <scope>test</scope>

Copied: trunk/cachestore/s3/src/main/java/org/infinispan (from rev 88, trunk/cachestore/s3/src/main/java/org/infinispan)

Modified: trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/Jets3tS3Connection.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/Jets3tS3Connection.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/Jets3tS3Connection.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.s3;
+package org.infinispan.loader.s3;
 
 import org.jets3t.service.S3Service;
 import org.jets3t.service.S3ServiceException;

Modified: trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3CacheStore.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3CacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3CacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,15 +1,15 @@
-package org.infinispan.loader.s3;
+package org.infinispan.loader.s3;
 
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.bucket.Bucket;
-import org.infinispan.loader.bucket.BucketBasedCacheStore;
-import org.infinispan.loader.file.FileCacheStore;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.marshall.Marshaller;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.bucket.Bucket;
+import org.infinispan.loader.bucket.BucketBasedCacheStore;
+import org.infinispan.loader.file.FileCacheStore;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.marshall.Marshaller;
 import org.jets3t.service.S3ServiceException;
 import org.jets3t.service.model.S3Bucket;
 import org.jets3t.service.model.S3Object;
@@ -25,7 +25,7 @@
 import java.util.Set;
 
 /**
- * A {@link org.jets3t.service.S3Service jets3t} implementation of a {@link org.infinispan.loader.bucket.BucketBasedCacheStore}.
+ * A {@link org.jets3t.service.S3Service jets3t} implementation of a {@link org.infinispan.loader.bucket.BucketBasedCacheStore}.
  * This file store stores stuff in the following format: <tt>http://s3.amazon.com/{bucket}/bucket_number.bucket</tt>
  * <p/>
  * Tuning and configuration parameters can be overridden by creating <tt>jets3t.properties</tt> and adding it to your

Modified: trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3CacheStoreConfig.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3CacheStoreConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3CacheStoreConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.loader.s3;
+package org.infinispan.loader.s3;
 
-import org.infinispan.loader.LockSupportCacheStoreConfig;
+import org.infinispan.loader.LockSupportCacheStoreConfig;
 
 /**
- * Configures {@link org.infinispan.loader.s3.S3CacheStore}.  This allows you to tune a number of characteristics of the
+ * Configures {@link org.infinispan.loader.s3.S3CacheStore}.  This allows you to tune a number of characteristics of the
  * {@link S3CacheStore}.
  * <p/>
  * <ul> <li><tt>awsAccessKey</tt> - identifies you as the party responsible for s3 requests.  This is required and there

Modified: trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3Connection.java
===================================================================
--- trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3Connection.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/s3/src/main/java/org/infinispan/loader/s3/S3Connection.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.s3;
+package org.infinispan.loader.s3;
 
 import org.jets3t.service.S3ServiceException;
 import org.jets3t.service.model.S3Bucket;

Copied: trunk/cachestore/s3/src/test/java/org/infinispan (from rev 88, trunk/cachestore/s3/src/test/java/org/infinispan)

Modified: trunk/cachestore/s3/src/test/java/org/infinispan/s3/MockS3Connection.java
===================================================================
--- trunk/cachestore/s3/src/test/java/org/infinispan/s3/MockS3Connection.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/s3/src/test/java/org/infinispan/s3/MockS3Connection.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.s3;
+package org.infinispan.loader.s3;
 
 import org.apache.commons.io.IOUtils;
 import org.jets3t.service.S3ServiceException;

Modified: trunk/cachestore/s3/src/test/java/org/infinispan/s3/S3CacheStoreIntegrationTest.java
===================================================================
--- trunk/cachestore/s3/src/test/java/org/infinispan/s3/S3CacheStoreIntegrationTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/s3/src/test/java/org/infinispan/s3/S3CacheStoreIntegrationTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.loader.s3;
+package org.infinispan.loader.s3;
 
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.io.UnclosableObjectInputStream;
-import org.infinispan.io.UnclosableObjectOutputStream;
-import org.infinispan.loader.BaseCacheStoreTest;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.io.UnclosableObjectInputStream;
+import org.infinispan.io.UnclosableObjectOutputStream;
+import org.infinispan.loader.BaseCacheStoreTest;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
 import org.jets3t.service.model.S3Bucket;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;

Modified: trunk/cachestore/s3/src/test/java/org/infinispan/test/fwk/S3TestNameVerifier.java
===================================================================
--- trunk/cachestore/s3/src/test/java/org/infinispan/test/fwk/S3TestNameVerifier.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/cachestore/s3/src/test/java/org/infinispan/test/fwk/S3TestNameVerifier.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.test.fwk;
+package org.infinispan.test.fwk;
 
 import org.testng.annotations.Test;
 

Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/core/pom.xml	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,24 +1,20 @@
 <?xml version="1.0"?>
-
-<!-- This is the current pom for the core directory (or project) for Infinispan-->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-parent</artifactId>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-parent</artifactId>
       <version>4.0.0-SNAPSHOT</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
-
-   <groupId>org.infinispan</groupId>
-   <artifactId>infinispan-core</artifactId>
-   <name>Infinispan - Core</name>
-   <description>Infinispan - Open Source Data Grids. This is the core package.</description>
+   <groupId>org.infinispan</groupId>
+   <artifactId>infinispan-core</artifactId>
+   <name>Infinispan - Core</name>
+   <description>Infinispan - Open Source Data Grids. This is the core package.</description>
    <dependencies>
       <!-- Weird dep that should be removed soon -->
       <dependency>

Copied: trunk/core/src/main/java/org/infinispan (from rev 88, trunk/core/src/main/java/org/infinispan)

Modified: trunk/core/src/main/java/org/infinispan/AdvancedCache.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/AdvancedCache.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/AdvancedCache.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,13 +1,13 @@
-package org.infinispan;
+package org.infinispan;
 
-import org.infinispan.batch.BatchContainer;
-import org.infinispan.container.DataContainer;
-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 org.infinispan.batch.BatchContainer;
+import org.infinispan.container.DataContainer;
+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;
 import java.util.Map;
@@ -65,7 +65,7 @@
    /**
     * Retrieves the current Interceptor chain.
     *
-    * @return an immutable {@link java.util.List} of {@link org.infinispan.interceptors.base.CommandInterceptor}s
+    * @return an immutable {@link java.util.List} of {@link org.infinispan.interceptors.base.CommandInterceptor}s
     *         configured for this cache
     */
    List<CommandInterceptor> getInterceptorChain();

Modified: trunk/core/src/main/java/org/infinispan/Cache.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/Cache.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/Cache.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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;
+package org.infinispan;
 
-import org.infinispan.config.Configuration;
-import org.infinispan.lifecycle.ComponentStatus;
-import org.infinispan.lifecycle.Lifecycle;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.notifications.Listenable;
+import org.infinispan.config.Configuration;
+import org.infinispan.lifecycle.ComponentStatus;
+import org.infinispan.lifecycle.Lifecycle;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.notifications.Listenable;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
@@ -35,7 +35,7 @@
  * The central interface of Infinispan.  A Cache provides a highly concurrent, optionally distributed data structure with
  * additional features such as: <ul> <li>JTA transaction compatibility</li> <li>Eviction support to prevent evicting
  * entries from memory to prevent {@link OutOfMemoryError}s</li> <li>Persisting entries to a {@link
- * org.infinispan.loader.CacheStore}, either when they are evicted as an overflow, or all the time, to maintain persistent
+ * org.infinispan.loader.CacheStore}, either when they are evicted as an overflow, or all the time, to maintain persistent
  * copies that would withstand server failure or restarts.</li> </ul>
  * <p/>
  * For convenience, Cache extends {@link java.util.concurrent.ConcurrentMap} and implements all methods accordingly,
@@ -75,7 +75,7 @@
     *
     * @param key   key with which the specified value is to be associated.
     * @param value value to be associated with the specified key.
-    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#RUNNING}.
+    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#RUNNING}.
     */
    void putForExternalRead(K key, V value);
 

Modified: trunk/core/src/main/java/org/infinispan/CacheDelegate.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/CacheDelegate.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/CacheDelegate.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,43 +19,43 @@
  * 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;
+package org.infinispan;
 
-import org.infinispan.atomic.AtomicHashMap;
-import org.infinispan.atomic.AtomicMap;
-import org.infinispan.atomic.AtomicMapCache;
-import org.infinispan.batch.BatchContainer;
-import org.infinispan.commands.CommandsFactory;
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.read.SizeCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.EvictCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.context.InvocationContext;
-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.InvocationContextContainer;
-import org.infinispan.invocation.Flag;
-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;
-import org.infinispan.notifications.cachelistener.CacheNotifier;
-import org.infinispan.remoting.RpcManager;
-import org.infinispan.statetransfer.StateTransferManager;
+import org.infinispan.atomic.AtomicHashMap;
+import org.infinispan.atomic.AtomicMap;
+import org.infinispan.atomic.AtomicMapCache;
+import org.infinispan.batch.BatchContainer;
+import org.infinispan.commands.CommandsFactory;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.read.SizeCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.EvictCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.context.InvocationContext;
+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.InvocationContextContainer;
+import org.infinispan.invocation.Flag;
+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;
+import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.remoting.RpcManager;
+import org.infinispan.statetransfer.StateTransferManager;
 
 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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/CacheException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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;
+package org.infinispan;
 
 /**
  * Thrown when operations on {@link Cache} fail unexpectedly.
  * <p/>
- * Specific subclasses such as {@link org.infinispan.lock.TimeoutException} and {@link
- * org.infinispan.config.ConfigurationException} have more specific uses.
+ * Specific subclasses such as {@link org.infinispan.lock.TimeoutException} and {@link
+ * org.infinispan.config.ConfigurationException} have more specific uses.
  *
  * @author <a href="mailto:bela at jboss.org">Bela Ban</a>
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>

Modified: trunk/core/src/main/java/org/infinispan/Version.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/Version.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/Version.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan;
+package org.infinispan;
 
 import net.jcip.annotations.Immutable;
 

Modified: trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMap.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMap.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.atomic;
+package org.infinispan.atomic;
 
 import net.jcip.annotations.NotThreadSafe;
-import org.infinispan.Cache;
-import org.infinispan.batch.BatchContainer;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.util.FastCopyHashMap;
+import org.infinispan.Cache;
+import org.infinispan.batch.BatchContainer;
+import org.infinispan.invocation.InvocationContextContainer;
+import org.infinispan.util.FastCopyHashMap;
 
 import java.util.Collection;
 import java.util.Map;

Modified: trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapDelta.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.atomic;
+package org.infinispan.atomic;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/AtomicHashMapProxy.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,22 +19,22 @@
  * 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.atomic;
+package org.infinispan.atomic;
 
-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.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 java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
 /**
- * A layer of indirection around an {@link org.infinispan.atomic.AtomicHashMap} to provide reader consistency
+ * A layer of indirection around an {@link org.infinispan.atomic.AtomicHashMap} to provide reader consistency
  *
  * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/atomic/AtomicMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/AtomicMap.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/AtomicMap.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.atomic;
+package org.infinispan.atomic;
 
 import java.util.Map;
 

Modified: trunk/core/src/main/java/org/infinispan/atomic/AtomicMapCache.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/AtomicMapCache.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/AtomicMapCache.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.atomic;
+package org.infinispan.atomic;
 
-import org.infinispan.Cache;
+import org.infinispan.Cache;
 
 /**
  * This interface adds the getAtomicMap() method which allows users to get a hold of a map type where operations on its

Modified: trunk/core/src/main/java/org/infinispan/atomic/ClearOperation.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/ClearOperation.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/ClearOperation.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.atomic;
+package org.infinispan.atomic;
 
-import org.infinispan.util.FastCopyHashMap;
+import org.infinispan.util.FastCopyHashMap;
 
 import java.util.Map;
 

Modified: trunk/core/src/main/java/org/infinispan/atomic/Delta.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/Delta.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/Delta.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.atomic;
+package org.infinispan.atomic;
 
 import java.io.Externalizable;
 

Modified: trunk/core/src/main/java/org/infinispan/atomic/DeltaAware.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/DeltaAware.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/DeltaAware.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.atomic;
+package org.infinispan.atomic;
 
 /**
  * This interface allows the extraction of deltas.
  * <p/>
  * Implementations would be closely coupled to a corresponding {@link Delta} implementation, since {@link
- * org.infinispan.atomic.Delta#instantiate()} would need to know how to recreate this instance of DeltaAware if needed.
+ * org.infinispan.atomic.Delta#instantiate()} would need to know how to recreate this instance of DeltaAware if needed.
  * <p/>
  *
  * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)

Modified: trunk/core/src/main/java/org/infinispan/atomic/NullDelta.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/NullDelta.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/NullDelta.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.atomic;
+package org.infinispan.atomic;
 
 import java.io.Externalizable;
 import java.io.IOException;

Modified: trunk/core/src/main/java/org/infinispan/atomic/Operation.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/Operation.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/Operation.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.atomic;
+package org.infinispan.atomic;
 
 import java.io.Externalizable;
 import java.io.IOException;

Modified: trunk/core/src/main/java/org/infinispan/atomic/PutOperation.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/PutOperation.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/PutOperation.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.atomic;
+package org.infinispan.atomic;
 
 import java.io.IOException;
 import java.io.ObjectInput;

Modified: trunk/core/src/main/java/org/infinispan/atomic/RemoveOperation.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/RemoveOperation.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/atomic/RemoveOperation.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.atomic;
+package org.infinispan.atomic;
 
 import java.io.IOException;
 import java.io.ObjectInput;

Modified: trunk/core/src/main/java/org/infinispan/batch/AutoBatchSupport.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/batch/AutoBatchSupport.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/batch/AutoBatchSupport.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.batch;
+package org.infinispan.batch;
 
 import net.jcip.annotations.NotThreadSafe;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.ConfigurationException;
 
 /**
  * Enables for automatic batching.

Modified: trunk/core/src/main/java/org/infinispan/batch/BatchContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/batch/BatchContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/batch/BatchContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,17 +19,17 @@
  * 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.batch;
+package org.infinispan.batch;
 
-import org.infinispan.CacheException;
-import org.infinispan.factories.annotations.Inject;
+import org.infinispan.CacheException;
+import org.infinispan.factories.annotations.Inject;
 
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
 /**
- * A container for holding thread locals for batching, to be used with the {@link org.infinispan.Cache#startBatch()} and
- * {@link org.infinispan.Cache#endBatch(boolean)} calls.
+ * A container for holding thread locals for batching, to be used with the {@link org.infinispan.Cache#startBatch()} and
+ * {@link org.infinispan.Cache#endBatch(boolean)} calls.
  *
  * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/commands/AbstractVisitor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/AbstractVisitor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/AbstractVisitor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,21 +19,21 @@
  * 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.commands;
+package org.infinispan.commands;
 
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.read.SizeCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.EvictCommand;
-import org.infinispan.commands.write.InvalidateCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.context.InvocationContext;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.read.SizeCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.EvictCommand;
+import org.infinispan.commands.write.InvalidateCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.context.InvocationContext;
 
 import java.util.Collection;
 

Modified: trunk/core/src/main/java/org/infinispan/commands/CacheRpcCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/CacheRpcCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/CacheRpcCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.commands;
+package org.infinispan.commands;
 
 /**
  * The RPCManager only replicates commands wrapped in an RPCCommand.  As a wrapper, an RPCCommand could contain a single
- * {@link org.infinispan.commands.ReplicableCommand} or a List of them.
+ * {@link org.infinispan.commands.ReplicableCommand} or a List of them.
  *
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/commands/CommandsFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/CommandsFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/CommandsFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,26 +19,26 @@
  * 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.commands;
+package org.infinispan.commands;
 
-import org.infinispan.commands.control.StateTransferControlCommand;
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.read.SizeCommand;
-import org.infinispan.commands.remote.ReplicateCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.EvictCommand;
-import org.infinispan.commands.write.InvalidateCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.commands.control.StateTransferControlCommand;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.read.SizeCommand;
+import org.infinispan.commands.remote.ReplicateCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.EvictCommand;
+import org.infinispan.commands.write.InvalidateCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.transaction.GlobalTransaction;
 
 import java.util.List;
 import java.util.Map;
@@ -75,7 +75,7 @@
    RollbackCommand buildRollbackCommand(GlobalTransaction gtx);
 
    /**
-    * Initializes a {@link org.infinispan.commands.ReplicableCommand} read from a data stream with components specific to
+    * Initializes a {@link org.infinispan.commands.ReplicableCommand} read from a data stream with components specific to
     * the target cache instance.
     * <p/>
     * Implementations should also be deep, in that if the command contains other commands, these should be recursed

Modified: trunk/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,31 +19,31 @@
  * 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.commands;
+package org.infinispan.commands;
 
-import org.infinispan.Cache;
-import org.infinispan.commands.control.StateTransferControlCommand;
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.read.SizeCommand;
-import org.infinispan.commands.remote.ClusteredGetCommand;
-import org.infinispan.commands.remote.ReplicateCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.EvictCommand;
-import org.infinispan.commands.write.InvalidateCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.container.DataContainer;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.interceptors.InterceptorChain;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.notifications.cachelistener.CacheNotifier;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.Cache;
+import org.infinispan.commands.control.StateTransferControlCommand;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.read.SizeCommand;
+import org.infinispan.commands.remote.ClusteredGetCommand;
+import org.infinispan.commands.remote.ReplicateCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.EvictCommand;
+import org.infinispan.commands.write.InvalidateCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.container.DataContainer;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.interceptors.InterceptorChain;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.transaction.GlobalTransaction;
 
 import java.util.List;
 import java.util.Map;

Modified: trunk/core/src/main/java/org/infinispan/commands/DataCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/DataCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/DataCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.commands;
+package org.infinispan.commands;
 
 
 /**

Modified: trunk/core/src/main/java/org/infinispan/commands/RemoteCommandFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/RemoteCommandFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/RemoteCommandFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,26 +1,26 @@
-package org.infinispan.commands;
+package org.infinispan.commands;
 
-import org.infinispan.CacheException;
-import org.infinispan.commands.control.StateTransferControlCommand;
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.remote.ClusteredGetCommand;
-import org.infinispan.commands.remote.ReplicateCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.InvalidateCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.remoting.RpcManager;
+import org.infinispan.CacheException;
+import org.infinispan.commands.control.StateTransferControlCommand;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.remote.ClusteredGetCommand;
+import org.infinispan.commands.remote.ReplicateCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.InvalidateCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.remoting.RpcManager;
 
 /**
- * Specifically used to create un-initialized {@link org.infinispan.commands.ReplicableCommand}s from a byte stream.
+ * Specifically used to create un-initialized {@link org.infinispan.commands.ReplicableCommand}s from a byte stream.
  *
  * @author Manik Surtani
  * @since 4.0
@@ -38,7 +38,7 @@
     * Creates an un-initialized command.  Un-initialized in the sense that parameters will be set, but any components
     * specific to the cache in question will not be set.
     * <p/>
-    * You would typically set these parameters using {@link org.infinispan.commands.CommandsFactory#initializeReplicableCommand(ReplicableCommand)}
+    * You would typically set these parameters using {@link org.infinispan.commands.CommandsFactory#initializeReplicableCommand(ReplicableCommand)}
     * <p/>
     *
     * @param id         id of the command

Modified: trunk/core/src/main/java/org/infinispan/commands/ReplicableCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/ReplicableCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/ReplicableCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.commands;
+package org.infinispan.commands;
 
-import org.infinispan.context.InvocationContext;
+import org.infinispan.context.InvocationContext;
 
 /**
  * The core of the command-based cache framework.  Commands correspond to specific areas of functionality in the cache,
- * and can be replicated using the {@link org.infinispan.remoting.RpcManager}
+ * and can be replicated using the {@link org.infinispan.remoting.RpcManager}
  *
  * @author Mircea.Markus at jboss.com
  * @author Manik Surtani
@@ -61,7 +61,7 @@
     * Used by the {@link CommandsFactory} to create a command from raw data read off a stream.
     *
     * @param commandId  command id to set.  This is usually unused but *could* be used in the event of a command having
-    *                   multiple IDs, such as {@link org.infinispan.commands.write.PutKeyValueCommand}.
+    *                   multiple IDs, such as {@link org.infinispan.commands.write.PutKeyValueCommand}.
     * @param parameters object array of args
     */
    void setParameters(int commandId, Object[] parameters);

Modified: trunk/core/src/main/java/org/infinispan/commands/TransactionBoundaryCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/TransactionBoundaryCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/TransactionBoundaryCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.commands;
+package org.infinispan.commands;
 
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.transaction.GlobalTransaction;
 
 /**
  * // TODO: MANIK: Document this

Modified: trunk/core/src/main/java/org/infinispan/commands/VisitableCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/VisitableCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/VisitableCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.commands;
+package org.infinispan.commands;
 
-import org.infinispan.context.InvocationContext;
+import org.infinispan.context.InvocationContext;
 
 
 /**
- * A type of command that can accept {@link Visitor}s, such as {@link org.infinispan.interceptors.base.CommandInterceptor}s.
+ * A type of command that can accept {@link Visitor}s, such as {@link org.infinispan.interceptors.base.CommandInterceptor}s.
  *
  * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/commands/Visitor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/Visitor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/Visitor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,21 +19,21 @@
  * 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.commands;
+package org.infinispan.commands;
 
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.read.SizeCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.EvictCommand;
-import org.infinispan.commands.write.InvalidateCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.context.InvocationContext;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.read.SizeCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.EvictCommand;
+import org.infinispan.commands.write.InvalidateCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.context.InvocationContext;
 
 public interface Visitor {
    // write commands

Modified: trunk/core/src/main/java/org/infinispan/commands/control/StateTransferControlCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/control/StateTransferControlCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/control/StateTransferControlCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.commands.control;
+package org.infinispan.commands.control;
 
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.remoting.RpcManager;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.remoting.RpcManager;
 
 /**
  * A command that informs caches participating in a state transfer of the various stages in the state transfer process.

Modified: trunk/core/src/main/java/org/infinispan/commands/read/AbstractDataCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/read/AbstractDataCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/read/AbstractDataCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.commands.read;
+package org.infinispan.commands.read;
 
-import org.infinispan.commands.DataCommand;
-import org.infinispan.container.entries.MVCCEntry;
-import org.infinispan.context.InvocationContext;
+import org.infinispan.commands.DataCommand;
+import org.infinispan.container.entries.MVCCEntry;
+import org.infinispan.context.InvocationContext;
 
 /**
  * @author Mircea.Markus at jboss.com

Modified: trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.commands.read;
+package org.infinispan.commands.read;
 
-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.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;
 
 /**
  * // TODO: MANIK: Document this

Modified: trunk/core/src/main/java/org/infinispan/commands/read/SizeCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/read/SizeCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/read/SizeCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.commands.read;
+package org.infinispan.commands.read;
 
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.commands.Visitor;
-import org.infinispan.container.DataContainer;
-import org.infinispan.context.InvocationContext;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.commands.Visitor;
+import org.infinispan.container.DataContainer;
+import org.infinispan.context.InvocationContext;
 
 /**
  * Command to calculate the size of the cache

Modified: trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,21 +19,21 @@
  * 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.commands.remote;
+package org.infinispan.commands.remote;
 
-import org.infinispan.CacheException;
-import org.infinispan.commands.CacheRpcCommand;
-import org.infinispan.commands.DataCommand;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.CacheException;
+import org.infinispan.commands.CacheRpcCommand;
+import org.infinispan.commands.DataCommand;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 /**
  * Issues a clustered get call, for use primarily by the {@link ClusteredCacheLoader}.  This is not a {@link
- * org.infinispan.commands.VisitableCommand} and hence not passed up the {@link org.infinispan.interceptors.base.CommandInterceptor}
+ * org.infinispan.commands.VisitableCommand} and hence not passed up the {@link org.infinispan.interceptors.base.CommandInterceptor}
  * chain.
  * <p/>
  *

Modified: trunk/core/src/main/java/org/infinispan/commands/remote/ReplicateCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/remote/ReplicateCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/remote/ReplicateCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,15 +19,15 @@
  * 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.commands.remote;
+package org.infinispan.commands.remote;
 
-import org.infinispan.commands.CacheRpcCommand;
-import org.infinispan.commands.ReplicableCommand;
-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.commands.CacheRpcCommand;
+import org.infinispan.commands.ReplicableCommand;
+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 java.util.Arrays;
 import java.util.List;
@@ -35,7 +35,7 @@
 /**
  * Command that implements cluster replication logic.
  * <p/>
- * This is not a {@link VisitableCommand} and hence not passed up the {@link org.infinispan.interceptors.base.CommandInterceptor}
+ * This is not a {@link VisitableCommand} and hence not passed up the {@link org.infinispan.interceptors.base.CommandInterceptor}
  * chain.
  * <p/>
  *

Modified: trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.commands.tx;
+package org.infinispan.commands.tx;
 
-import org.infinispan.commands.TransactionBoundaryCommand;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.commands.TransactionBoundaryCommand;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.transaction.GlobalTransaction;
 
 /**
  * // TODO: MANIK: Document this

Modified: trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.commands.tx;
+package org.infinispan.commands.tx;
 
-import org.infinispan.commands.Visitor;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.commands.Visitor;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.transaction.GlobalTransaction;
 
 /**
  * // TODO: MANIK: Document this

Modified: trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.commands.tx;
+package org.infinispan.commands.tx;
 
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.commands.Visitor;
-import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.commands.Visitor;
+import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.transaction.GlobalTransaction;
 
 import java.util.Arrays;
 import java.util.Collection;

Modified: trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.commands.tx;
+package org.infinispan.commands.tx;
 
-import org.infinispan.commands.Visitor;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.commands.Visitor;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.transaction.GlobalTransaction;
 
 /**
  * // TODO: MANIK: Document this

Modified: trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.commands.write;
+package org.infinispan.commands.write;
 
-import org.infinispan.commands.Visitor;
-import org.infinispan.container.entries.MVCCEntry;
-import org.infinispan.container.entries.CacheEntry;
-import org.infinispan.context.InvocationContext;
+import org.infinispan.commands.Visitor;
+import org.infinispan.container.entries.MVCCEntry;
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.context.InvocationContext;
 
 /**
  * @author Mircea.Markus at jboss.com

Modified: trunk/core/src/main/java/org/infinispan/commands/write/DataWriteCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/DataWriteCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/write/DataWriteCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.commands.write;
+package org.infinispan.commands.write;
 
-import org.infinispan.commands.DataCommand;
+import org.infinispan.commands.DataCommand;
 
 /**
  * Mixes features from DataCommand and WriteCommand

Modified: trunk/core/src/main/java/org/infinispan/commands/write/EvictCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/EvictCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/write/EvictCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.commands.write;
+package org.infinispan.commands.write;
 
-import org.infinispan.commands.Visitor;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.commands.Visitor;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.notifications.cachelistener.CacheNotifier;
 
 /**
  * @author Mircea.Markus at jboss.com

Modified: trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.commands.write;
+package org.infinispan.commands.write;
 
-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.commands.Visitor;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.notifications.cachelistener.CacheNotifier;
 
 import java.util.Arrays;
 

Modified: trunk/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,18 +19,18 @@
  * 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.commands.write;
+package org.infinispan.commands.write;
 
-import org.infinispan.atomic.Delta;
-import org.infinispan.atomic.DeltaAware;
-import org.infinispan.commands.Visitor;
-import org.infinispan.commands.read.AbstractDataCommand;
-import org.infinispan.container.entries.MVCCEntry;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.atomic.Delta;
+import org.infinispan.atomic.DeltaAware;
+import org.infinispan.commands.Visitor;
+import org.infinispan.commands.read.AbstractDataCommand;
+import org.infinispan.container.entries.MVCCEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.notifications.cachelistener.CacheNotifier;
 
 /**
- * Implements functionality defined by {@link org.infinispan.Cache#put(Object, Object)}
+ * Implements functionality defined by {@link org.infinispan.Cache#put(Object, Object)}
  *
  * @author Mircea.Markus at jboss.com
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.commands.write;
+package org.infinispan.commands.write;
 
-import org.infinispan.commands.Visitor;
-import org.infinispan.container.entries.MVCCEntry;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.commands.Visitor;
+import org.infinispan.container.entries.MVCCEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.notifications.cachelistener.CacheNotifier;
 
 import java.util.Map;
 import java.util.Map.Entry;

Modified: trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,15 +19,15 @@
  * 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.commands.write;
+package org.infinispan.commands.write;
 
-import org.infinispan.commands.Visitor;
-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.commands.Visitor;
+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;
 
 
 /**

Modified: trunk/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.commands.write;
+package org.infinispan.commands.write;
 
-import org.infinispan.commands.Visitor;
-import org.infinispan.commands.read.AbstractDataCommand;
-import org.infinispan.container.entries.MVCCEntry;
-import org.infinispan.context.InvocationContext;
+import org.infinispan.commands.Visitor;
+import org.infinispan.commands.read.AbstractDataCommand;
+import org.infinispan.container.entries.MVCCEntry;
+import org.infinispan.context.InvocationContext;
 
 
 /**

Modified: trunk/core/src/main/java/org/infinispan/commands/write/WriteCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/WriteCommand.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/commands/write/WriteCommand.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.commands.write;
+package org.infinispan.commands.write;
 
-import org.infinispan.commands.VisitableCommand;
+import org.infinispan.commands.VisitableCommand;
 
 /**
  * A command that modifies the cache in some way

Modified: trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.config;
+package org.infinispan.config;
 
-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.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 java.io.ByteArrayInputStream;
 import java.io.IOException;

Modified: trunk/core/src/main/java/org/infinispan/config/AbstractNamedCacheConfigurationBean.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/AbstractNamedCacheConfigurationBean.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/AbstractNamedCacheConfigurationBean.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,13 +1,13 @@
-package org.infinispan.config;
+package org.infinispan.config;
 
-import org.infinispan.factories.ComponentRegistry;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.lifecycle.ComponentStatus;
+import org.infinispan.factories.ComponentRegistry;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.lifecycle.ComponentStatus;
 
 /**
- * Adds named cache specific features to the {@link org.infinispan.config.AbstractConfigurationBean}.
+ * Adds named cache specific features to the {@link org.infinispan.config.AbstractConfigurationBean}.
  *
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.config;
+package org.infinispan.config;
 
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheStoreConfig;
-import org.infinispan.util.Util;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheStoreConfig;
+import org.infinispan.util.Util;
 
 import java.util.LinkedList;
 import java.util.List;

Modified: trunk/core/src/main/java/org/infinispan/config/CloneableConfigurationComponent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/CloneableConfigurationComponent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/CloneableConfigurationComponent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.config;
+package org.infinispan.config;
 
 import java.io.Serializable;
 

Modified: trunk/core/src/main/java/org/infinispan/config/Configuration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/Configuration.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/Configuration.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.config;
+package org.infinispan.config;
 
-import org.infinispan.eviction.EvictionStrategy;
-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.eviction.EvictionStrategy;
+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 java.util.Collections;
 import java.util.List;
@@ -211,8 +211,8 @@
    }
 
    /**
-    * Enables invocation batching if set to <tt>true</tt>.  You still need to use {@link org.infinispan.Cache#startBatch()}
-    * and {@link org.infinispan.Cache#endBatch(boolean)} to demarcate the start and end of batches.
+    * Enables invocation batching if set to <tt>true</tt>.  You still need to use {@link org.infinispan.Cache#startBatch()}
+    * and {@link org.infinispan.Cache#endBatch(boolean)} to demarcate the start and end of batches.
     *
     * @param enabled if true, batching is enabled.
     * @since 4.0
@@ -546,7 +546,7 @@
    }
 
    /**
-    * Returns the {@link org.infinispan.config.CustomInterceptorConfig}, if any, associated with this configuration object.
+    * Returns the {@link org.infinispan.config.CustomInterceptorConfig}, if any, associated with this configuration object.
     * The custom interceptors will be added to the cache at startup in the sequence defined by this list.
     *
     * @return List of cutom interceptors, never null

Modified: trunk/core/src/main/java/org/infinispan/config/ConfigurationException.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/ConfigurationException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/ConfigurationException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.config;
+package org.infinispan.config;
 
-import org.infinispan.CacheException;
+import org.infinispan.CacheException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +32,7 @@
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
  * @see Configuration
- * @see org.infinispan.manager.DefaultCacheManager
+ * @see org.infinispan.manager.DefaultCacheManager
  * @since 4.0
  */
 public class ConfigurationException extends CacheException {

Modified: trunk/core/src/main/java/org/infinispan/config/ConfigurationRegistry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/ConfigurationRegistry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/ConfigurationRegistry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.config;
+package org.infinispan.config;
 
 import java.util.Set;
 

Modified: trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.config;
+package org.infinispan.config;
 
 import net.jcip.annotations.Immutable;
-import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.interceptors.base.CommandInterceptor;
 
 /**
  * Holds information about the custom interceptors defined in the configuration file.

Modified: trunk/core/src/main/java/org/infinispan/config/DuplicateCacheNameException.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/DuplicateCacheNameException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/DuplicateCacheNameException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.config;
+package org.infinispan.config;
 
 /**
  * Thrown if a duplicate named cache is detected

Modified: trunk/core/src/main/java/org/infinispan/config/Dynamic.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/Dynamic.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/Dynamic.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.config;
+package org.infinispan.config;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Modified: trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,19 +1,19 @@
-package org.infinispan.config;
+package org.infinispan.config;
 
-import org.infinispan.CacheException;
-import org.infinispan.Version;
-import org.infinispan.jmx.PlatformMBeanServerLookup;
-import org.infinispan.executors.DefaultExecutorFactory;
-import org.infinispan.executors.DefaultScheduledExecutorFactory;
-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.lifecycle.ComponentStatus;
-import org.infinispan.marshall.VersionAwareMarshaller;
-import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
-import org.infinispan.util.TypedProperties;
+import org.infinispan.CacheException;
+import org.infinispan.Version;
+import org.infinispan.jmx.PlatformMBeanServerLookup;
+import org.infinispan.executors.DefaultExecutorFactory;
+import org.infinispan.executors.DefaultScheduledExecutorFactory;
+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.lifecycle.ComponentStatus;
+import org.infinispan.marshall.VersionAwareMarshaller;
+import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
+import org.infinispan.util.TypedProperties;
 
 import java.util.Properties;
 
@@ -28,7 +28,7 @@
 public class GlobalConfiguration extends AbstractConfigurationBean {
 
    /**
-    * Default replication version, from {@link org.infinispan.Version#getVersionShort}.
+    * Default replication version, from {@link org.infinispan.Version#getVersionShort}.
     */
    public static final short DEFAULT_MARSHALL_VERSION = Version.getVersionShort();
 
@@ -54,7 +54,7 @@
    private long distributedSyncTimeout = 60000; // default
 
    private boolean exposeGlobalJmxStatistics = false;
-   private String jmxDomain = "infinispan";
+   private String jmxDomain = "infinispan";
    private String mBeanServerLookup = PlatformMBeanServerLookup.class.getName();
    private boolean allowDuplicateDomains = false;
 

Modified: trunk/core/src/main/java/org/infinispan/config/PluggableConfigurationComponent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/PluggableConfigurationComponent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/PluggableConfigurationComponent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.config;
+package org.infinispan.config;
 
-import org.infinispan.config.parsing.XmlConfigHelper;
+import org.infinispan.config.parsing.XmlConfigHelper;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Modified: trunk/core/src/main/java/org/infinispan/config/RuntimeConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/RuntimeConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/RuntimeConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.config;
+package org.infinispan.config;
 
-import org.infinispan.remoting.RpcManager;
-import org.infinispan.util.Util;
+import org.infinispan.remoting.RpcManager;
+import org.infinispan.util.Util;
 
 import javax.transaction.TransactionManager;
 import java.util.concurrent.ExecutorService;

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/JGroupsStackParser.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/JGroupsStackParser.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/JGroupsStackParser.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.config.parsing;
+package org.infinispan.config.parsing;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/ParsedAttributes.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/ParsedAttributes.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/ParsedAttributes.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.config.parsing;
+package org.infinispan.config.parsing;
 
 import org.w3c.dom.Element;
 

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/RootElementBuilder.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/RootElementBuilder.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/RootElementBuilder.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.config.parsing;
+package org.infinispan.config.parsing;
 
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 import org.jboss.util.xml.JBossEntityResolver;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -46,17 +46,17 @@
 
    private static final JBossEntityResolver resolver = new JBossEntityResolver();
 
-   public static final String HORIZON_NS = "urn:infinispan:config:4.0";
+   public static final String HORIZON_NS = "urn:infinispan:config:4.0";
 
    static {
       // Globally register this namespace
-      JBossEntityResolver.registerEntity(HORIZON_NS, "infinispan-config-4.0.xsd");
+      JBossEntityResolver.registerEntity(HORIZON_NS, "infinispan-config-4.0.xsd");
    }
 
    private static final Log log = LogFactory.getLog(RootElementBuilder.class);
    private ErrorHandler errorHandler;
    private boolean isValidating;
-   public static final String VALIDATING_SYSTEM_PROPERTY = "infinispan.config.validate";
+   public static final String VALIDATING_SYSTEM_PROPERTY = "infinispan.config.validate";
 
    public RootElementBuilder(ErrorHandler errorHandler) {
       this.errorHandler = errorHandler;

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigHelper.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigHelper.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigHelper.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.config.parsing;
+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.config.ConfigurationException;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.util.BeanUtils;
+import org.infinispan.util.TypedProperties;
 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/XmlConfigurationParser.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParser.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParser.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.config.parsing;
+package org.infinispan.config.parsing;
 
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.config.GlobalConfiguration;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -51,9 +51,9 @@
 
    /**
     * GlobalConfiguration would also have a reference to the template default configuration, accessible via {@link
-    * org.infinispan.config.GlobalConfiguration#getDefaultConfiguration()}
+    * org.infinispan.config.GlobalConfiguration#getDefaultConfiguration()}
     * <p/>
-    * This is typically used to configure a {@link org.infinispan.manager.DefaultCacheManager}
+    * This is typically used to configure a {@link org.infinispan.manager.DefaultCacheManager}
     *
     * @return a GlobalConfiguration as parsed from the configuration file.
     */

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/XmlConfigurationParserImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,17 +1,17 @@
-package org.infinispan.config.parsing;
+package org.infinispan.config.parsing;
 
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.config.CustomInterceptorConfig;
-import org.infinispan.config.DuplicateCacheNameException;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.config.parsing.element.CustomInterceptorsElementParser;
-import org.infinispan.config.parsing.element.LoadersElementParser;
-import org.infinispan.lock.IsolationLevel;
-import org.infinispan.transaction.GenericTransactionManagerLookup;
-import org.infinispan.util.FileLookup;
-import org.infinispan.eviction.EvictionStrategy;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.config.CustomInterceptorConfig;
+import org.infinispan.config.DuplicateCacheNameException;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.config.parsing.element.CustomInterceptorsElementParser;
+import org.infinispan.config.parsing.element.LoadersElementParser;
+import org.infinispan.lock.IsolationLevel;
+import org.infinispan.transaction.GenericTransactionManagerLookup;
+import org.infinispan.util.FileLookup;
+import org.infinispan.eviction.EvictionStrategy;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
@@ -36,7 +36,7 @@
    // this parser will need to be initialized.
    boolean initialized = false;
 
-   // the root element, representing the <infinispan /> tag
+   // the root element, representing the <infinispan /> tag
    Element rootElement;
 
    GlobalConfiguration gc;
@@ -434,8 +434,8 @@
     * @return true of the element is a modern one and can be parsed using the current parser.
     */
    public boolean isValidElementRoot(Element element) {
-      // simply test for the "infinispan" element.
-      NodeList elements = element.getElementsByTagName("infinispan");
+      // simply test for the "infinispan" element.
+      NodeList elements = element.getElementsByTagName("infinispan");
       return elements != null && elements.getLength() > 0;
    }
 }

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/XmlParserBase.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/XmlParserBase.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/XmlParserBase.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.config.parsing;
+package org.infinispan.config.parsing;
 
 import org.jboss.util.StringPropertyReplacer;
 import org.w3c.dom.Element;

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/element/CustomInterceptorsElementParser.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/element/CustomInterceptorsElementParser.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/element/CustomInterceptorsElementParser.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,15 +19,15 @@
  * 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.config.parsing.element;
+package org.infinispan.config.parsing.element;
 
 
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.config.CustomInterceptorConfig;
-import org.infinispan.config.parsing.XmlConfigHelper;
-import org.infinispan.config.parsing.XmlParserBase;
-import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.util.Util;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.config.CustomInterceptorConfig;
+import org.infinispan.config.parsing.XmlConfigHelper;
+import org.infinispan.config.parsing.XmlParserBase;
+import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.util.Util;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/element/LoadersElementParser.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/element/LoadersElementParser.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/element/LoadersElementParser.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,18 +19,18 @@
  * 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.config.parsing.element;
+package org.infinispan.config.parsing.element;
 
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.config.parsing.XmlConfigHelper;
-import org.infinispan.config.parsing.XmlParserBase;
-import org.infinispan.loader.CacheLoader;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheStoreConfig;
-import org.infinispan.loader.decorators.AsyncStoreConfig;
-import org.infinispan.loader.decorators.SingletonStoreConfig;
-import org.infinispan.util.Util;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.config.parsing.XmlConfigHelper;
+import org.infinispan.config.parsing.XmlParserBase;
+import org.infinispan.loader.CacheLoader;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheStoreConfig;
+import org.infinispan.loader.decorators.AsyncStoreConfig;
+import org.infinispan.loader.decorators.SingletonStoreConfig;
+import org.infinispan.util.Util;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 

Modified: trunk/core/src/main/java/org/infinispan/container/DataContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/DataContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/DataContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.container;
+package org.infinispan.container;
 
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
 
 import java.util.Set;
 

Modified: trunk/core/src/main/java/org/infinispan/container/FIFODataContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/FIFODataContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/FIFODataContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.container;
+package org.infinispan.container;
 
 import net.jcip.annotations.ThreadSafe;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
 
 import java.util.AbstractSet;
 import java.util.Iterator;
@@ -23,7 +23,7 @@
  * auxillary node ideas expressed in John D. Valois' paper, <a href="http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.41.9506"><i>Lock-Free
  * Linked Lists Using Compare-and-Swap</i></a>.
  * <p/>
- * The locks maintained on linkable entrues are implemented using {@link org.infinispan.container.FIFODataContainer.SpinLock}s,
+ * The locks maintained on linkable entrues are implemented using {@link org.infinispan.container.FIFODataContainer.SpinLock}s,
  * and due to the nature of these spin locks, they should only be held for a minimal amount of time.
  *
  * @author Manik Surtani

Modified: trunk/core/src/main/java/org/infinispan/container/LRUDataContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/LRUDataContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/LRUDataContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,13 +1,13 @@
-package org.infinispan.container;
+package org.infinispan.container;
 
 import net.jcip.annotations.ThreadSafe;
-import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalCacheEntry;
 
 /**
  * A data container that exposes an iterator that is ordered based on least recently used (visited) entries first.
  * <p/>
- * This builds on the {@link org.infinispan.container.FIFODataContainer} by calling {@link
- * org.infinispan.container.LRUDataContainer#updateLinks(org.infinispan.container.FIFODataContainer.LinkedEntry)} even for
+ * This builds on the {@link org.infinispan.container.FIFODataContainer} by calling {@link
+ * org.infinispan.container.LRUDataContainer#updateLinks(org.infinispan.container.FIFODataContainer.LinkedEntry)} even for
  * {@link #get(Object)} invocations to make sure ordering is intact, as per LRU.
  * <p/>
  *

Modified: trunk/core/src/main/java/org/infinispan/container/SimpleDataContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/SimpleDataContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/SimpleDataContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.container;
+package org.infinispan.container;
 
 import net.jcip.annotations.ThreadSafe;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.factories.annotations.Stop;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.factories.annotations.Stop;
 
 import java.util.AbstractSet;
 import java.util.Arrays;

Modified: trunk/core/src/main/java/org/infinispan/container/entries/AbstractInternalCacheEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/AbstractInternalCacheEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/AbstractInternalCacheEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.container.entries;
+package org.infinispan.container.entries;
 
-import org.infinispan.container.DataContainer;
+import org.infinispan.container.DataContainer;
 
 import java.io.Serializable;
 

Modified: trunk/core/src/main/java/org/infinispan/container/entries/CacheEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/CacheEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/CacheEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.container.entries;
+package org.infinispan.container.entries;
 
-import org.infinispan.container.DataContainer;
+import org.infinispan.container.DataContainer;
 
 import java.io.Serializable;
 

Modified: trunk/core/src/main/java/org/infinispan/container/entries/ImmortalCacheEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/ImmortalCacheEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/ImmortalCacheEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.container.entries;
+package org.infinispan.container.entries;
 
 /**
  * A cache entry that is immortal/cannot expire

Modified: trunk/core/src/main/java/org/infinispan/container/entries/InternalCacheEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/InternalCacheEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/InternalCacheEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.container.entries;
+package org.infinispan.container.entries;
 
 /**
  * Interface for internal cache entries that expose whether an entry has expired.

Modified: trunk/core/src/main/java/org/infinispan/container/entries/InternalEntryFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/InternalEntryFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/InternalEntryFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.container.entries;
+package org.infinispan.container.entries;
 
 /**
  * A factory for internal entries

Modified: trunk/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/MVCCEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.container.entries;
+package org.infinispan.container.entries;
 
-import org.infinispan.container.DataContainer;
+import org.infinispan.container.DataContainer;
 
 /**
  * An entry that can be safely copied when updates are made, to provide MVCC semantics
@@ -14,7 +14,7 @@
     * 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}.
+    * {@link org.infinispan.lock.IsolationLevel#REPEATABLE_READ}.
     */
    void copyForUpdate(DataContainer container, boolean writeSkewCheck);
 }

Modified: trunk/core/src/main/java/org/infinispan/container/entries/MortalCacheEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/MortalCacheEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/MortalCacheEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.container.entries;
+package org.infinispan.container.entries;
 
 /**
  * A cache entry that is mortal.  I.e., has a lifespan.

Modified: trunk/core/src/main/java/org/infinispan/container/entries/NullMarkerEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/NullMarkerEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/NullMarkerEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.container.entries;
+package org.infinispan.container.entries;
 
-import org.infinispan.container.DataContainer;
+import org.infinispan.container.DataContainer;
 
 /**
  * A marker entry to represent a null for repeatable read, so that a read that returns a null can continue to return

Modified: trunk/core/src/main/java/org/infinispan/container/entries/NullMarkerEntryForRemoval.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/NullMarkerEntryForRemoval.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/NullMarkerEntryForRemoval.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.container.entries;
+package org.infinispan.container.entries;
 
 
 /**

Modified: trunk/core/src/main/java/org/infinispan/container/entries/ReadCommittedEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/ReadCommittedEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/ReadCommittedEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.container.entries;
+package org.infinispan.container.entries;
 
-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.container.DataContainer;
+import static org.infinispan.container.entries.ReadCommittedEntry.Flags.*;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 /**
  * A wrapper around a cached entry that encapsulates read committed semantics when writes are initiated, committed or

Modified: trunk/core/src/main/java/org/infinispan/container/entries/RepeatableReadEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/RepeatableReadEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/RepeatableReadEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,15 +19,15 @@
  * 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.container.entries;
+package org.infinispan.container.entries;
 
-import org.infinispan.CacheException;
-import org.infinispan.container.DataContainer;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.CacheException;
+import org.infinispan.container.DataContainer;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 /**
- * An extension of {@link org.infinispan.container.ReadCommittedEntry} that provides Repeatable Read semantics
+ * An extension of {@link org.infinispan.container.ReadCommittedEntry} that provides Repeatable Read semantics
  *
  * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/container/entries/TransientCacheEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/TransientCacheEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/TransientCacheEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.container.entries;
+package org.infinispan.container.entries;
 
 /**
  * A cache entry that is transient, i.e., it can be considered expired afer a period of not being used

Modified: trunk/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/container/entries/TransientMortalCacheEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.container.entries;
+package org.infinispan.container.entries;
 
 /**
  * A cache entry that is both transient and mortal.

Modified: trunk/core/src/main/java/org/infinispan/context/AbstractContext.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/AbstractContext.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/context/AbstractContext.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.context;
+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;
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.invocation.Flag;
+import org.infinispan.util.BidirectionalLinkedHashMap;
+import org.infinispan.util.BidirectionalMap;
 
 import java.util.Arrays;
 import java.util.Collection;

Modified: trunk/core/src/main/java/org/infinispan/context/EntryLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/EntryLookup.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/context/EntryLookup.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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;
+package org.infinispan.context;
 
-import org.infinispan.container.entries.CacheEntry;
-import org.infinispan.util.BidirectionalMap;
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.util.BidirectionalMap;
 
 import java.util.Map;
 

Modified: trunk/core/src/main/java/org/infinispan/context/FlagContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/FlagContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/context/FlagContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.context;
+package org.infinispan.context;
 
-import org.infinispan.invocation.Flag;
+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 org.infinispan.invocation.Flag}.
  *
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/context/InvocationContext.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/InvocationContext.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/context/InvocationContext.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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;
+package org.infinispan.context;
 
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.transaction.GlobalTransaction;
 
 import javax.transaction.Transaction;
 

Modified: trunk/core/src/main/java/org/infinispan/context/InvocationContextImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/InvocationContextImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/context/InvocationContextImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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;
+package org.infinispan.context;
 
-import org.infinispan.container.entries.CacheEntry;
-import org.infinispan.transaction.GlobalTransaction;
-import org.infinispan.transaction.TransactionTable;
-import org.infinispan.util.BidirectionalLinkedHashMap;
-import org.infinispan.util.BidirectionalMap;
-import org.infinispan.util.InfinispanCollections;
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.transaction.TransactionTable;
+import org.infinispan.util.BidirectionalLinkedHashMap;
+import org.infinispan.util.BidirectionalMap;
+import org.infinispan.util.InfinispanCollections;
 
 import javax.transaction.Transaction;
 import java.util.Map;

Modified: trunk/core/src/main/java/org/infinispan/context/TransactionContext.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/TransactionContext.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/context/TransactionContext.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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;
+package org.infinispan.context;
 
-import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.transaction.GlobalTransaction;
 
 import javax.transaction.Transaction;
 import java.util.List;

Modified: trunk/core/src/main/java/org/infinispan/context/TransactionContextImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/TransactionContextImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/context/TransactionContextImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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;
+package org.infinispan.context;
 
-import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.container.entries.CacheEntry;
-import org.infinispan.transaction.GlobalTransaction;
-import org.infinispan.util.BidirectionalLinkedHashMap;
+import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.util.BidirectionalLinkedHashMap;
 
 import javax.transaction.RollbackException;
 import javax.transaction.SystemException;

Modified: trunk/core/src/main/java/org/infinispan/distribution/ConsistentHash.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/ConsistentHash.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/distribution/ConsistentHash.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,10 @@
-package org.infinispan.distribution;
+package org.infinispan.distribution;
 
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.Address;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * A consistent hash algorithm

Modified: trunk/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.distribution;
+package org.infinispan.distribution;
 
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.util.Immutables;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.util.Immutables;
 
 import java.util.Collection;
 import java.util.HashMap;

Modified: trunk/core/src/main/java/org/infinispan/distribution/DistributionManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/DistributionManager.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/distribution/DistributionManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.distribution;
+package org.infinispan.distribution;
 
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
 
 /**
  * A component that manages the distribution of elements across a cache cluster

Modified: trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.distribution;
+package org.infinispan.distribution;
 
-import org.infinispan.Cache;
-import org.infinispan.commands.remote.ClusteredGetCommand;
-import org.infinispan.config.Configuration;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.annotations.Start;
-import org.infinispan.remoting.ResponseMode;
-import org.infinispan.remoting.RpcManager;
+import org.infinispan.Cache;
+import org.infinispan.commands.remote.ClusteredGetCommand;
+import org.infinispan.config.Configuration;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.remoting.ResponseMode;
+import org.infinispan.remoting.RpcManager;
 
 import java.util.List;
 

Modified: trunk/core/src/main/java/org/infinispan/eviction/EvictionManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/eviction/EvictionManager.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/eviction/EvictionManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,20 +1,20 @@
-package org.infinispan.eviction;
+package org.infinispan.eviction;
 
 import net.jcip.annotations.ThreadSafe;
-import org.infinispan.factories.annotations.NonVolatile;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.factories.annotations.NonVolatile;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
 
 /**
  * Central component that deals with eviction of cache entries.
  * <p />
  * Typically, {@link #processEviction()} is called periodically by the eviction thread (which can be configured using
- * {@link org.infinispan.config.Configuration#setEvictionWakeUpInterval(long)} and {@link org.infinispan.config.GlobalConfiguration#setEvictionScheduledExecutorFactoryClass(String)}).
+ * {@link org.infinispan.config.Configuration#setEvictionWakeUpInterval(long)} and {@link org.infinispan.config.GlobalConfiguration#setEvictionScheduledExecutorFactoryClass(String)}).
  * <p />
- * If the eviction thread is disabled - by setting {@link org.infinispan.config.Configuration#setEvictionWakeUpInterval (long)} to <tt>0</tt> -
+ * If the eviction thread is disabled - by setting {@link org.infinispan.config.Configuration#setEvictionWakeUpInterval (long)} to <tt>0</tt> -
  * then this method could be called directly, perhaps by any other maintenance thread that runs periodically in the application.
  * <p />
- * Note that this method is a no-op if the eviction strategy configured is {@link org.infinispan.eviction.EvictionStrategy#NONE}.
+ * Note that this method is a no-op if the eviction strategy configured is {@link org.infinispan.eviction.EvictionStrategy#NONE}.
  * <p />
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/eviction/EvictionManagerImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,19 +1,19 @@
-package org.infinispan.eviction;
+package org.infinispan.eviction;
 
 import net.jcip.annotations.ThreadSafe;
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.factories.KnownComponentNames;
-import org.infinispan.factories.annotations.ComponentName;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.annotations.Start;
-import org.infinispan.factories.annotations.Stop;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.factories.KnownComponentNames;
+import org.infinispan.factories.annotations.ComponentName;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.factories.annotations.Stop;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;

Modified: trunk/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/eviction/EvictionStrategy.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.eviction;
+package org.infinispan.eviction;
 
 /**
  * Supported eviction strategies

Modified: trunk/core/src/main/java/org/infinispan/executors/DefaultExecutorFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/executors/DefaultExecutorFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/executors/DefaultExecutorFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.executors;
+package org.infinispan.executors;
 
-import org.infinispan.util.TypedProperties;
+import org.infinispan.util.TypedProperties;
 
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;

Modified: trunk/core/src/main/java/org/infinispan/executors/DefaultScheduledExecutorFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/executors/DefaultScheduledExecutorFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/executors/DefaultScheduledExecutorFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.executors;
+package org.infinispan.executors;
 
 import java.util.Properties;
 import java.util.concurrent.Executors;

Modified: trunk/core/src/main/java/org/infinispan/executors/ExecutorFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/executors/ExecutorFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/executors/ExecutorFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.executors;
+package org.infinispan.executors;
 
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;

Modified: trunk/core/src/main/java/org/infinispan/executors/ScheduledExecutorFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/executors/ScheduledExecutorFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/executors/ScheduledExecutorFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.executors;
+package org.infinispan.executors;
 
 import java.util.Properties;
 import java.util.concurrent.ScheduledExecutorService;

Modified: trunk/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,15 +19,15 @@
  * 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.factories;
+package org.infinispan.factories;
 
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.config.GlobalConfiguration;
-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.config.ConfigurationException;
+import org.infinispan.config.GlobalConfiguration;
+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;
 
 /**
  * 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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,26 +19,26 @@
  * 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.factories;
+package org.infinispan.factories;
 
-import org.infinispan.CacheException;
-import org.infinispan.Version;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.config.RuntimeConfig;
-import org.infinispan.factories.annotations.ComponentName;
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.annotations.NonVolatile;
-import org.infinispan.factories.annotations.Start;
-import org.infinispan.factories.annotations.Stop;
-import org.infinispan.factories.scopes.Scope;
-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.CacheException;
+import org.infinispan.Version;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.config.RuntimeConfig;
+import org.infinispan.factories.annotations.ComponentName;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.NonVolatile;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.factories.annotations.Stop;
+import org.infinispan.factories.scopes.Scope;
+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 java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -64,13 +64,13 @@
  * <p/>
  * Default factories are treated as components too and will need to be wired before being used.
  * <p/>
- * The registry can exist in one of several states, as defined by the {@link org.infinispan.lifecycle.ComponentStatus}
+ * The registry can exist in one of several states, as defined by the {@link org.infinispan.lifecycle.ComponentStatus}
  * enumeration. In terms of the cache, state changes in the following manner: <ul> <li>INSTANTIATED - when first
  * constructed</li> <li>CONSTRUCTED - when created using the DefaultCacheFactory</li> <li>STARTED - when {@link
- * org.infinispan.Cache#start()} is called</li> <li>STOPPED - when {@link org.infinispan.Cache#stop()} is called</li> </ul>
+ * org.infinispan.Cache#start()} is called</li> <li>STOPPED - when {@link org.infinispan.Cache#stop()} is called</li> </ul>
  * <p/>
  * Cache configuration can only be changed and will only be reinjected if the cache is not in the {@link
- * org.infinispan.lifecycle.ComponentStatus#RUNNING} state.
+ * org.infinispan.lifecycle.ComponentStatus#RUNNING} state.
  *
  * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
  * @since 4.0
@@ -543,7 +543,7 @@
 
    /**
     * Creates the components needed by a cache instance and sets the cache status to {@link
-    * org.infinispan.lifecycle.ComponentStatus#INITIALIZING} when it is done.
+    * org.infinispan.lifecycle.ComponentStatus#INITIALIZING} when it is done.
     */
    private void init() {
       if (state.needToDestroyFailedCache())
@@ -559,7 +559,7 @@
 
    /**
     * This starts the components in the cache, connecting to channels, starting service threads, etc.  If the cache is
-    * not in the {@link org.infinispan.lifecycle.ComponentStatus#INITIALIZING} state, {@link #init()} will be invoked
+    * not in the {@link org.infinispan.lifecycle.ComponentStatus#INITIALIZING} state, {@link #init()} will be invoked
     * first.
     */
    public void start() {
@@ -584,8 +584,8 @@
    }
 
    /**
-    * Stops the cache and sets the cache status to {@link org.infinispan.lifecycle.ComponentStatus#TERMINATED} once it is
-    * done.  If the cache is not in the {@link org.infinispan.lifecycle.ComponentStatus#RUNNING} state, this is a no-op.
+    * Stops the cache and sets the cache status to {@link org.infinispan.lifecycle.ComponentStatus#TERMINATED} once it is
+    * done.  If the cache is not in the {@link org.infinispan.lifecycle.ComponentStatus#RUNNING} state, this is a no-op.
     */
    public void stop() {
       if (!state.stopAllowed()) {
@@ -612,9 +612,9 @@
 
    /**
     * Destroys the cache and frees up any resources.  Sets the cache status to {@link
-    * org.infinispan.lifecycle.ComponentStatus#TERMINATED} when it is done.
+    * org.infinispan.lifecycle.ComponentStatus#TERMINATED} when it is done.
     * <p/>
-    * If the cache is in {@link org.infinispan.lifecycle.ComponentStatus#RUNNING} when this method is called, it will first
+    * If the cache is in {@link org.infinispan.lifecycle.ComponentStatus#RUNNING} when this method is called, it will first
     * call {@link #stop()} to stop the cache.
     */
    private void destroy() {
@@ -724,11 +724,11 @@
    /**
     * Asserts whether invocations are allowed on the cache or not.  Returns <tt>true</tt> if invocations are to be
     * allowed, <tt>false</tt> otherwise.  If the origin of the call is remote and the cache status is {@link
-    * org.infinispan.lifecycle.ComponentStatus#INITIALIZING}, this method will block for up to {@link
+    * org.infinispan.lifecycle.ComponentStatus#INITIALIZING}, this method will block for up to {@link
     * Configuration#getStateRetrievalTimeout()} millis, checking for a valid state.
     *
-    * @param originLocal true if the call originates locally (i.e., from the {@link org.infinispan.CacheDelegate} or false
-    *                    if it originates remotely, i.e., from the {@link org.infinispan.remoting.InboundInvocationHandler}.
+    * @param originLocal true if the call originates locally (i.e., from the {@link org.infinispan.CacheDelegate} or false
+    *                    if it originates remotely, i.e., from the {@link org.infinispan.remoting.InboundInvocationHandler}.
     * @return true if invocations are allowed, false otherwise.
     */
    public boolean invocationsAllowed(boolean originLocal) {
@@ -757,7 +757,7 @@
    }
 
    /**
-    * Blocks until the current cache instance is in its {@link org.infinispan.lifecycle.ComponentStatus#RUNNING started}
+    * Blocks until the current cache instance is in its {@link org.infinispan.lifecycle.ComponentStatus#RUNNING started}
     * phase. Blocks for up to {@link Configuration#getStateRetrievalTimeout()} milliseconds, throwing an
     * IllegalStateException if the cache doesn't reach this state even after this maximum wait time.
     *

Modified: trunk/core/src/main/java/org/infinispan/factories/AbstractNamedCacheComponentFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/AbstractNamedCacheComponentFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/AbstractNamedCacheComponentFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.factories;
+package org.infinispan.factories;
 
-import org.infinispan.config.Configuration;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.config.Configuration;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
 
 /**
  * A component factory for creating components scoped per-cache.

Modified: trunk/core/src/main/java/org/infinispan/factories/AutoInstantiableFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/AutoInstantiableFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/AutoInstantiableFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.factories;
+package org.infinispan.factories;
 
 /**
  * Component factories that implement this interface can be instantiated automatically by component registries when
  * looking up components.  Typically, most component factories will implement this.  One known exception is the {@link
- * org.infinispan.factories.BootstrapFactory}.
+ * org.infinispan.factories.BootstrapFactory}.
  * <p/>
  * Anything implementing this interface should expose a public, no-arg constructor.
  * <p/>

Modified: trunk/core/src/main/java/org/infinispan/factories/BootstrapFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/BootstrapFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/BootstrapFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.factories;
+package org.infinispan.factories;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.Cache;
-import org.infinispan.CacheException;
-import org.infinispan.config.Configuration;
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.factories.annotations.NonVolatile;
+import org.infinispan.AdvancedCache;
+import org.infinispan.Cache;
+import org.infinispan.CacheException;
+import org.infinispan.config.Configuration;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.factories.annotations.NonVolatile;
 
 /**
  * Factory for setting up bootstrap components

Modified: trunk/core/src/main/java/org/infinispan/factories/ComponentRegistry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/ComponentRegistry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/ComponentRegistry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,16 +1,16 @@
-package org.infinispan.factories;
+package org.infinispan.factories;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.CacheException;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.factories.annotations.Inject;
-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.AdvancedCache;
+import org.infinispan.CacheException;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.factories.annotations.Inject;
+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 java.util.HashMap;
 import java.util.Map;

Modified: trunk/core/src/main/java/org/infinispan/factories/DataContainerFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/DataContainerFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/DataContainerFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.factories;
+package org.infinispan.factories;
 
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.SimpleDataContainer;
-import org.infinispan.container.FIFODataContainer;
-import org.infinispan.container.LRUDataContainer;
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.config.ConfigurationException;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.SimpleDataContainer;
+import org.infinispan.container.FIFODataContainer;
+import org.infinispan.container.LRUDataContainer;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.config.ConfigurationException;
 
 /**
  * Constructs the data container

Modified: trunk/core/src/main/java/org/infinispan/factories/DefaultCacheFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/DefaultCacheFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/DefaultCacheFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,15 +19,15 @@
  * 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.factories;
+package org.infinispan.factories;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.Cache;
-import org.infinispan.CacheDelegate;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.jmx.CacheJmxRegistration;
-import org.infinispan.manager.DefaultCacheManager;
+import org.infinispan.AdvancedCache;
+import org.infinispan.Cache;
+import org.infinispan.CacheDelegate;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.jmx.CacheJmxRegistration;
+import org.infinispan.manager.DefaultCacheManager;
 
 /**
  * Default implementation of the {@link CacheFactory} interface.

Modified: trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.factories;
+package org.infinispan.factories;
 
-import org.infinispan.commands.RemoteCommandFactory;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.marshall.Marshaller;
-import org.infinispan.marshall.VersionAwareMarshaller;
-import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
-import org.infinispan.remoting.InboundInvocationHandler;
+import org.infinispan.commands.RemoteCommandFactory;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.marshall.Marshaller;
+import org.infinispan.marshall.VersionAwareMarshaller;
+import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
+import org.infinispan.remoting.InboundInvocationHandler;
 
 /**
  * Factory for building global-scope components which have default empty constructors

Modified: trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,22 +19,22 @@
  * 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.factories;
+package org.infinispan.factories;
 
 
-import org.infinispan.batch.BatchContainer;
-import org.infinispan.commands.CommandsFactory;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.factories.context.ContextFactory;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.marshall.Marshaller;
-import org.infinispan.marshall.VersionAwareMarshaller;
-import org.infinispan.notifications.cachelistener.CacheNotifier;
-import org.infinispan.transaction.TransactionTable;
-import org.infinispan.transaction.TransactionLog;
-import org.infinispan.eviction.EvictionManager;
+import org.infinispan.batch.BatchContainer;
+import org.infinispan.commands.CommandsFactory;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.factories.context.ContextFactory;
+import org.infinispan.invocation.InvocationContextContainer;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.marshall.Marshaller;
+import org.infinispan.marshall.VersionAwareMarshaller;
+import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.transaction.TransactionTable;
+import org.infinispan.transaction.TransactionLog;
+import org.infinispan.eviction.EvictionManager;
 
 /**
  * Simple factory that just uses reflection and an empty constructor of the component type.

Modified: trunk/core/src/main/java/org/infinispan/factories/EntryFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/EntryFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/EntryFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.factories;
+package org.infinispan.factories;
 
-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.container.entries.CacheEntry;
+import org.infinispan.container.entries.MVCCEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.lock.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.lock.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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/EntryFactoryImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,26 +19,26 @@
  * 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.factories;
+package org.infinispan.factories;
 
-import org.infinispan.config.Configuration;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.CacheEntry;
-import org.infinispan.container.entries.MVCCEntry;
-import org.infinispan.container.entries.NullMarkerEntry;
-import org.infinispan.container.entries.NullMarkerEntryForRemoval;
-import org.infinispan.container.entries.ReadCommittedEntry;
-import org.infinispan.container.entries.RepeatableReadEntry;
-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.config.Configuration;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.container.entries.MVCCEntry;
+import org.infinispan.container.entries.NullMarkerEntry;
+import org.infinispan.container.entries.NullMarkerEntryForRemoval;
+import org.infinispan.container.entries.ReadCommittedEntry;
+import org.infinispan.container.entries.RepeatableReadEntry;
+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;
 
 public class EntryFactoryImpl implements EntryFactory {
    private boolean useRepeatableRead;
@@ -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.lock.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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,16 +1,16 @@
-package org.infinispan.factories;
+package org.infinispan.factories;
 
-import org.infinispan.CacheException;
-import org.infinispan.config.GlobalConfiguration;
-import static org.infinispan.config.GlobalConfiguration.ShutdownHookBehavior.DEFAULT;
-import static org.infinispan.config.GlobalConfiguration.ShutdownHookBehavior.REGISTER;
-import org.infinispan.factories.annotations.NonVolatile;
-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.CacheException;
+import org.infinispan.config.GlobalConfiguration;
+import static org.infinispan.config.GlobalConfiguration.ShutdownHookBehavior.DEFAULT;
+import static org.infinispan.config.GlobalConfiguration.ShutdownHookBehavior.REGISTER;
+import org.infinispan.factories.annotations.NonVolatile;
+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 javax.management.MBeanServerFactory;
 import java.util.ArrayList;

Modified: trunk/core/src/main/java/org/infinispan/factories/InterceptorChainFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/InterceptorChainFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/InterceptorChainFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,15 +19,15 @@
  * 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.factories;
+package org.infinispan.factories;
 
 
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.config.CustomInterceptorConfig;
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.interceptors.*;
-import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.config.CustomInterceptorConfig;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.interceptors.*;
+import org.infinispan.interceptors.base.CommandInterceptor;
 
 import java.util.List;
 

Modified: trunk/core/src/main/java/org/infinispan/factories/KnownComponentNames.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/KnownComponentNames.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/KnownComponentNames.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,15 +1,15 @@
-package org.infinispan.factories;
+package org.infinispan.factories;
 
 /**
- * Holder for known named component names.  To be used with {@link org.infinispan.factories.annotations.ComponentName}
+ * Holder for known named component names.  To be used with {@link org.infinispan.factories.annotations.ComponentName}
  * annotation.
  *
  * @author Manik Surtani
  * @since 4.0
  */
 public class KnownComponentNames {
-   public static final String ASYNC_SERIALIZATION_EXECUTOR = "org.infinispan.executors.serialization";
-   public static final String ASYNC_NOTIFICATION_EXECUTOR = "org.infinispan.executors.notification";
-   public static final String EVICTION_SCHEDULED_EXECUTOR = "org.infinispan.executors.eviction";
-   public static final String ASYNC_REPLICATION_QUEUE_EXECUTOR = "org.infinispan.executors.replicationQueue";
+   public static final String ASYNC_SERIALIZATION_EXECUTOR = "org.infinispan.executors.serialization";
+   public static final String ASYNC_NOTIFICATION_EXECUTOR = "org.infinispan.executors.notification";
+   public static final String EVICTION_SCHEDULED_EXECUTOR = "org.infinispan.executors.eviction";
+   public static final String ASYNC_REPLICATION_QUEUE_EXECUTOR = "org.infinispan.executors.replicationQueue";
 }

Modified: trunk/core/src/main/java/org/infinispan/factories/LockManagerFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/LockManagerFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/LockManagerFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.factories;
+package org.infinispan.factories;
 
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.lock.LockManager;
-import org.infinispan.lock.LockManagerImpl;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.lock.LockManager;
+import org.infinispan.lock.LockManagerImpl;
 
 /**
  * // TODO: MANIK: Document this

Modified: trunk/core/src/main/java/org/infinispan/factories/NamedComponentFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/NamedComponentFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/NamedComponentFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.factories;
+package org.infinispan.factories;
 
 /**
  * A specialized type of component factory that knows how to create named components, identified with the {@link
- * org.infinispan.factories.annotations.ComponentName} annotation on the classes requested in {@link
- * org.infinispan.factories.annotations.Inject} annotated methods.
+ * org.infinispan.factories.annotations.ComponentName} annotation on the classes requested in {@link
+ * org.infinispan.factories.annotations.Inject} annotated methods.
  *
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.factories;
+package org.infinispan.factories;
 
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.executors.ExecutorFactory;
-import org.infinispan.executors.ScheduledExecutorFactory;
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.util.Util;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.executors.ExecutorFactory;
+import org.infinispan.executors.ScheduledExecutorFactory;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.util.Util;
 
 import java.util.Properties;
 import java.util.concurrent.Executor;

Modified: trunk/core/src/main/java/org/infinispan/factories/ReplicationQueueFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/ReplicationQueueFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/ReplicationQueueFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.factories;
+package org.infinispan.factories;
 
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.remoting.ReplicationQueue;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.remoting.ReplicationQueue;
 
 /**
  * Factory for ReplicationQueue.

Modified: trunk/core/src/main/java/org/infinispan/factories/RpcManagerFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/RpcManagerFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/RpcManagerFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.factories;
+package org.infinispan.factories;
 
-import org.infinispan.config.RuntimeConfig;
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.remoting.RpcManager;
+import org.infinispan.config.RuntimeConfig;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.remoting.RpcManager;
 
 /**
  * An extension of the EmptyConstructorFactory that places a component in the {@link RuntimeConfig} after creating it.

Modified: trunk/core/src/main/java/org/infinispan/factories/StateTransferManagerFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/StateTransferManagerFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/StateTransferManagerFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.factories;
+package org.infinispan.factories;
 
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.statetransfer.StateTransferManagerImpl;
-import org.infinispan.statetransfer.StateTransferManager;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.statetransfer.StateTransferManagerImpl;
+import org.infinispan.statetransfer.StateTransferManager;
 
 /**
- * Constructs {@link org.infinispan.statetransfer.StateTransferManager} instances.
+ * Constructs {@link org.infinispan.statetransfer.StateTransferManager} instances.
  *
  * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.factories;
+package org.infinispan.factories;
 
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.transaction.BatchModeTransactionManager;
-import org.infinispan.transaction.TransactionManagerLookup;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.transaction.BatchModeTransactionManager;
+import org.infinispan.transaction.TransactionManagerLookup;
 
 import javax.transaction.TransactionManager;
 

Modified: trunk/core/src/main/java/org/infinispan/factories/TransportFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/TransportFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/TransportFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.factories;
+package org.infinispan.factories;
 
-import org.infinispan.CacheException;
-import org.infinispan.factories.annotations.DefaultFactoryFor;
-import org.infinispan.remoting.transport.Transport;
-import org.infinispan.util.Util;
+import org.infinispan.CacheException;
+import org.infinispan.factories.annotations.DefaultFactoryFor;
+import org.infinispan.remoting.transport.Transport;
+import org.infinispan.util.Util;
 
 /**
  * Factory for Transport implementations

Modified: trunk/core/src/main/java/org/infinispan/factories/annotations/ComponentName.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/annotations/ComponentName.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/annotations/ComponentName.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.factories.annotations;
+package org.infinispan.factories.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Modified: trunk/core/src/main/java/org/infinispan/factories/annotations/DefaultFactoryFor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/annotations/DefaultFactoryFor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/annotations/DefaultFactoryFor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.factories.annotations;
+package org.infinispan.factories.annotations;
 
 import static java.lang.annotation.ElementType.TYPE;
 import java.lang.annotation.Retention;

Modified: trunk/core/src/main/java/org/infinispan/factories/annotations/Inject.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/annotations/Inject.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/annotations/Inject.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.factories.annotations;
+package org.infinispan.factories.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Modified: trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/annotations/NonVolatile.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.factories.annotations;
+package org.infinispan.factories.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -27,10 +27,10 @@
 import java.lang.annotation.Target;
 
 /**
- * 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}
+ * 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
+ * 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.
  *

Modified: trunk/core/src/main/java/org/infinispan/factories/annotations/Start.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/annotations/Start.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/annotations/Start.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.factories.annotations;
+package org.infinispan.factories.annotations;
 
 import static java.lang.annotation.ElementType.METHOD;
 import java.lang.annotation.Retention;

Modified: trunk/core/src/main/java/org/infinispan/factories/annotations/Stop.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/annotations/Stop.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/annotations/Stop.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.factories.annotations;
+package org.infinispan.factories.annotations;
 
 import static java.lang.annotation.ElementType.METHOD;
 import java.lang.annotation.Retention;

Modified: trunk/core/src/main/java/org/infinispan/factories/context/ContextFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/context/ContextFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/context/ContextFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.factories.context;
+package org.infinispan.factories.context;
 
-import org.infinispan.context.InvocationContext;
-import org.infinispan.context.InvocationContextImpl;
-import org.infinispan.context.TransactionContext;
-import org.infinispan.context.TransactionContextImpl;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.context.InvocationContextImpl;
+import org.infinispan.context.TransactionContext;
+import org.infinispan.context.TransactionContextImpl;
 
 import javax.transaction.RollbackException;
 import javax.transaction.SystemException;

Modified: trunk/core/src/main/java/org/infinispan/factories/scopes/Scope.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/scopes/Scope.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/scopes/Scope.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.factories.scopes;
+package org.infinispan.factories.scopes;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Modified: trunk/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.factories.scopes;
+package org.infinispan.factories.scopes;
 
-import org.infinispan.util.ReflectionUtil;
+import org.infinispan.util.ReflectionUtil;
 
 /**
  * Retrieves the declated scope of a component

Modified: trunk/core/src/main/java/org/infinispan/factories/scopes/Scopes.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/scopes/Scopes.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/factories/scopes/Scopes.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.factories.scopes;
+package org.infinispan.factories.scopes;
 
 /**
  * The different scopes that can be declared for a component in the cache system.  If components are not bounded to a
@@ -10,14 +10,14 @@
  */
 public enum Scopes {
    /**
-    * Components bounded to this scope can only be created by a {@link org.infinispan.manager.DefaultCacheManager} and exist in
-    * the {@link org.infinispan.manager.DefaultCacheManager}'s {@link org.infinispan.factories.ComponentRegistry}.
+    * Components bounded to this scope can only be created by a {@link org.infinispan.manager.DefaultCacheManager} and exist in
+    * the {@link org.infinispan.manager.DefaultCacheManager}'s {@link org.infinispan.factories.ComponentRegistry}.
     */
    GLOBAL,
 
    /**
-    * Components bounded to this scope can only be created by a {@link org.infinispan.Cache} and exist in the {@link
-    * org.infinispan.Cache}'s {@link org.infinispan.factories.ComponentRegistry}.
+    * Components bounded to this scope can only be created by a {@link org.infinispan.Cache} and exist in the {@link
+    * org.infinispan.Cache}'s {@link org.infinispan.factories.ComponentRegistry}.
     */
    NAMED_CACHE;
 

Modified: trunk/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/ActivationInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,17 +1,17 @@
-package org.infinispan.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.factories.annotations.Start;
-import org.infinispan.jmx.annotations.ManagedAttribute;
-import org.infinispan.jmx.annotations.ManagedOperation;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.jmx.annotations.ManagedAttribute;
+import org.infinispan.jmx.annotations.ManagedOperation;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
 
 import java.util.concurrent.atomic.AtomicLong;
 

Modified: trunk/core/src/main/java/org/infinispan/interceptors/BaseTransactionalContextInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/BaseTransactionalContextInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/BaseTransactionalContextInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.context.InvocationContext;
-import org.infinispan.context.TransactionContext;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.transaction.GlobalTransaction;
-import org.infinispan.transaction.TransactionTable;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.context.TransactionContext;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.transaction.TransactionTable;
 
 import javax.transaction.Status;
 import javax.transaction.SystemException;

Modified: trunk/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/BatchingInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.batch.BatchContainer;
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.batch.BatchContainer;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.interceptors.base.CommandInterceptor;
 
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;

Modified: trunk/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,27 +19,27 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.write.InvalidateCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.MVCCEntry;
-import org.infinispan.container.entries.CacheEntry;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.factories.EntryFactory;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.annotations.Start;
-import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
-import org.infinispan.jmx.annotations.ManagedAttribute;
-import org.infinispan.jmx.annotations.ManagedOperation;
-import org.infinispan.loader.CacheLoader;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.write.InvalidateCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.MVCCEntry;
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.factories.EntryFactory;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
+import org.infinispan.jmx.annotations.ManagedAttribute;
+import org.infinispan.jmx.annotations.ManagedOperation;
+import org.infinispan.loader.CacheLoader;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.notifications.cachelistener.CacheNotifier;
 
 import java.util.concurrent.atomic.AtomicLong;
 

Modified: trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,18 +19,18 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.write.EvictCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.container.DataContainer;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
-import org.infinispan.jmx.annotations.ManagedAttribute;
-import org.infinispan.jmx.annotations.ManagedOperation;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.write.EvictCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.container.DataContainer;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
+import org.infinispan.jmx.annotations.ManagedAttribute;
+import org.infinispan.jmx.annotations.ManagedOperation;
 
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;

Modified: trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,39 +19,39 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.commands.AbstractVisitor;
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.container.entries.CacheEntry;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
-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.loader.CacheLoaderManager;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.modifications.Clear;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.loader.modifications.Remove;
-import org.infinispan.loader.modifications.Store;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.commands.AbstractVisitor;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
+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.loader.CacheLoaderManager;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.modifications.Clear;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.loader.modifications.Remove;
+import org.infinispan.loader.modifications.Store;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.transaction.GlobalTransaction;
 
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;

Modified: trunk/core/src/main/java/org/infinispan/interceptors/CallInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/CallInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/CallInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,21 +19,21 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
 
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.transaction.GlobalTransaction;
 
 import javax.transaction.Transaction;
 

Modified: trunk/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,19 +19,19 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.CacheException;
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.context.InvocationContext;
-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.CacheException;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.context.InvocationContext;
+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 java.util.ArrayList;
 import java.util.Collections;

Modified: trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,29 +19,29 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.commands.AbstractVisitor;
-import org.infinispan.commands.CommandsFactory;
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.DataWriteCommand;
-import org.infinispan.commands.write.InvalidateCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.commands.write.WriteCommand;
-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.BaseRpcInterceptor;
-import org.infinispan.jmx.annotations.ManagedAttribute;
-import org.infinispan.jmx.annotations.ManagedOperation;
-import org.infinispan.transaction.GlobalTransaction;
-import org.infinispan.transaction.TransactionTable;
+import org.infinispan.commands.AbstractVisitor;
+import org.infinispan.commands.CommandsFactory;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.DataWriteCommand;
+import org.infinispan.commands.write.InvalidateCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.commands.write.WriteCommand;
+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.BaseRpcInterceptor;
+import org.infinispan.jmx.annotations.ManagedAttribute;
+import org.infinispan.jmx.annotations.ManagedOperation;
+import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.transaction.TransactionTable;
 
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;

Modified: trunk/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,25 +19,25 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
 
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-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;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+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;
 
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;

Modified: trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/LockingInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,30 +19,30 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.read.SizeCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.EvictCommand;
-import org.infinispan.commands.write.InvalidateCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.CacheEntry;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.factories.EntryFactory;
-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.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.read.SizeCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.EvictCommand;
+import org.infinispan.commands.write.InvalidateCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.factories.EntryFactory;
+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 java.util.ArrayList;
 import java.util.Iterator;

Modified: trunk/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,15 +19,15 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.marshall.MarshalledValue;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.marshall.MarshalledValue;
 
 import java.io.IOException;
 import java.io.NotSerializableException;
@@ -39,15 +39,15 @@
 
 /**
  * Interceptor that handles the wrapping and unwrapping of cached data using {@link
- * org.infinispan.marshall.MarshalledValue}s. Known "excluded" types are not wrapped/unwrapped, which at this time include
+ * org.infinispan.marshall.MarshalledValue}s. Known "excluded" types are not wrapped/unwrapped, which at this time include
  * {@link String}, Java primitives and their Object wrappers, as well as arrays of excluded types.
  * <p/>
- * The {@link org.infinispan.marshall.MarshalledValue} wrapper handles lazy deserialization from byte array
+ * The {@link org.infinispan.marshall.MarshalledValue} wrapper handles lazy deserialization from byte array
  * representations.
  *
  * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
  * @author Mircea.Markus at jboss.com
- * @see org.infinispan.marshall.MarshalledValue
+ * @see org.infinispan.marshall.MarshalledValue
  * @since 4.0
  */
 public class MarshalledValueInterceptor extends CommandInterceptor {

Modified: trunk/core/src/main/java/org/infinispan/interceptors/NotificationInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/NotificationInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/NotificationInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.notifications.cachelistener.CacheNotifier;
 
 /**
  * The interceptor in charge of firing off notifications to cache listeners

Modified: trunk/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,18 +1,18 @@
-package org.infinispan.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.commands.write.EvictCommand;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.annotations.Start;
-import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
-import org.infinispan.jmx.annotations.ManagedAttribute;
-import org.infinispan.jmx.annotations.ManagedOperation;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.notifications.cachelistener.CacheNotifier;
+import org.infinispan.commands.write.EvictCommand;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
+import org.infinispan.jmx.annotations.ManagedAttribute;
+import org.infinispan.jmx.annotations.ManagedOperation;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.notifications.cachelistener.CacheNotifier;
 
 import java.util.concurrent.atomic.AtomicLong;
 

Modified: trunk/core/src/main/java/org/infinispan/interceptors/ReplicationInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/ReplicationInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/ReplicationInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,22 +19,22 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.config.Configuration;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.context.TransactionContext;
-import org.infinispan.interceptors.base.BaseRpcInterceptor;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.config.Configuration;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.context.TransactionContext;
+import org.infinispan.interceptors.base.BaseRpcInterceptor;
+import org.infinispan.transaction.GlobalTransaction;
 
 /**
  * Takes care of replicating modifications to other caches in a cluster. Also listens for prepare(), commit() and

Modified: trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,33 +19,33 @@
  * 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.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.CacheException;
-import org.infinispan.commands.CommandsFactory;
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.context.InvocationContext;
-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.InvocationContextContainer;
-import org.infinispan.invocation.Flag;
-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;
-import org.infinispan.transaction.GlobalTransaction;
-import org.infinispan.transaction.TransactionLog;
-import org.infinispan.transaction.TransactionTable;
-import org.infinispan.util.concurrent.ConcurrentHashSet;
+import org.infinispan.CacheException;
+import org.infinispan.commands.CommandsFactory;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.context.InvocationContext;
+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.InvocationContextContainer;
+import org.infinispan.invocation.Flag;
+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;
+import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.transaction.TransactionLog;
+import org.infinispan.transaction.TransactionTable;
+import org.infinispan.util.concurrent.ConcurrentHashSet;
 
 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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,23 +19,23 @@
  * 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.interceptors.base;
+package org.infinispan.interceptors.base;
 
-import org.infinispan.commands.CacheRpcCommand;
-import org.infinispan.commands.CommandsFactory;
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.commands.remote.ReplicateCommand;
-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.RpcManager;
-import org.infinispan.remoting.ReplicationQueue;
-import org.infinispan.remoting.ResponseMode;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.transaction.GlobalTransaction;
-import org.infinispan.transaction.TransactionTable;
+import org.infinispan.commands.CacheRpcCommand;
+import org.infinispan.commands.CommandsFactory;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.commands.remote.ReplicateCommand;
+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.RpcManager;
+import org.infinispan.remoting.ReplicationQueue;
+import org.infinispan.remoting.ResponseMode;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.transaction.TransactionTable;
 
 import javax.transaction.Transaction;
 import java.util.List;

Modified: trunk/core/src/main/java/org/infinispan/interceptors/base/CommandInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/base/CommandInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/base/CommandInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,42 +19,42 @@
  * 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.interceptors.base;
+package org.infinispan.interceptors.base;
 
-import org.infinispan.commands.AbstractVisitor;
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.config.Configuration;
-import org.infinispan.context.InvocationContext;
-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.commands.AbstractVisitor;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.config.Configuration;
+import org.infinispan.context.InvocationContext;
+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;
 
 /**
- * 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.
+ * 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
+ * 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.interceptors.InterceptorChain} helper class.
+ * 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
+ * {@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
- * @see org.infinispan.commands.VisitableCommand
- * @see org.infinispan.commands.Visitor
- * @see org.infinispan.interceptors.InterceptorChain
+ * @see org.infinispan.commands.VisitableCommand
+ * @see org.infinispan.commands.Visitor
+ * @see org.infinispan.interceptors.InterceptorChain
  * @since 4.0
  */
 @Scope(Scopes.NAMED_CACHE)

Modified: trunk/core/src/main/java/org/infinispan/interceptors/base/JmxStatsCommandInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/base/JmxStatsCommandInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/base/JmxStatsCommandInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.interceptors.base;
+package org.infinispan.interceptors.base;
 
-import org.infinispan.factories.annotations.Start;
-import org.infinispan.jmx.JmxStatisticsExposer;
-import org.infinispan.jmx.annotations.ManagedAttribute;
-import org.infinispan.jmx.annotations.ManagedOperation;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.jmx.JmxStatisticsExposer;
+import org.infinispan.jmx.annotations.ManagedAttribute;
+import org.infinispan.jmx.annotations.ManagedOperation;
 
 /**
  * Base class for all the interceptors exposing management statistics.

Modified: trunk/core/src/main/java/org/infinispan/interceptors/base/PrePostProcessingCommandInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/base/PrePostProcessingCommandInterceptor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/interceptors/base/PrePostProcessingCommandInterceptor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,21 +19,21 @@
  * 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.interceptors.base;
+package org.infinispan.interceptors.base;
 
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.read.SizeCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.tx.RollbackCommand;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.EvictCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-import org.infinispan.commands.write.RemoveCommand;
-import org.infinispan.commands.write.ReplaceCommand;
-import org.infinispan.context.InvocationContext;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.read.SizeCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.tx.RollbackCommand;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.EvictCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
+import org.infinispan.context.InvocationContext;
 
 /**
  * This interceptor adds pre and post processing to each <tt>visitXXX()</tt> method.

Modified: trunk/core/src/main/java/org/infinispan/invocation/Flag.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/invocation/Flag.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/invocation/Flag.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.invocation;
+package org.infinispan.invocation;
 
 /**
- * Available flags, which may be set on a per-invocation basis.  These are provided using the {@link org.infinispan.AdvancedCache}
+ * 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.
  *
  * @author Manik Surtani

Modified: trunk/core/src/main/java/org/infinispan/invocation/InvocationContextContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/invocation/InvocationContextContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/invocation/InvocationContextContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.invocation;
+package org.infinispan.invocation;
 
-import org.infinispan.context.InvocationContext;
-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;
+import org.infinispan.context.InvocationContext;
+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;
 
 
 /**

Modified: trunk/core/src/main/java/org/infinispan/io/ByteBuffer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/io/ByteBuffer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/io/ByteBuffer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.io;
+package org.infinispan.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

Modified: trunk/core/src/main/java/org/infinispan/io/ExposedByteArrayOutputStream.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/io/ExposedByteArrayOutputStream.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/io/ExposedByteArrayOutputStream.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.io;
+package org.infinispan.io;
 
 import net.jcip.annotations.NotThreadSafe;
 

Modified: trunk/core/src/main/java/org/infinispan/io/UnclosableObjectInputStream.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/io/UnclosableObjectInputStream.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/io/UnclosableObjectInputStream.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.io;
+package org.infinispan.io;
 
 import java.io.IOException;
 import java.io.ObjectInput;

Modified: trunk/core/src/main/java/org/infinispan/io/UnclosableObjectOutputStream.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/io/UnclosableObjectOutputStream.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/io/UnclosableObjectOutputStream.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.io;
+package org.infinispan.io;
 
 import java.io.IOException;
 import java.io.ObjectOutput;

Modified: trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/jmx/CacheJmxRegistration.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,21 +19,21 @@
  * 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.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.CacheException;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.factories.AbstractComponentRegistry;
-import org.infinispan.factories.GlobalComponentRegistry;
-import org.infinispan.factories.annotations.Inject;
-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.AdvancedCache;
+import org.infinispan.CacheException;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.factories.AbstractComponentRegistry;
+import org.infinispan.factories.GlobalComponentRegistry;
+import org.infinispan.factories.annotations.Inject;
+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 javax.management.MBeanServer;
 import java.util.Set;

Modified: trunk/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/jmx/CacheManagerJmxRegistration.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.factories.AbstractComponentRegistry;
-import org.infinispan.factories.GlobalComponentRegistry;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.annotations.NonVolatile;
-import org.infinispan.factories.annotations.Start;
-import org.infinispan.factories.annotations.Stop;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.factories.AbstractComponentRegistry;
+import org.infinispan.factories.GlobalComponentRegistry;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.NonVolatile;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.factories.annotations.Stop;
 
 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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/jmx/ComponentsJmxRegistration.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.jmx;
+package org.infinispan.jmx;
 
-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.CacheException;
+import org.infinispan.factories.AbstractComponentRegistry;
+import org.infinispan.factories.ComponentRegistry;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import javax.management.InstanceAlreadyExistsException;
 import javax.management.MBeanServer;

Modified: trunk/core/src/main/java/org/infinispan/jmx/JmxDomainConflictException.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/JmxDomainConflictException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/jmx/JmxDomainConflictException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.CacheException;
+import org.infinispan.CacheException;
 
 /**
  * @author Mircea.Markus at jboss.com

Modified: trunk/core/src/main/java/org/infinispan/jmx/JmxStatisticsExposer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/JmxStatisticsExposer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/jmx/JmxStatisticsExposer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
 /**
  * Interface containing common cache management operations

Modified: trunk/core/src/main/java/org/infinispan/jmx/MBeanServerLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/MBeanServerLookup.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/jmx/MBeanServerLookup.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
 import javax.management.MBeanServer;
 
@@ -6,7 +6,7 @@
  * Implementors of this should return an MBeanServer to which MBeans will be registered.
  *
  * @author Mircea.Markus at jboss.com
- * @see org.infinispan.jmx.PlatformMBeanServerLookup
+ * @see org.infinispan.jmx.PlatformMBeanServerLookup
  * @since 4.0
  */
 public interface MBeanServerLookup {

Modified: trunk/core/src/main/java/org/infinispan/jmx/PlatformMBeanServerLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/PlatformMBeanServerLookup.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/jmx/PlatformMBeanServerLookup.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
 import javax.management.MBeanServer;
 import java.lang.management.ManagementFactory;

Modified: trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.jmx;
+package org.infinispan.jmx;
 
-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.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 javax.management.Attribute;
 import javax.management.AttributeList;

Modified: trunk/core/src/main/java/org/infinispan/jmx/annotations/MBean.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/annotations/MBean.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/jmx/annotations/MBean.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.jmx.annotations;
+package org.infinispan.jmx.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -29,8 +29,8 @@
 
 /**
  * Classes anotaded with this will be exposed as MBeans. If you are looking for more fined grained way of exposing jmx
- * attributes/operations, take a look at {@link org.infinispan.jmx.annotations.ManagedAttribute} and {@link
- * org.infinispan.jmx.annotations.ManagedOperation}
+ * attributes/operations, take a look at {@link org.infinispan.jmx.annotations.ManagedAttribute} and {@link
+ * org.infinispan.jmx.annotations.ManagedOperation}
  *
  * @author Mircea.Markus at jboss.com
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/jmx/annotations/ManagedAttribute.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/annotations/ManagedAttribute.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/jmx/annotations/ManagedAttribute.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.jmx.annotations;
+package org.infinispan.jmx.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Modified: trunk/core/src/main/java/org/infinispan/jmx/annotations/ManagedOperation.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/annotations/ManagedOperation.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/jmx/annotations/ManagedOperation.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.jmx.annotations;
+package org.infinispan.jmx.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Modified: trunk/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/lifecycle/ComponentStatus.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,16 +19,16 @@
  * 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.lifecycle;
+package org.infinispan.lifecycle;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 /**
  * Different states a component may be in.
  *
  * @author Manik Surtani
- * @see org.infinispan.lifecycle.Lifecycle
+ * @see org.infinispan.lifecycle.Lifecycle
  * @since 4.0
  */
 public enum ComponentStatus {

Modified: trunk/core/src/main/java/org/infinispan/lifecycle/Lifecycle.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/lifecycle/Lifecycle.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/lifecycle/Lifecycle.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.lifecycle;
+package org.infinispan.lifecycle;
 
 /**
  * Lifecycle interface that defines the lifecycle of components

Modified: trunk/core/src/main/java/org/infinispan/loader/AbstractCacheLoader.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/AbstractCacheLoader.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/AbstractCacheLoader.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
 /**
- * An abstract {@link org.infinispan.loader.CacheLoader} that holds common implementations for some methods
+ * An abstract {@link org.infinispan.loader.CacheLoader} that holds common implementations for some methods
  *
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/loader/AbstractCacheLoaderConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/AbstractCacheLoaderConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/AbstractCacheLoaderConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.CacheException;
-import org.infinispan.config.PluggableConfigurationComponent;
+import org.infinispan.CacheException;
+import org.infinispan.config.PluggableConfigurationComponent;
 
 /**
  * Abstract base class for CacheLoaderConfigs.

Modified: trunk/core/src/main/java/org/infinispan/loader/AbstractCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/AbstractCacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/AbstractCacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,13 +1,13 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.Cache;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.loader.modifications.Remove;
-import org.infinispan.loader.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.Cache;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.loader.modifications.Remove;
+import org.infinispan.loader.modifications.Store;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.marshall.Marshaller;
+import org.infinispan.util.concurrent.WithinThreadExecutor;
 
 import javax.transaction.Transaction;
 import java.io.InputStream;
@@ -20,7 +20,7 @@
 import java.util.concurrent.Executors;
 
 /**
- * An abstract {@link org.infinispan.loader.CacheStore} that holds common implementations for some methods
+ * An abstract {@link org.infinispan.loader.CacheStore} that holds common implementations for some methods
  *
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/loader/AbstractCacheStoreConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/AbstractCacheStoreConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/AbstractCacheStoreConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,15 +1,15 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.config.PluggableConfigurationComponent;
-import org.infinispan.loader.decorators.AsyncStoreConfig;
-import org.infinispan.loader.decorators.SingletonStoreConfig;
-import org.infinispan.util.Util;
+import org.infinispan.config.PluggableConfigurationComponent;
+import org.infinispan.loader.decorators.AsyncStoreConfig;
+import org.infinispan.loader.decorators.SingletonStoreConfig;
+import org.infinispan.util.Util;
 
 /**
  * Configures {@link AbstractCacheStore}.  This allows you to tune a number of characteristics of the {@link
  * AbstractCacheStore}.
  * <p/>
- * <ul> <li><tt>purgeSynchronously</tt> - whether {@link org.infinispan.loader.CacheStore#purgeExpired()} calls happen
+ * <ul> <li><tt>purgeSynchronously</tt> - whether {@link org.infinispan.loader.CacheStore#purgeExpired()} calls happen
  * synchronously or not.  By default, this is set to <tt>false</tt>.</li>
  * <p/>
  * </ul>

Modified: trunk/core/src/main/java/org/infinispan/loader/CacheLoader.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/CacheLoader.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/CacheLoader.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.marshall.Marshaller;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.marshall.Marshaller;
 
 import java.util.Set;
 
@@ -15,7 +15,7 @@
 public interface CacheLoader {
 
    /**
-    * Used to initialize a cache loader.  Typically invoked by the {@link org.infinispan.loader.CacheLoaderManager} when
+    * Used to initialize a cache loader.  Typically invoked by the {@link org.infinispan.loader.CacheLoaderManager} when
     * setting up cache loaders.
     *
     * @param config the cache loader configuration bean
@@ -56,8 +56,8 @@
 
 
    /**
-    * @return the type of the {@link org.infinispan.loader.CacheLoaderConfig} bean used to configure this implementation of
-    *         {@link org.infinispan.loader.CacheLoader}
+    * @return the type of the {@link org.infinispan.loader.CacheLoaderConfig} bean used to configure this implementation of
+    *         {@link org.infinispan.loader.CacheLoader}
     */
    Class<? extends CacheLoaderConfig> getConfigurationClass();
 }

Modified: trunk/core/src/main/java/org/infinispan/loader/CacheLoaderConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/CacheLoaderConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/CacheLoaderConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
 /**
  * Configures individual cache loaders

Modified: trunk/core/src/main/java/org/infinispan/loader/CacheLoaderException.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/CacheLoaderException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/CacheLoaderException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
 /**
  * An exception thrown by a {@link CacheLoader} implementation if there are problems reading from a loader.

Modified: trunk/core/src/main/java/org/infinispan/loader/CacheLoaderManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/CacheLoaderManager.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/CacheLoaderManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.lifecycle.Lifecycle;
+import org.infinispan.lifecycle.Lifecycle;
 
 /**
  * The cache loader manager interface

Modified: trunk/core/src/main/java/org/infinispan/loader/CacheLoaderManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/CacheLoaderManagerImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/CacheLoaderManagerImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,25 +1,25 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.Cache;
-import org.infinispan.CacheException;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.container.entries.InternalCacheEntry;
-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.loader.decorators.AsyncStore;
-import org.infinispan.loader.decorators.ChainingCacheStore;
-import org.infinispan.loader.decorators.ReadOnlyStore;
-import org.infinispan.loader.decorators.SingletonStore;
-import org.infinispan.loader.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.Cache;
+import org.infinispan.CacheException;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.container.entries.InternalCacheEntry;
+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.loader.decorators.AsyncStore;
+import org.infinispan.loader.decorators.ChainingCacheStore;
+import org.infinispan.loader.decorators.ReadOnlyStore;
+import org.infinispan.loader.decorators.SingletonStore;
+import org.infinispan.loader.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 java.util.Set;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;

Modified: trunk/core/src/main/java/org/infinispan/loader/CacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/CacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/CacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.modifications.Modification;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.modifications.Modification;
 
 import javax.transaction.Transaction;
 import java.io.ObjectInput;
@@ -28,7 +28,7 @@
    /**
     * Writes contents of the stream to the store.  Implementations should expect that the stream contains data in an
     * implementation-specific format, typically generated using {@link #toStream(java.io.ObjectOutput)}.  While not a
-    * requirement, it is recommended that implementations make use of the {@link org.infinispan.marshall.Marshaller} when
+    * requirement, it is recommended that implementations make use of the {@link org.infinispan.marshall.Marshaller} when
     * dealing with the stream to make use of efficient marshalling.
     * <p/>
     * It is imperative that implementations <b><i>do not</i></b> close the stream after finishing with it.
@@ -52,7 +52,7 @@
     * implementation. Typically read and parsed by {@link #fromStream(java.io.ObjectInput)}.
     * <p/>
     * While not a requirement, it is recommended that implementations make use of the {@link
-    * org.infinispan.marshall.Marshaller} when dealing with the stream to make use of efficient marshalling.
+    * org.infinispan.marshall.Marshaller} when dealing with the stream to make use of efficient marshalling.
     * <p/>
     * It is imperative that implementations <b><i>do not</i></b> flush or close the stream after finishing with it.
     * <p/>

Modified: trunk/core/src/main/java/org/infinispan/loader/CacheStoreConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/CacheStoreConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/CacheStoreConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.loader.decorators.SingletonStoreConfig;
-import org.infinispan.loader.decorators.AsyncStoreConfig;
+import org.infinispan.loader.decorators.SingletonStoreConfig;
+import org.infinispan.loader.decorators.AsyncStoreConfig;
 
 /**
  * Defines config elements for all CacheStoreConfigs.

Modified: trunk/core/src/main/java/org/infinispan/loader/LockSupportCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/LockSupportCacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/LockSupportCacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,27 +1,27 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-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.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 java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.util.Set;
 
 /**
- * This class extends {@link org.infinispan.loader.AbstractCacheStore} adding lock support for consistently acceessing
+ * This class extends {@link org.infinispan.loader.AbstractCacheStore} adding lock support for consistently acceessing
  * stored data.
  * <p/>
  * In-memory locking is needed by aggregation operations(e.g. loadAll, toStream, fromStream) to make sure that
  * 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
+ * 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
- * org.infinispan.loader.LockSupportCacheStore#setLockConcurrencyLevel(int)} setter.
+ * org.infinispan.loader.LockSupportCacheStore#setLockConcurrencyLevel(int)} setter.
  * <p/>
  *
  * @author Mircea.Markus at jboss.com

Modified: trunk/core/src/main/java/org/infinispan/loader/LockSupportCacheStoreConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/LockSupportCacheStoreConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/LockSupportCacheStoreConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
 /**
  * Adds configuration support for {@link LockSupportCacheStore}.

Modified: trunk/core/src/main/java/org/infinispan/loader/bucket/Bucket.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/bucket/Bucket.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/bucket/Bucket.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.loader.bucket;
+package org.infinispan.loader.bucket;
 
-import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalCacheEntry;
 
 import java.io.Externalizable;
 import java.io.IOException;

Modified: trunk/core/src/main/java/org/infinispan/loader/bucket/BucketBasedCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/bucket/BucketBasedCacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/bucket/BucketBasedCacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.loader.bucket;
+package org.infinispan.loader.bucket;
 
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.LockSupportCacheStore;
-import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.LockSupportCacheStore;
+import org.infinispan.container.entries.InternalCacheEntry;
 
 /**
  * Base class for cache store that want to use the 'buckets approach' for storing data.
@@ -77,7 +77,7 @@
    }
 
    /**
-    * For {@link org.infinispan.loader.bucket.BucketBasedCacheStore}s the lock should be acquired at bucket level. So we're
+    * For {@link org.infinispan.loader.bucket.BucketBasedCacheStore}s the lock should be acquired at bucket level. So we're
     * locking based on the hashCode of the key, as all keys having same hascode will be mapped to same bucket.
     */
    protected String getLockFromKey(Object key) {

Modified: trunk/core/src/main/java/org/infinispan/loader/cluster/ClusterCacheLoader.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/cluster/ClusterCacheLoader.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/cluster/ClusterCacheLoader.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,21 +1,21 @@
-package org.infinispan.loader.cluster;
+package org.infinispan.loader.cluster;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.Cache;
-import org.infinispan.commands.remote.ClusteredGetCommand;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.lifecycle.ComponentStatus;
-import org.infinispan.loader.AbstractCacheLoader;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.marshall.Marshaller;
-import org.infinispan.remoting.RpcManager;
-import org.infinispan.remoting.ResponseFilter;
-import org.infinispan.remoting.ResponseMode;
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.AdvancedCache;
+import org.infinispan.Cache;
+import org.infinispan.commands.remote.ClusteredGetCommand;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.lifecycle.ComponentStatus;
+import org.infinispan.loader.AbstractCacheLoader;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.marshall.Marshaller;
+import org.infinispan.remoting.RpcManager;
+import org.infinispan.remoting.ResponseFilter;
+import org.infinispan.remoting.ResponseMode;
+import org.infinispan.remoting.transport.Address;
 
 import java.util.ArrayList;
 import java.util.Collections;

Modified: trunk/core/src/main/java/org/infinispan/loader/cluster/ClusterCacheLoaderConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/cluster/ClusterCacheLoaderConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/cluster/ClusterCacheLoaderConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.loader.cluster;
+package org.infinispan.loader.cluster;
 
-import org.infinispan.loader.AbstractCacheLoaderConfig;
+import org.infinispan.loader.AbstractCacheLoaderConfig;
 
 /**
- * Configuration for {@link org.infinispan.loader.cluster.ClusterCacheLoader}.
+ * Configuration for {@link org.infinispan.loader.cluster.ClusterCacheLoader}.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/core/src/main/java/org/infinispan/loader/decorators/AbstractDelegatingStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/decorators/AbstractDelegatingStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/decorators/AbstractDelegatingStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.loader.decorators;
+package org.infinispan.loader.decorators;
 
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.marshall.Marshaller;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.marshall.Marshaller;
 
 import javax.transaction.Transaction;
 import java.io.ObjectInput;

Modified: trunk/core/src/main/java/org/infinispan/loader/decorators/AsyncStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/decorators/AsyncStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/decorators/AsyncStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,16 +1,16 @@
-package org.infinispan.loader.decorators;
+package org.infinispan.loader.decorators;
 
-import org.infinispan.CacheException;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.modifications.Clear;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.loader.modifications.PurgeExpired;
-import org.infinispan.loader.modifications.Remove;
-import org.infinispan.loader.modifications.Store;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.CacheException;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.modifications.Clear;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.loader.modifications.PurgeExpired;
+import org.infinispan.loader.modifications.Remove;
+import org.infinispan.loader.modifications.Store;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: trunk/core/src/main/java/org/infinispan/loader/decorators/AsyncStoreConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/decorators/AsyncStoreConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/decorators/AsyncStoreConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.loader.decorators;
+package org.infinispan.loader.decorators;
 
-import org.infinispan.config.AbstractNamedCacheConfigurationBean;
+import org.infinispan.config.AbstractNamedCacheConfigurationBean;
 
 /**
  * Configuration for the async cache loader

Modified: trunk/core/src/main/java/org/infinispan/loader/decorators/ChainingCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/decorators/ChainingCacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/decorators/ChainingCacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.loader.decorators;
+package org.infinispan.loader.decorators;
 
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.CacheLoader;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.CacheStoreConfig;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.marshall.Marshaller;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.CacheLoader;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.CacheStoreConfig;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.marshall.Marshaller;
 
 import javax.transaction.Transaction;
 import java.io.ObjectInput;

Modified: trunk/core/src/main/java/org/infinispan/loader/decorators/ReadOnlyStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/decorators/ReadOnlyStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/decorators/ReadOnlyStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,15 +1,15 @@
-package org.infinispan.loader.decorators;
+package org.infinispan.loader.decorators;
 
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.container.entries.InternalCacheEntry;
 
 import javax.transaction.Transaction;
 import java.io.ObjectInput;
 import java.util.List;
 
 /**
- * A decorator that makes the underlying store a {@link org.infinispan.loader.CacheLoader}, i.e., suppressing all write
+ * A decorator that makes the underlying store a {@link org.infinispan.loader.CacheLoader}, i.e., suppressing all write
  * methods.
  *
  * @author Manik Surtani

Modified: trunk/core/src/main/java/org/infinispan/loader/decorators/SingletonStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/decorators/SingletonStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/decorators/SingletonStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,20 +1,20 @@
-package org.infinispan.loader.decorators;
+package org.infinispan.loader.decorators;
 
-import org.infinispan.Cache;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.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;
-import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
-import org.infinispan.notifications.cachemanagerlistener.event.Event;
-import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.Cache;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.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;
+import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
+import org.infinispan.notifications.cachemanagerlistener.event.Event;
+import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
+import org.infinispan.remoting.transport.Address;
 
 import javax.transaction.Transaction;
 import java.io.ObjectInput;

Modified: trunk/core/src/main/java/org/infinispan/loader/decorators/SingletonStoreConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/decorators/SingletonStoreConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/decorators/SingletonStoreConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.loader.decorators;
+package org.infinispan.loader.decorators;
 
-import org.infinispan.config.AbstractNamedCacheConfigurationBean;
+import org.infinispan.config.AbstractNamedCacheConfigurationBean;
 
 /**
  * Configuration for a singleton store

Modified: trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,22 +1,22 @@
-package org.infinispan.loader.file;
+package org.infinispan.loader.file;
 
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.bucket.Bucket;
-import org.infinispan.loader.bucket.BucketBasedCacheStore;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.marshall.Marshaller;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.bucket.Bucket;
+import org.infinispan.loader.bucket.BucketBasedCacheStore;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.marshall.Marshaller;
 
 import java.io.*;
 import java.util.HashSet;
 import java.util.Set;
 
 /**
- * A filesystem-based implementation of a {@link org.infinispan.loader.bucket.BucketBasedCacheStore}.  This file store stores stuff in the
+ * A filesystem-based implementation of a {@link org.infinispan.loader.bucket.BucketBasedCacheStore}.  This file store stores stuff in the
  * following format: <tt>/{location}/cache name/bucket_number.bucket</tt>
  *
  * @author Manik Surtani
@@ -33,7 +33,7 @@
    File root;
 
    /**
-    * @return root directory where all files for this {@link org.infinispan.loader.CacheStore CacheStore} are written.
+    * @return root directory where all files for this {@link org.infinispan.loader.CacheStore CacheStore} are written.
     */
    public File getRoot() {
       return root;

Modified: trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStoreConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStoreConfig.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStoreConfig.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.loader.file;
+package org.infinispan.loader.file;
 
-import org.infinispan.loader.LockSupportCacheStoreConfig;
+import org.infinispan.loader.LockSupportCacheStoreConfig;
 
 /**
- * Configures {@link org.infinispan.loader.file.FileCacheStore}.  This allows you to tune a number of characteristics of
+ * Configures {@link org.infinispan.loader.file.FileCacheStore}.  This allows you to tune a number of characteristics of
  * the {@link FileCacheStore}.
  * <p/>
  * <ul> <li><tt>location</tt> - a location on disk where the store can write internal files.  This defaults to
  * <tt>Infinispan-FileCacheStore</tt> in the current working directory.</li> <li><tt>purgeSynchronously</tt> - whether
- * {@link org.infinispan.loader.CacheStore#purgeExpired()} calls happen synchronously or not.  By default, this is set to
+ * {@link org.infinispan.loader.CacheStore#purgeExpired()} calls happen synchronously or not.  By default, this is set to
  * <tt>false</tt>.</li> <li><tt>streamBufferSize</tt> - when writing state to disk, a buffered stream is used.  This
  * parameter allows you to tune the buffer size.  Larger buffers are usually faster but take up more (temporary) memory,
  * resulting in more gc. By default, this is set to <tt>8192</tt>.</li> <li><tt>lockConcurrencyLevel</tt> - locking

Modified: trunk/core/src/main/java/org/infinispan/loader/modifications/Clear.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/modifications/Clear.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/modifications/Clear.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.loader.modifications;
+package org.infinispan.loader.modifications;
 
 /**
- * Represents a {@link org.infinispan.loader.CacheStore#clear()} modification
+ * Represents a {@link org.infinispan.loader.CacheStore#clear()} modification
  *
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/loader/modifications/Modification.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/modifications/Modification.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/modifications/Modification.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.loader.modifications;
+package org.infinispan.loader.modifications;
 
 /**
- * An interface that defines a {@link org.infinispan.loader.CacheStore} modification
+ * An interface that defines a {@link org.infinispan.loader.CacheStore} modification
  *
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/loader/modifications/PurgeExpired.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/modifications/PurgeExpired.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/modifications/PurgeExpired.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader.modifications;
+package org.infinispan.loader.modifications;
 
 public class PurgeExpired implements Modification {
    public Type getType() {

Modified: trunk/core/src/main/java/org/infinispan/loader/modifications/Remove.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/modifications/Remove.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/modifications/Remove.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.loader.modifications;
+package org.infinispan.loader.modifications;
 
 /**
- * Represents a {@link org.infinispan.loader.CacheStore#remove(Object)} modification
+ * Represents a {@link org.infinispan.loader.CacheStore#remove(Object)} modification
  *
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/loader/modifications/Store.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/modifications/Store.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/loader/modifications/Store.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.loader.modifications;
+package org.infinispan.loader.modifications;
 
-import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalCacheEntry;
 
 /**
- * Modification representing {@link org.infinispan.loader.CacheStore#store(org.infinispan.container.entries.InternalCacheEntry)}
+ * Modification representing {@link org.infinispan.loader.CacheStore#store(org.infinispan.container.entries.InternalCacheEntry)}
  *
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/lock/IsolationLevel.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/lock/IsolationLevel.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/lock/IsolationLevel.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.lock;
+package org.infinispan.lock;
 
 /**
  * Various transaction isolation levels as an enumerated class.  Note that <a href="http://wiki.jboss.org/wiki/JBossCacheMVCC">MVCC</a>

Modified: trunk/core/src/main/java/org/infinispan/lock/LockManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/lock/LockManager.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/lock/LockManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.lock;
+package org.infinispan.lock;
 
-import org.infinispan.context.InvocationContext;
-import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.container.entries.CacheEntry;
 
 /**
  * An interface to deal with all aspects of acquiring and releasing locks for cache entries.
@@ -33,7 +33,7 @@
 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
+    * org.infinispan.transaction.GlobalTransaction} if one is present in the context, or {@link Thread#currentThread()} if
     * one is not present.
     *
     * @param ctx invocation context
@@ -44,7 +44,7 @@
    /**
     * 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()}.
+    * org.infinispan.config.Configuration#getLockAcquisitionTimeout()}.
     * <p/>
     * The owner for the lock is determined by passing the invocation context to {@link
     * #getLockOwner(InvocationContext)}.

Modified: trunk/core/src/main/java/org/infinispan/lock/LockManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/lock/LockManagerImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/lock/LockManagerImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,26 +19,26 @@
  * 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.lock;
+package org.infinispan.lock;
 
-import org.infinispan.config.Configuration;
-import org.infinispan.container.entries.CacheEntry;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.annotations.Start;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.invocation.Flag;
-import org.infinispan.jmx.annotations.ManagedAttribute;
-import org.infinispan.jmx.annotations.MBean;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.util.ReversibleOrderedSet;
-import org.infinispan.util.concurrent.locks.OwnableReentrantLock;
-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.config.Configuration;
+import org.infinispan.container.entries.CacheEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.invocation.InvocationContextContainer;
+import org.infinispan.invocation.Flag;
+import org.infinispan.jmx.annotations.ManagedAttribute;
+import org.infinispan.jmx.annotations.MBean;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.util.ReversibleOrderedSet;
+import org.infinispan.util.concurrent.locks.OwnableReentrantLock;
+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 javax.transaction.TransactionManager;
 import java.util.Iterator;

Modified: trunk/core/src/main/java/org/infinispan/lock/StripedLock.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/lock/StripedLock.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/lock/StripedLock.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.lock;
+package org.infinispan.lock;
 
 import net.jcip.annotations.ThreadSafe;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -32,7 +32,7 @@
 
 /**
  * A simple implementation of lock striping, using cache entry keys to lock on, primarily used to help make {@link
- * org.infinispan.loader.CacheLoader} implemtations thread safe.
+ * org.infinispan.loader.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.

Modified: trunk/core/src/main/java/org/infinispan/lock/TimeoutException.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/lock/TimeoutException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/lock/TimeoutException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.lock;
+package org.infinispan.lock;
 
-import org.infinispan.CacheException;
+import org.infinispan.CacheException;
 
 
 /**

Modified: trunk/core/src/main/java/org/infinispan/logging/AbstractLogImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/logging/AbstractLogImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/logging/AbstractLogImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.logging;
+package org.infinispan.logging;
 
 /**
  * Abstract log implementation that handles message interpolation

Modified: trunk/core/src/main/java/org/infinispan/logging/JDKLogImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/logging/JDKLogImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/logging/JDKLogImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.logging;
+package org.infinispan.logging;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;

Modified: trunk/core/src/main/java/org/infinispan/logging/Log.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/logging/Log.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/logging/Log.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.logging;
+package org.infinispan.logging;
 
 /**
  * Infinispan's log abstraction layer.

Modified: trunk/core/src/main/java/org/infinispan/logging/Log4JLogImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/logging/Log4JLogImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/logging/Log4JLogImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.logging;
+package org.infinispan.logging;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;

Modified: trunk/core/src/main/java/org/infinispan/logging/LogFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/logging/LogFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/logging/LogFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.logging;
+package org.infinispan.logging;
 
 /**
  * Factory that creates {@link Log} instances.

Modified: trunk/core/src/main/java/org/infinispan/manager/CacheManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/manager/CacheManager.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/manager/CacheManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,30 +1,30 @@
-package org.infinispan.manager;
+package org.infinispan.manager;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.DuplicateCacheNameException;
-import org.infinispan.factories.annotations.NonVolatile;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.lifecycle.ComponentStatus;
-import org.infinispan.lifecycle.Lifecycle;
-import org.infinispan.notifications.Listenable;
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.DuplicateCacheNameException;
+import org.infinispan.factories.annotations.NonVolatile;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.lifecycle.ComponentStatus;
+import org.infinispan.lifecycle.Lifecycle;
+import org.infinispan.notifications.Listenable;
+import org.infinispan.remoting.transport.Address;
 
 import java.util.List;
 
 /**
- * A <tt>CacheManager</tt> is the primary mechanism for retrieving a {@link org.infinispan.Cache} instance, and is often
- * used as a starting point to using the {@link org.infinispan.Cache}.
+ * A <tt>CacheManager</tt> is the primary mechanism for retrieving a {@link org.infinispan.Cache} instance, and is often
+ * used as a starting point to using the {@link org.infinispan.Cache}.
  * <p/>
  * <tt>CacheManager</tt>s are heavyweight objects, and we foresee no more than one <tt>CacheManager</tt> being used per
  * JVM (unless specific configuration requirements require more than one; but either way, this would be a minimal and
  * finite number of instances).
  * <p/>
  * Constructing a <tt>CacheManager</tt> is done via one of its constructors, which optionally take in a {@link
- * org.infinispan.config.Configuration} or a path or URL to a configuration XML file.
+ * org.infinispan.config.Configuration} or a path or URL to a configuration XML file.
  * <p/>
- * Lifecycle - <tt>CacheManager</tt>s have a lifecycle (it implements {@link org.infinispan.lifecycle.Lifecycle}) and the
+ * Lifecycle - <tt>CacheManager</tt>s have a lifecycle (it implements {@link org.infinispan.lifecycle.Lifecycle}) and the
  * default constructors also call {@link #start()}.  Overloaded versions of the constructors are available, that do not
  * start the <tt>CacheManager</tt>, although it must be kept in mind that <tt>CacheManager</tt>s need to be started
  * before they can be used to create <tt>Cache</tt> instances.
@@ -82,7 +82,7 @@
     * <p/>
     * When creating a new cache, this method will use the configuration passed in to the CacheManager on construction,
     * as a template, and then optionally apply any overrides previously defined for the named cache using the {@link
-    * #defineCache(String, org.infinispan.config.Configuration)} method, or declared in the configuration file.
+    * #defineCache(String, org.infinispan.config.Configuration)} method, or declared in the configuration file.
     *
     * @param cacheName name of cache to retrieve
     * @return a cache instance identified by cacheName

Modified: trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,27 +19,27 @@
  * 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.manager;
+package org.infinispan.manager;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.config.DuplicateCacheNameException;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.config.parsing.XmlConfigurationParser;
-import org.infinispan.config.parsing.XmlConfigurationParserImpl;
-import org.infinispan.factories.DefaultCacheFactory;
-import org.infinispan.factories.GlobalComponentRegistry;
-import org.infinispan.factories.annotations.NonVolatile;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.jmx.annotations.MBean;
-import org.infinispan.jmx.annotations.ManagedAttribute;
-import org.infinispan.lifecycle.ComponentStatus;
-import org.infinispan.lifecycle.Lifecycle;
-import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
-import org.infinispan.remoting.RpcManager;
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.config.DuplicateCacheNameException;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.config.parsing.XmlConfigurationParser;
+import org.infinispan.config.parsing.XmlConfigurationParserImpl;
+import org.infinispan.factories.DefaultCacheFactory;
+import org.infinispan.factories.GlobalComponentRegistry;
+import org.infinispan.factories.annotations.NonVolatile;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.jmx.annotations.MBean;
+import org.infinispan.jmx.annotations.ManagedAttribute;
+import org.infinispan.lifecycle.ComponentStatus;
+import org.infinispan.lifecycle.Lifecycle;
+import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
+import org.infinispan.remoting.RpcManager;
+import org.infinispan.remoting.transport.Address;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -58,7 +58,7 @@
  * finite number of instances).
  * <p/>
  * Constructing a <tt>CacheManager</tt> is done via one of its constructors, which optionally take in a {@link
- * org.infinispan.config.Configuration} or a path or URL to a configuration XML file.
+ * org.infinispan.config.Configuration} or a path or URL to a configuration XML file.
  * <p/>
  * Lifecycle - <tt>CacheManager</tt>s have a lifecycle (it implements {@link Lifecycle}) and the default constructors
  * also call {@link #start()}.  Overloaded versions of the constructors are available, that do not start the
@@ -90,7 +90,7 @@
 @NonVolatile
 @MBean(objectName = "CacheManager")
 public class DefaultCacheManager implements CacheManager {
-   public static final String DEFAULT_CACHE_NAME = "org.infinispan.manager.DefaultCacheManager.DEFAULT_CACHE_NAME";
+   public static final String DEFAULT_CACHE_NAME = "org.infinispan.manager.DefaultCacheManager.DEFAULT_CACHE_NAME";
    protected GlobalConfiguration globalConfiguration;
    private final ConcurrentMap<String, Cache> caches = new ConcurrentHashMap<String, Cache>();
    private final ConcurrentMap<String, Configuration> configurationOverrides = new ConcurrentHashMap<String, Configuration>();
@@ -114,7 +114,7 @@
 
    /**
     * Constructs and starts a new instance of the CacheManager, using the default configuration passed in.  Uses
-    * defaults for a {@link org.infinispan.config.GlobalConfiguration}.
+    * defaults for a {@link org.infinispan.config.GlobalConfiguration}.
     *
     * @param defaultConfiguration configuration to use as a template for all caches created
     */
@@ -124,7 +124,7 @@
 
    /**
     * Constructs a new instance of the CacheManager, using the default configuration passed in.  Uses defaults for a
-    * {@link org.infinispan.config.GlobalConfiguration}.
+    * {@link org.infinispan.config.GlobalConfiguration}.
     *
     * @param defaultConfiguration configuration file to use as a template for all caches created
     * @param start                if true, the cache manager is started
@@ -289,7 +289,7 @@
     * <p/>
     * When creating a new cache, this method will use the configuration passed in to the CacheManager on construction,
     * as a template, and then optionally apply any overrides previously defined for the named cache using the {@link
-    * #defineCache(String, org.infinispan.config.Configuration)} method, or declared in the configuration file.
+    * #defineCache(String, org.infinispan.config.Configuration)} method, or declared in the configuration file.
     *
     * @param cacheName name of cache to retrieve
     * @return a cache instance identified by cacheName

Modified: trunk/core/src/main/java/org/infinispan/manager/NamedCacheNotFoundException.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/manager/NamedCacheNotFoundException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/manager/NamedCacheNotFoundException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.manager;
+package org.infinispan.manager;
 
 /**
  * Thrown when a named cache cannot be found.

Modified: trunk/core/src/main/java/org/infinispan/marshall/EntryData.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/EntryData.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/marshall/EntryData.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.marshall;
+package org.infinispan.marshall;
 
 import java.io.Externalizable;
 import java.io.IOException;

Modified: trunk/core/src/main/java/org/infinispan/marshall/EntryDataExceptionMarker.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/EntryDataExceptionMarker.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/marshall/EntryDataExceptionMarker.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.marshall;
+package org.infinispan.marshall;
 
 import java.io.Externalizable;
 import java.io.IOException;

Modified: trunk/core/src/main/java/org/infinispan/marshall/EntryDataMarker.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/EntryDataMarker.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/marshall/EntryDataMarker.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.marshall;
+package org.infinispan.marshall;
 
 import java.io.Serializable;
 

Modified: trunk/core/src/main/java/org/infinispan/marshall/InfinispanMarshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/InfinispanMarshaller.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/marshall/InfinispanMarshaller.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,27 +19,27 @@
  * 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.marshall;
+package org.infinispan.marshall;
 
-import org.infinispan.CacheException;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.atomic.DeltaAware;
-import org.infinispan.commands.RemoteCommandFactory;
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.io.ByteBuffer;
-import org.infinispan.io.ExposedByteArrayOutputStream;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.remoting.transport.jgroups.ExtendedResponse;
-import org.infinispan.remoting.transport.jgroups.JGroupsAddress;
-import org.infinispan.remoting.transport.jgroups.RequestIgnoredResponse;
-import org.infinispan.transaction.GlobalTransaction;
-import org.infinispan.transaction.TransactionLog;
-import org.infinispan.util.FastCopyHashMap;
-import org.infinispan.util.Immutables;
+import org.infinispan.CacheException;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.atomic.DeltaAware;
+import org.infinispan.commands.RemoteCommandFactory;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.io.ByteBuffer;
+import org.infinispan.io.ExposedByteArrayOutputStream;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.jgroups.ExtendedResponse;
+import org.infinispan.remoting.transport.jgroups.JGroupsAddress;
+import org.infinispan.remoting.transport.jgroups.RequestIgnoredResponse;
+import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.transaction.TransactionLog;
+import org.infinispan.util.FastCopyHashMap;
+import org.infinispan.util.Immutables;
 import org.jboss.util.NotImplementedException;
 import org.jboss.util.stream.MarshalledValueInputStream;
 

Modified: trunk/core/src/main/java/org/infinispan/marshall/MarshalledValue.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/MarshalledValue.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/marshall/MarshalledValue.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.marshall;
+package org.infinispan.marshall;
 
-import org.infinispan.CacheException;
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.CacheException;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.transaction.GlobalTransaction;
 import org.jboss.util.stream.MarshalledValueInputStream;
 
 import java.io.*;
@@ -33,13 +33,13 @@
 /**
  * Wrapper that wraps cached data, providing lazy deserialization using the calling thread's context class loader.
  * <p/>
- * The {@link org.infinispan.interceptors.MarshalledValueInterceptor} handles transparent wrapping/unwrapping of cached
+ * The {@link org.infinispan.interceptors.MarshalledValueInterceptor} handles transparent wrapping/unwrapping of cached
  * data.
  * <p/>
  *
  * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
  * @author Mircea.Markus at jboss.com
- * @see org.infinispan.interceptors.MarshalledValueInterceptor
+ * @see org.infinispan.interceptors.MarshalledValueInterceptor
  * @since 4.0
  */
 public class MarshalledValue implements Externalizable {

Modified: trunk/core/src/main/java/org/infinispan/marshall/Marshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/Marshaller.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/marshall/Marshaller.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.marshall;
+package org.infinispan.marshall;
 
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.io.ByteBuffer;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.io.ByteBuffer;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,8 +35,8 @@
  * <p/>
  * The reason why this is implemented specially in Infinispan rather than resorting to Java serialization or even the more
  * efficient JBoss serialization is that a lot of efficiency can be gained when a majority of the serialization that
- * occurs has to do with a small set of known types such as {@link org.infinispan.transaction.GlobalTransaction} or {@link
- * org.infinispan.commands.ReplicableCommand}, and class type information can be replaced with simple magic numbers.
+ * occurs has to do with a small set of known types such as {@link org.infinispan.transaction.GlobalTransaction} or {@link
+ * org.infinispan.commands.ReplicableCommand}, and class type information can be replaced with simple magic numbers.
  * <p/>
  * Unknown types (typically user data) falls back to JBoss serialization.
  * <p/>
@@ -44,11 +44,11 @@
  * information on which class loader to use to deserialize the object stream, or versioning information to allow streams
  * to interoperate between different versions of Infinispan (see {@link VersionAwareMarshaller}
  * <p/>
- * This interface is used to marshall {@link org.infinispan.commands.ReplicableCommand}s, their parameters and their
+ * This interface is used to marshall {@link org.infinispan.commands.ReplicableCommand}s, their parameters and their
  * response values.
  * <p/>
- * The interface is also used by the {@link org.infinispan.loader.CacheStore} framework to efficiently serialize data to be
- * persisted, as well as the {@link org.infinispan.statetransfer.StateTransferManager} when serializing the cache for
+ * The interface is also used by the {@link org.infinispan.loader.CacheStore} framework to efficiently serialize data to be
+ * persisted, as well as the {@link org.infinispan.statetransfer.StateTransferManager} when serializing the cache for
  * transferring state en-masse.
  *
  * @author <a href="mailto://manik@jboss.org">Manik Surtani</a>
@@ -80,7 +80,7 @@
    Object objectFromStream(InputStream is) throws IOException, ClassNotFoundException;
 
    /**
-    * A method that returns an instance of {@link org.infinispan.io.ByteBuffer}, which allows direct access to the byte
+    * A method that returns an instance of {@link org.infinispan.io.ByteBuffer}, which allows direct access to the byte
     * array with minimal array copying
     *
     * @param o object to marshall

Modified: trunk/core/src/main/java/org/infinispan/marshall/UnmarshalledReferences.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/UnmarshalledReferences.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/marshall/UnmarshalledReferences.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.marshall;
+package org.infinispan.marshall;
 
-import org.infinispan.CacheException;
+import org.infinispan.CacheException;
 
 import java.util.ArrayList;
 

Modified: trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.marshall;
+package org.infinispan.marshall;
 
-import org.infinispan.commands.RemoteCommandFactory;
-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.commands.RemoteCommandFactory;
+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.jboss.util.stream.MarshalledValueInputStream;
 
 import java.io.ByteArrayInputStream;

Modified: trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/AbstractListenerImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.notifications;
+package org.infinispan.notifications;
 
-import org.infinispan.CacheException;
-import org.infinispan.factories.KnownComponentNames;
-import org.infinispan.factories.annotations.ComponentName;
-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.CacheException;
+import org.infinispan.factories.KnownComponentNames;
+import org.infinispan.factories.annotations.ComponentName;
+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 java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
@@ -23,8 +23,8 @@
 import java.util.concurrent.ExecutorService;
 
 /**
- * Functionality common to both {@link org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifierImpl} and
- * {@link org.infinispan.notifications.cachelistener.CacheNotifierImpl}
+ * Functionality common to both {@link org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifierImpl} and
+ * {@link org.infinispan.notifications.cachelistener.CacheNotifierImpl}
  *
  * @author Manik Surtani
  */
@@ -137,7 +137,7 @@
    protected boolean testListenerClassValidity(Class<?> listenerClass) {
       Listener l = ReflectionUtil.getAnnotation(listenerClass, Listener.class);
       if (l == null)
-         throw new IncorrectListenerException("Cache listener class MUST be annotated with org.infinispan.notifications.annotation.Listener");
+         throw new IncorrectListenerException("Cache listener class MUST be annotated with org.infinispan.notifications.annotation.Listener");
       if (!Modifier.isPublic(listenerClass.getModifiers()))
          throw new IncorrectListenerException("Cache listener class MUST be public!");
       return l.sync();

Modified: trunk/core/src/main/java/org/infinispan/notifications/IncorrectListenerException.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/IncorrectListenerException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/IncorrectListenerException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.notifications;
+package org.infinispan.notifications;
 
-import org.infinispan.CacheException;
+import org.infinispan.CacheException;
 
 /**
  * Thrown when an incorrectly annotated class is added as a cache listener using the {@link
- * org.infinispan.notifications.Listenable#addListener(Object)} API.
+ * org.infinispan.notifications.Listenable#addListener(Object)} API.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/notifications/Listenable.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/Listenable.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/Listenable.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.notifications;
+package org.infinispan.notifications;
 
 import java.util.Set;
 

Modified: trunk/core/src/main/java/org/infinispan/notifications/Listener.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/Listener.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/Listener.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications;
+package org.infinispan.notifications;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -28,10 +28,10 @@
 
 /**
  * Class-level annotation used to annotate an object as being a valid cache listener.  Used with the {@link
- * org.infinispan.Cache#addListener(Object)} and related APIs. <p/> Note that even if a class is annotated with this
- * annotation, it still needs method-level annotation (such as {@link org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted})
+ * org.infinispan.Cache#addListener(Object)} and related APIs. <p/> Note that even if a class is annotated with this
+ * annotation, it still needs method-level annotation (such as {@link org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted})
  * to actually receive notifications. <p/> Objects annotated with this annotation - listeners - can be attached to a
- * running {@link org.infinispan.Cache} so users can be notified of {@link org.infinispan.Cache} events. <p/> <p/> There can
+ * running {@link org.infinispan.Cache} so users can be notified of {@link org.infinispan.Cache} events. <p/> <p/> There can
  * be multiple methods that are annotated to receive the same event, and a method may receive multiple events by using a
  * super type. </p> <p/> <h4>Delivery Semantics</h4> <p/> An event is delivered immediately after the respective
  * operation, but before the underlying cache call returns. For this reason it is important to keep listener processing
@@ -39,8 +39,8 @@
  * <h4>Transactional Semantics</h4> <p/> Since the event is delivered during the actual cache call, the transactional
  * outcome is not yet known. For this reason, <i>events are always delivered, even if the changes they represent are
  * discarded by their containing transaction</i>. For applications that must only process events that represent changes
- * in a completed transaction, {@link org.infinispan.notifications.cachelistener.event.TransactionalEvent#getTransaction()}
- * can be used, along with {@link org.infinispan.notifications.cachelistener.event.TransactionCompletedEvent#isTransactionSuccessful()}
+ * in a completed transaction, {@link org.infinispan.notifications.cachelistener.event.TransactionalEvent#getTransaction()}
+ * can be used, along with {@link org.infinispan.notifications.cachelistener.event.TransactionCompletedEvent#isTransactionSuccessful()}
  * to record events and later process them once the transaction has been successfully committed. Example 4 demonstrates
  * this. </p> <p/> <h4>Threading Semantics</h4> <p/> A listener implementation must be capable of handling concurrent
  * invocations. Local notifications reuse the calling thread; remote notifications reuse the network thread. </p> <p/>
@@ -54,44 +54,44 @@
  * Since 3.0, a new parameter, <tt>sync</tt>, has been introduced on this annotation.  This defaults to <tt>true</tt>
  * which provides the above semantics.  Alternatively, if you set <tt>sync</tt> to <tt>false</tt>, then invocations are
  * made in a <i>separate</i> thread, which will not cause any blocking on the caller or network thread.  The separate
- * thread is taken from a pool, which can be configured using {@link org.infinispan.config.GlobalConfiguration#setAsyncListenerExecutorProperties(java.util.Properties)}
- * and {@link org.infinispan.config.GlobalConfiguration#setAsyncListenerExecutorFactoryClass(String)}.
+ * thread is taken from a pool, which can be configured using {@link org.infinispan.config.GlobalConfiguration#setAsyncListenerExecutorProperties(java.util.Properties)}
+ * and {@link org.infinispan.config.GlobalConfiguration#setAsyncListenerExecutorFactoryClass(String)}.
  * <p/>
  * <b>Summary of Notification Annotations</b> <table border="1" cellpadding="1" cellspacing="1" summary="Summary of
  * notification annotations"> <tr> <th bgcolor="#CCCCFF" align="left">Annotation</th> <th bgcolor="#CCCCFF"
  * align="left">Event</th> <th bgcolor="#CCCCFF" align="left">Description</th> </tr> <tr> <td valign="top">{@link
- * org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted}</td> <td valign="top">{@link
- * org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent}</td> <td valign="top">A cache was
- * started</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachemanagerlistener.annotation.CacheStopped}</td>
- * <td valign="top">{@link org.infinispan.notifications.cachemanagerlistener.event.CacheStoppedEvent}</td> <td
- * valign="top">A cache was stopped</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryModified}</td>
- * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent}</td> <td
+ * org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted}</td> <td valign="top">{@link
+ * org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent}</td> <td valign="top">A cache was
+ * started</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachemanagerlistener.annotation.CacheStopped}</td>
+ * <td valign="top">{@link org.infinispan.notifications.cachemanagerlistener.event.CacheStoppedEvent}</td> <td
+ * valign="top">A cache was stopped</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryModified}</td>
+ * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent}</td> <td
  * valign="top">A cache entry was modified</td> </tr> <tr> <td valign="top">{@link
- * org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated}</td> <td valign="top">{@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent}</td> <td valign="top">A cache entry was
- * created</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved}</td>
- * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent}</td> <td valign="top">A
- * cache entry was removed</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited}</td>
- * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryVisitedEvent}</td> <td valign="top">A
- * cache entry was visited</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryLoaded}</td>
- * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryLoadedEvent}</td> <td valign="top">A
- * cache entry was loaded</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryEvicted}</td>
- * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryEvictedEvent}</td> <td valign="top">A
- * cache entry was evicted</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryActivated}</td>
- * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryActivatedEvent}</td> <td
+ * org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated}</td> <td valign="top">{@link
+ * org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent}</td> <td valign="top">A cache entry was
+ * created</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved}</td>
+ * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent}</td> <td valign="top">A
+ * cache entry was removed</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited}</td>
+ * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryVisitedEvent}</td> <td valign="top">A
+ * cache entry was visited</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryLoaded}</td>
+ * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryLoadedEvent}</td> <td valign="top">A
+ * cache entry was loaded</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryEvicted}</td>
+ * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryEvictedEvent}</td> <td valign="top">A
+ * cache entry was evicted</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.CacheEntryActivated}</td>
+ * <td valign="top">{@link org.infinispan.notifications.cachelistener.event.CacheEntryActivatedEvent}</td> <td
  * valign="top">A cache entry was activated</td> </tr> <tr> <td valign="top">{@link
- * org.infinispan.notifications.cachelistener.annotation.CacheEntryPassivated}</td> <td valign="top">{@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryPassivatedEvent}</td> <td valign="top">A cache entry was
- * passivated</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged}</td>
- * <td valign="top">{@link org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent}</td> <td
+ * org.infinispan.notifications.cachelistener.annotation.CacheEntryPassivated}</td> <td valign="top">{@link
+ * org.infinispan.notifications.cachelistener.event.CacheEntryPassivatedEvent}</td> <td valign="top">A cache entry was
+ * passivated</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged}</td>
+ * <td valign="top">{@link org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent}</td> <td
  * valign="top">A view change event was detected</td> </tr> <tr> <td valign="top">{@link
- * org.infinispan.notifications.cachelistener.annotation.TransactionRegistered}</td> <td valign@="top">{@link
- * org.infinispan.notifications.cachelistener.event.TransactionRegisteredEvent}</td> <td valign="top">The cache has started
- * to participate in a transaction</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.TransactionCompleted}</td>
- * <td valign=@"top">{@link org.infinispan.notifications.cachelistener.event.TransactionCompletedEvent}</td> <td
+ * org.infinispan.notifications.cachelistener.annotation.TransactionRegistered}</td> <td valign@="top">{@link
+ * org.infinispan.notifications.cachelistener.event.TransactionRegisteredEvent}</td> <td valign="top">The cache has started
+ * to participate in a transaction</td> </tr> <tr> <td valign="top">{@link org.infinispan.notifications.cachelistener.annotation.TransactionCompleted}</td>
+ * <td valign=@"top">{@link org.infinispan.notifications.cachelistener.event.TransactionCompletedEvent}</td> <td
  * valign="top">The cache has completed its participation in a transaction</td> </tr> <tr> <td valign="top">{@link
- * org.infinispan.notifications.cachelistener.annotation.CacheEntryInvalidated}</td> <td valign=@"top">{@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryInvalidatedEvent}</td> <td valign="top">A cache entry was
+ * org.infinispan.notifications.cachelistener.annotation.CacheEntryInvalidated}</td> <td valign=@"top">{@link
+ * org.infinispan.notifications.cachelistener.event.CacheEntryInvalidatedEvent}</td> <td valign="top">A cache entry was
  * invalidated by a remote cache.  Only if cache mode is INVALIDATION_SYNC or INVALIDATION_ASYNC.</td> </tr>
  * <p/>
  * </table>
@@ -207,20 +207,20 @@
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @author Jason T. Greene
- * @see org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted
- * @see org.infinispan.notifications.cachemanagerlistener.annotation.CacheStopped
- * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryModified
- * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated
- * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved
- * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited
- * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryLoaded
- * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryEvicted
- * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryActivated
- * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryPassivated
- * @see org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged
- * @see org.infinispan.notifications.cachelistener.annotation.TransactionCompleted
- * @see org.infinispan.notifications.cachelistener.annotation.TransactionRegistered
- * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryInvalidated
+ * @see org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted
+ * @see org.infinispan.notifications.cachemanagerlistener.annotation.CacheStopped
+ * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryModified
+ * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated
+ * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved
+ * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited
+ * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryLoaded
+ * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryEvicted
+ * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryActivated
+ * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryPassivated
+ * @see org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged
+ * @see org.infinispan.notifications.cachelistener.annotation.TransactionCompleted
+ * @see org.infinispan.notifications.cachelistener.annotation.TransactionRegistered
+ * @see org.infinispan.notifications.cachelistener.annotation.CacheEntryInvalidated
  * @since 4.0
  */
 @Retention(RetentionPolicy.RUNTIME)

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifier.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifier.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifier.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
  * 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.notifications.cachelistener;
+package org.infinispan.notifications.cachelistener;
 
-import org.infinispan.context.InvocationContext;
-import org.infinispan.factories.annotations.NonVolatile;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.notifications.Listenable;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.factories.annotations.NonVolatile;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.notifications.Listenable;
 
 import javax.transaction.Transaction;
 

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/CacheNotifierImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,18 +19,18 @@
  * 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.notifications.cachelistener;
+package org.infinispan.notifications.cachelistener;
 
-import org.infinispan.Cache;
-import org.infinispan.context.InvocationContext;
-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.Cache;
+import org.infinispan.context.InvocationContext;
+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 javax.transaction.Transaction;
 import java.lang.annotation.Annotation;

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryActivated.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryActivated.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryActivated.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.annotation;
+package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -30,11 +30,11 @@
  * This annotation should be used on methods that need to be notified when a cache entry is activated.
  * <p/>
  * Methods annotated with this annotation should be public and take in a single parameter, a {@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryActivatedEvent} otherwise an {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
+ * org.infinispan.notifications.cachelistener.event.CacheEntryActivatedEvent} otherwise an {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @see CacheEntryPassivated
  * @since 4.0
  */

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryCreated.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryCreated.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryCreated.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.annotation;
+package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -30,11 +30,11 @@
  * This annotation should be used on methods that need to be notified when a cache entry is created.
  * <p/>
  * Methods annotated with this annotation should be public and take in a single parameter, a {@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent} otherwise an {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
+ * org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent} otherwise an {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 @Retention(RetentionPolicy.RUNTIME)

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryEvicted.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryEvicted.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryEvicted.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.annotation;
+package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -30,11 +30,11 @@
  * This annotation should be used on methods that need to be notified when a cache entry is evicted.
  * <p/>
  * Methods annotated with this annotation should be public and take in a single parameter, a {@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryEvictedEvent} otherwise an {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
+ * org.infinispan.notifications.cachelistener.event.CacheEntryEvictedEvent} otherwise an {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @see CacheEntryLoaded
  * @since 4.0
  */

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryInvalidated.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryInvalidated.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryInvalidated.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.annotation;
+package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -30,11 +30,11 @@
  * This annotation should be used on methods that need to be notified when a cache entry is invalidated.
  * <p/>
  * Methods annotated with this annotation should be public and take in a single parameter, a {@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryInvalidatedEvent} otherwise an {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
+ * org.infinispan.notifications.cachelistener.event.CacheEntryInvalidatedEvent} otherwise an {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 @Retention(RetentionPolicy.RUNTIME)

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryLoaded.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryLoaded.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryLoaded.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.annotation;
+package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -28,14 +28,14 @@
 
 /**
  * This annotation should be used on methods that need to be notified when a cache entry is loaded from a {@link
- * org.infinispan.loader.CacheLoaderOld}.
+ * org.infinispan.loader.CacheLoaderOld}.
  * <p/>
  * Methods annotated with this annotation should be public and take in a single parameter, a {@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryLoadedEvent} otherwise an {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
+ * org.infinispan.notifications.cachelistener.event.CacheEntryLoadedEvent} otherwise an {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 @Retention(RetentionPolicy.RUNTIME)

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryModified.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryModified.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryModified.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.annotation;
+package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -30,12 +30,12 @@
  * This annotation should be used on methods that need to be notified when a cache entry has been modified.
  * <p/>
  * Methods annotated with this annotation should be public and take in a single parameter, a {@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent} otherwise an {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
+ * org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent} otherwise an {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your cache listener.
  * <p/>
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 @Retention(RetentionPolicy.RUNTIME)

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryPassivated.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryPassivated.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryPassivated.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.annotation;
+package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -30,11 +30,11 @@
  * This annotation should be used on methods that need to be notified when a cache entry is passivated.
  * <p/>
  * Methods annotated with this annotation should accept a single parameter, a {@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryPassivatedEvent} otherwise a {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
+ * org.infinispan.notifications.cachelistener.event.CacheEntryPassivatedEvent} otherwise a {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 // ensure this annotation is available at runtime.

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryRemoved.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryRemoved.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryRemoved.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.annotation;
+package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -30,11 +30,11 @@
  * This annotation should be used on methods that need to be notified when a cache entry is removed from the cache.
  * <p/>
  * Methods annotated with this annotation should accept a single parameter, a {@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent} otherwise a {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
+ * org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent} otherwise a {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 // ensure this annotation is available at runtime.

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryVisited.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryVisited.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/CacheEntryVisited.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.annotation;
+package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -30,11 +30,11 @@
  * This annotation should be used on methods that need to be notified when a cache entry is visited.
  * <p/>
  * Methods annotated with this annotation should accept a single parameter, a {@link
- * org.infinispan.notifications.cachelistener.event.CacheEntryVisitedEvent} otherwise a {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
+ * org.infinispan.notifications.cachelistener.event.CacheEntryVisitedEvent} otherwise a {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 // ensure this annotation is available at runtime.

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionCompleted.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionCompleted.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionCompleted.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.annotation;
+package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -31,14 +31,14 @@
  * transaction and the transaction completes, either with a commit or a rollback.
  * <p/>
  * Methods annotated with this annotation should accept a single parameter, a {@link
- * org.infinispan.notifications.cachelistener.event.TransactionCompletedEvent} otherwise a {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
+ * org.infinispan.notifications.cachelistener.event.TransactionCompletedEvent} otherwise a {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
  * <p/>
  * Note that methods marked with this annotation will only be fired <i>after the fact</i>, i.e., your method will never
- * be called with {@link org.infinispan.notifications.cachelistener.event.Event#isPre()} being set to <tt>true</tt>.
+ * be called with {@link org.infinispan.notifications.cachelistener.event.Event#isPre()} being set to <tt>true</tt>.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 // ensure this annotation is available at runtime.

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionRegistered.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionRegistered.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/annotation/TransactionRegistered.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.annotation;
+package org.infinispan.notifications.cachelistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -32,14 +32,14 @@
  * javax.transaction.TransactionManager}.
  * <p/>
  * Methods annotated with this annotation should accept a single parameter, a {@link
- * org.infinispan.notifications.cachelistener.event.TransactionRegisteredEvent} otherwise a {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
+ * org.infinispan.notifications.cachelistener.event.TransactionRegisteredEvent} otherwise a {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
  * <p/>
  * Note that methods marked with this annotation will only be fired <i>after the fact</i>, i.e., your method will never
- * be called with {@link org.infinispan.notifications.cachelistener.event.Event#isPre()} being set to <tt>true</tt>.
+ * be called with {@link org.infinispan.notifications.cachelistener.event.Event#isPre()} being set to <tt>true</tt>.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 // ensure this annotation is available at runtime.

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryActivatedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryActivatedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryActivatedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryActivated}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryActivated}.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryCreatedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryCreatedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryCreatedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated}.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
  * Transactional events that additionally expose a key as such events pertain to a specific cache entry.

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvictedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvictedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryEvictedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryEvicted}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryEvicted}.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryInvalidatedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryInvalidatedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryInvalidatedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
  * Notifies a listener of an invalidation event

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryLoadedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryLoadedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryLoadedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryLoaded}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryLoaded}.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryModifiedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryModifiedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryModifiedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryModified}
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryModified}
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryPassivatedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryPassivatedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryPassivatedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryPassivated}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryPassivated}.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryRemovedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryRemovedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryRemovedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved}.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryVisitedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryVisitedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/CacheEntryVisitedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited}.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/Event.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/Event.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/Event.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
-import org.infinispan.Cache;
+import org.infinispan.Cache;
 
 /**
  * An interface that defines common characteristics of events

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/EventImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/EventImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/EventImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
-import org.infinispan.Cache;
+import org.infinispan.Cache;
 
 import javax.transaction.Transaction;
 

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionCompletedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionCompletedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionCompletedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.TransactionCompleted}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.TransactionCompleted}.
  * <p/>
  * Note that this event is only delivered <i>after the fact</i>, i.e., you will never see an instance of this event with
  * {@link #isPre()} being set to <tt>true</tt>.

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionRegisteredEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionRegisteredEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionRegisteredEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.TransactionRegistered}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachelistener.annotation.TransactionRegistered}.
  * <p/>
  * Note that this event is only delivered <i>after the fact</i>, i.e., you will never see an instance of this event with
  * {@link #isPre()} being set to <tt>true</tt>.

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionalEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionalEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachelistener/event/TransactionalEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachelistener.event;
+package org.infinispan.notifications.cachelistener.event;
 
 import javax.transaction.Transaction;
 

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifier.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifier.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifier.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.notifications.cachemanagerlistener;
+package org.infinispan.notifications.cachemanagerlistener;
 
-import org.infinispan.factories.annotations.NonVolatile;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.notifications.Listenable;
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.factories.annotations.NonVolatile;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.notifications.Listenable;
+import org.infinispan.remoting.transport.Address;
 
 import java.util.List;
 

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,19 +1,19 @@
-package org.infinispan.notifications.cachemanagerlistener;
+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;
-import org.infinispan.notifications.cachemanagerlistener.annotation.CacheStopped;
-import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
-import org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent;
-import org.infinispan.notifications.cachemanagerlistener.event.CacheStoppedEvent;
-import org.infinispan.notifications.cachemanagerlistener.event.Event;
-import org.infinispan.notifications.cachemanagerlistener.event.EventImpl;
-import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
-import org.infinispan.remoting.transport.Address;
+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;
+import org.infinispan.notifications.cachemanagerlistener.annotation.CacheStopped;
+import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
+import org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent;
+import org.infinispan.notifications.cachemanagerlistener.event.CacheStoppedEvent;
+import org.infinispan.notifications.cachemanagerlistener.event.Event;
+import org.infinispan.notifications.cachemanagerlistener.event.EventImpl;
+import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
+import org.infinispan.remoting.transport.Address;
 
 import java.lang.annotation.Annotation;
 import java.util.HashMap;

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStarted.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStarted.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStarted.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachemanagerlistener.annotation;
+package org.infinispan.notifications.cachemanagerlistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -30,11 +30,11 @@
  * This annotation should be used on methods that need to be notified when a cache is started.
  * <p/>
  * Methods annotated with this annotation should accept a single parameter, a {@link
- * org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent} otherwise a {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
+ * org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent} otherwise a {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 @Retention(RetentionPolicy.RUNTIME)

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStopped.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStopped.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/CacheStopped.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachemanagerlistener.annotation;
+package org.infinispan.notifications.cachemanagerlistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -30,11 +30,11 @@
  * This annotation should be used on methods that need to be notified when a cache is stopped.
  * <p/>
  * Methods annotated with this annotation should accept a single parameter, a {@link
- * org.infinispan.notifications.cachemanagerlistener.event.CacheStoppedEvent} otherwise a {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
+ * org.infinispan.notifications.cachemanagerlistener.event.CacheStoppedEvent} otherwise a {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 @Retention(RetentionPolicy.RUNTIME)

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/ViewChanged.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/ViewChanged.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/annotation/ViewChanged.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.notifications.cachemanagerlistener.annotation;
+package org.infinispan.notifications.cachemanagerlistener.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -31,11 +31,11 @@
  * cluster topology changes (i.e., a member joins or leaves the cluster).
  * <p/>
  * Methods annotated with this annotation should accept a single parameter, a {@link
- * org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent} otherwise a {@link
- * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
+ * org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent} otherwise a {@link
+ * org.infinispan.notifications.IncorrectListenerException} will be thrown when registering your listener.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @see org.infinispan.notifications.Listener
+ * @see org.infinispan.notifications.Listener
  * @since 4.0
  */
 // ensure this annotation is available at runtime.

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStartedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStartedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStartedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachemanagerlistener.event;
+package org.infinispan.notifications.cachemanagerlistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted}.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStoppedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStoppedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/CacheStoppedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.notifications.cachemanagerlistener.event;
+package org.infinispan.notifications.cachemanagerlistener.event;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachemanagerlistener.annotation.CacheStopped}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachemanagerlistener.annotation.CacheStopped}.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/Event.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/Event.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/Event.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.notifications.cachemanagerlistener.event;
+package org.infinispan.notifications.cachemanagerlistener.event;
 
-import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.CacheManager;
 
 /**
  * Common characteristics of events that occur on a cache manager

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/EventImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/EventImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/EventImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.notifications.cachemanagerlistener.event;
+package org.infinispan.notifications.cachemanagerlistener.event;
 
-import org.infinispan.manager.CacheManager;
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.remoting.transport.Address;
 
 import java.util.List;
 

Modified: trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/ViewChangedEvent.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/ViewChangedEvent.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/notifications/cachemanagerlistener/event/ViewChangedEvent.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.notifications.cachemanagerlistener.event;
+package org.infinispan.notifications.cachemanagerlistener.event;
 
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.Address;
 
 import java.util.List;
 
 /**
- * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged}.
+ * This event is passed in to any method annotated with {@link org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged}.
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandler.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandler.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandler.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.remoting;
+package org.infinispan.remoting;
 
-import org.infinispan.commands.CacheRpcCommand;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.statetransfer.StateTransferException;
+import org.infinispan.commands.CacheRpcCommand;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.statetransfer.StateTransferException;
 
 import java.io.InputStream;
 import java.io.OutputStream;

Modified: trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/InboundInvocationHandlerImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,19 +1,19 @@
-package org.infinispan.remoting;
+package org.infinispan.remoting;
 
-import org.infinispan.commands.CacheRpcCommand;
-import org.infinispan.commands.CommandsFactory;
-import org.infinispan.config.Configuration;
-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.statetransfer.StateTransferException;
-import org.infinispan.statetransfer.StateTransferManager;
+import org.infinispan.commands.CacheRpcCommand;
+import org.infinispan.commands.CommandsFactory;
+import org.infinispan.config.Configuration;
+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.statetransfer.StateTransferException;
+import org.infinispan.statetransfer.StateTransferManager;
 
 import java.io.InputStream;
 import java.io.OutputStream;

Modified: trunk/core/src/main/java/org/infinispan/remoting/ReplicationException.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/ReplicationException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/ReplicationException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.remoting;
+package org.infinispan.remoting;
 
-import org.infinispan.CacheException;
+import org.infinispan.CacheException;
 
 /**
  * Thrown when a replication problem occurred

Modified: trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,19 +19,19 @@
  * 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.remoting;
+package org.infinispan.remoting;
 
-import org.infinispan.commands.CommandsFactory;
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.commands.remote.ReplicateCommand;
-import org.infinispan.config.Configuration;
-import org.infinispan.factories.KnownComponentNames;
-import org.infinispan.factories.annotations.ComponentName;
-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.commands.CommandsFactory;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.commands.remote.ReplicateCommand;
+import org.infinispan.config.Configuration;
+import org.infinispan.factories.KnownComponentNames;
+import org.infinispan.factories.annotations.ComponentName;
+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 java.util.ArrayList;
 import java.util.LinkedList;

Modified: trunk/core/src/main/java/org/infinispan/remoting/ResponseFilter.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/ResponseFilter.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/ResponseFilter.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.remoting;
+package org.infinispan.remoting;
 
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.Address;
 
 /**
  * A mechanism of filtering RPC responses.  Used with {@link RpcManager#invokeRemotely(java.util.List,
- * org.infinispan.commands.ReplicableCommand, ResponseMode, long, boolean, ResponseFilter)}
+ * org.infinispan.commands.ReplicableCommand, ResponseMode, long, boolean, ResponseFilter)}
  *
  * @author Manik Surtani
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/remoting/ResponseMode.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/ResponseMode.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/ResponseMode.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.remoting;
+package org.infinispan.remoting;
 
 /**
  * // TODO: Manik: Document this!

Modified: trunk/core/src/main/java/org/infinispan/remoting/RpcManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/RpcManager.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/RpcManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,16 +19,16 @@
  * 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.remoting;
+package org.infinispan.remoting;
 
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.factories.annotations.NonVolatile;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.lifecycle.Lifecycle;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.remoting.transport.Transport;
-import org.infinispan.statetransfer.StateTransferException;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.factories.annotations.NonVolatile;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.lifecycle.Lifecycle;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.Transport;
+import org.infinispan.statetransfer.StateTransferException;
 
 import java.util.List;
 
@@ -102,7 +102,7 @@
     *
     * @param cacheName name of cache requesting state
     * @param timeout   length of time to try to retrieve state on each peer
-    * @throws org.infinispan.statetransfer.StateTransferException
+    * @throws org.infinispan.statetransfer.StateTransferException
     *          in the event of problems
     */
    void retrieveState(String cacheName, long timeout) throws StateTransferException;

Modified: trunk/core/src/main/java/org/infinispan/remoting/RpcManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/RpcManagerImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/RpcManagerImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,23 +1,23 @@
-package org.infinispan.remoting;
+package org.infinispan.remoting;
 
-import org.infinispan.CacheException;
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.factories.KnownComponentNames;
-import org.infinispan.factories.annotations.ComponentName;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.annotations.Start;
-import org.infinispan.factories.annotations.Stop;
-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.transport.Address;
-import org.infinispan.remoting.transport.Transport;
-import org.infinispan.statetransfer.StateTransferException;
+import org.infinispan.CacheException;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.factories.KnownComponentNames;
+import org.infinispan.factories.annotations.ComponentName;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.factories.annotations.Stop;
+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.transport.Address;
+import org.infinispan.remoting.transport.Transport;
+import org.infinispan.statetransfer.StateTransferException;
 
 import java.text.NumberFormat;
 import java.util.List;
@@ -26,7 +26,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 /**
- * This component really is just a wrapper around a {@link org.infinispan.remoting.transport.Transport} implementation, and
+ * This component really is just a wrapper around a {@link org.infinispan.remoting.transport.Transport} implementation, and
  * is used to set up the transport and provide lifecycle and dependency hooks into external transport implementations.
  *
  * @author Manik Surtani

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/Address.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/Address.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/Address.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.remoting.transport;
+package org.infinispan.remoting.transport;
 
 /**
  * // TODO: Manik: Document this!

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/DistributedSync.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/DistributedSync.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/DistributedSync.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.remoting.transport;
+package org.infinispan.remoting.transport;
 
 import net.jcip.annotations.ThreadSafe;
 

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/Transport.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/Transport.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/Transport.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,17 +1,17 @@
-package org.infinispan.remoting.transport;
+package org.infinispan.remoting.transport;
 
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.factories.annotations.NonVolatile;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.lifecycle.Lifecycle;
-import org.infinispan.marshall.Marshaller;
-import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
-import org.infinispan.remoting.InboundInvocationHandler;
-import org.infinispan.remoting.ResponseFilter;
-import org.infinispan.remoting.ResponseMode;
-import org.infinispan.statetransfer.StateTransferException;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.factories.annotations.NonVolatile;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.lifecycle.Lifecycle;
+import org.infinispan.marshall.Marshaller;
+import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
+import org.infinispan.remoting.InboundInvocationHandler;
+import org.infinispan.remoting.ResponseFilter;
+import org.infinispan.remoting.ResponseMode;
+import org.infinispan.statetransfer.StateTransferException;
 
 import java.util.List;
 import java.util.Properties;
@@ -86,7 +86,7 @@
 
    /**
     * Initiates a state retrieval from a specific cache (by typically invoking {@link
-    * org.infinispan.remoting.InboundInvocationHandler#generateState(String, java.io.OutputStream)}), and applies this
+    * org.infinispan.remoting.InboundInvocationHandler#generateState(String, java.io.OutputStream)}), and applies this
     * state to the current cache via the  {@link InboundInvocationHandler#applyState(String, java.io.InputStream)}
     * callback.
     *
@@ -94,7 +94,7 @@
     * @param address   address of remote cache from which to retrieve state
     * @param timeout   state retrieval timeout in milliseconds
     * @return true if state was transferred and applied successfully, false if it timed out.
-    * @throws org.infinispan.statetransfer.StateTransferException
+    * @throws org.infinispan.statetransfer.StateTransferException
     *          if state cannot be retrieved from the specific cache
     */
    boolean retrieveState(String cacheName, Address address, long timeout) throws StateTransferException;

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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,16 +19,16 @@
  * 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.remoting.transport.jgroups;
+package org.infinispan.remoting.transport.jgroups;
 
-import org.infinispan.CacheException;
-import org.infinispan.commands.CacheRpcCommand;
-import org.infinispan.commands.ReplicableCommand;
-import org.infinispan.commands.remote.ClusteredGetCommand;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.remoting.InboundInvocationHandler;
-import org.infinispan.remoting.transport.DistributedSync;
+import org.infinispan.CacheException;
+import org.infinispan.commands.CacheRpcCommand;
+import org.infinispan.commands.ReplicableCommand;
+import org.infinispan.commands.remote.ClusteredGetCommand;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.remoting.InboundInvocationHandler;
+import org.infinispan.remoting.transport.DistributedSync;
 import org.jgroups.Address;
 import org.jgroups.Channel;
 import org.jgroups.Message;

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/ExtendedResponse.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/ExtendedResponse.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/ExtendedResponse.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
-package org.infinispan.remoting.transport.jgroups;
+package org.infinispan.remoting.transport.jgroups;
 
 /**
  * A response with extended information

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/FlushBasedDistributedSync.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/FlushBasedDistributedSync.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/FlushBasedDistributedSync.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.remoting.transport.jgroups;
+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.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 java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsAddress.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsAddress.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsAddress.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.remoting.transport.jgroups;
+package org.infinispan.remoting.transport.jgroups;
 
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.Address;
 
 import java.io.Externalizable;
 import java.io.IOException;

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsResponseFilterAdapter.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsResponseFilterAdapter.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsResponseFilterAdapter.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.remoting.transport.jgroups;
+package org.infinispan.remoting.transport.jgroups;
 
-import org.infinispan.remoting.ResponseFilter;
+import org.infinispan.remoting.ResponseFilter;
 import org.jgroups.Address;
 import org.jgroups.blocks.RspFilter;
 
 /**
- * Acts as a bridge between JGroups RspFilter and {@link org.infinispan.remoting.ResponseFilter}.
+ * Acts as a bridge between JGroups RspFilter and {@link org.infinispan.remoting.ResponseFilter}.
  *
  * @author Manik Surtani
  * @since 4.0

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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,24 +1,24 @@
-package org.infinispan.remoting.transport.jgroups;
+package org.infinispan.remoting.transport.jgroups;
 
-import org.infinispan.CacheException;
-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;
-import org.infinispan.remoting.ReplicationException;
-import org.infinispan.remoting.ResponseFilter;
-import org.infinispan.remoting.ResponseMode;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.remoting.transport.DistributedSync;
-import org.infinispan.remoting.transport.Transport;
-import org.infinispan.statetransfer.StateTransferException;
-import org.infinispan.util.FileLookup;
-import org.infinispan.util.Util;
+import org.infinispan.CacheException;
+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;
+import org.infinispan.remoting.ReplicationException;
+import org.infinispan.remoting.ResponseFilter;
+import org.infinispan.remoting.ResponseMode;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.DistributedSync;
+import org.infinispan.remoting.transport.Transport;
+import org.infinispan.statetransfer.StateTransferException;
+import org.infinispan.util.FileLookup;
+import org.infinispan.util.Util;
 import org.jgroups.Channel;
 import org.jgroups.ChannelException;
 import org.jgroups.ExtendedMembershipListener;

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.remoting.transport.jgroups;
+package org.infinispan.remoting.transport.jgroups;
 
-import org.infinispan.io.ByteBuffer;
-import org.infinispan.marshall.Marshaller;
+import org.infinispan.io.ByteBuffer;
+import org.infinispan.marshall.Marshaller;
 import org.jgroups.blocks.RpcDispatcher;
 import org.jgroups.util.Buffer;
 

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/RequestIgnoredResponse.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/RequestIgnoredResponse.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/RequestIgnoredResponse.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
-package org.infinispan.remoting.transport.jgroups;
+package org.infinispan.remoting.transport.jgroups;
 
 /**
  * Indicates that the request was ignored,

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/StateTransferMonitor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/StateTransferMonitor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/StateTransferMonitor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.remoting.transport.jgroups;
+package org.infinispan.remoting.transport.jgroups;
 
-import org.infinispan.statetransfer.StateTransferException;
+import org.infinispan.statetransfer.StateTransferException;
 
 public class StateTransferMonitor {
    /**

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/SuspectException.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/SuspectException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/SuspectException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.remoting.transport.jgroups;
+package org.infinispan.remoting.transport.jgroups;
 
-import org.infinispan.CacheException;
+import org.infinispan.CacheException;
 
 /**
  * Thrown when a member is suspected during remote method invocation

Modified: trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferException.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.statetransfer;
+package org.infinispan.statetransfer;
 
 /**
  * An exception to denote problems in transferring state between cache instances in a cluster

Modified: trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManager.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.statetransfer;
+package org.infinispan.statetransfer;
 
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
+import org.infinispan.factories.scopes.Scope;
+import org.infinispan.factories.scopes.Scopes;
 
 import java.io.InputStream;
 import java.io.OutputStream;

Modified: trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,36 +19,36 @@
  * 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.statetransfer;
+package org.infinispan.statetransfer;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.commands.CommandsFactory;
-import org.infinispan.commands.control.StateTransferControlCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.config.Configuration;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.annotations.Start;
-import org.infinispan.interceptors.InterceptorChain;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.invocation.Flag;
-import org.infinispan.io.UnclosableObjectInputStream;
-import org.infinispan.io.UnclosableObjectOutputStream;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.marshall.Marshaller;
-import org.infinispan.remoting.RpcManager;
-import org.infinispan.remoting.ResponseMode;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.remoting.transport.DistributedSync;
-import org.infinispan.transaction.TransactionLog;
-import org.infinispan.util.Util;
+import org.infinispan.AdvancedCache;
+import org.infinispan.commands.CommandsFactory;
+import org.infinispan.commands.control.StateTransferControlCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.config.Configuration;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.Start;
+import org.infinispan.interceptors.InterceptorChain;
+import org.infinispan.invocation.InvocationContextContainer;
+import org.infinispan.invocation.Flag;
+import org.infinispan.io.UnclosableObjectInputStream;
+import org.infinispan.io.UnclosableObjectOutputStream;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.marshall.Marshaller;
+import org.infinispan.remoting.RpcManager;
+import org.infinispan.remoting.ResponseMode;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.DistributedSync;
+import org.infinispan.transaction.TransactionLog;
+import org.infinispan.util.Util;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: trunk/core/src/main/java/org/infinispan/transaction/BatchModeTransactionManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/BatchModeTransactionManager.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/BatchModeTransactionManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.transaction;
+package org.infinispan.transaction;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/DummyBaseTransactionManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.transaction;
+package org.infinispan.transaction;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/DummyTransaction.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.transaction;
+package org.infinispan.transaction;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/DummyTransactionManager.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.transaction;
+package org.infinispan.transaction;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

Modified: trunk/core/src/main/java/org/infinispan/transaction/DummyTransactionManagerLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/DummyTransactionManagerLookup.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/DummyTransactionManagerLookup.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.transaction;
+package org.infinispan.transaction;
 
 
 import javax.transaction.TransactionManager;
@@ -27,7 +27,7 @@
 
 
 /**
- * Returns an instance of {@link org.infinispan.transaction.DummyTransactionManager}.
+ * Returns an instance of {@link org.infinispan.transaction.DummyTransactionManager}.
  *
  * @author Bela Ban Sept 5 2003
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/transaction/DummyUserTransaction.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/DummyUserTransaction.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/DummyUserTransaction.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.transaction;
+package org.infinispan.transaction;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/GenericTransactionManagerLookup.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.transaction;
+package org.infinispan.transaction;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -33,7 +33,7 @@
  * A transaction manager lookup class that attempts to locate a TransactionManager. A variety of different classes and
  * JNDI locations are tried, for servers such as: <ul> <li> JBoss <li> JRun4 <li> Resin <li> Orion <li> JOnAS <li> BEA
  * Weblogic <li> Websphere 4.0, 5.0, 5.1, 6.0 <li> Sun, Glassfish </ul> If a transaction manager is not found, returns a
- * {@link org.infinispan.transaction.DummyTransactionManager}.
+ * {@link org.infinispan.transaction.DummyTransactionManager}.
  *
  * @author Markus Plesser
  * @since 4.0

Modified: trunk/core/src/main/java/org/infinispan/transaction/GlobalTransaction.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/GlobalTransaction.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/GlobalTransaction.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.transaction;
+package org.infinispan.transaction;
 
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.Address;
 
 import java.io.Externalizable;
 import java.io.IOException;

Modified: trunk/core/src/main/java/org/infinispan/transaction/JBossStandaloneJTAManagerLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/JBossStandaloneJTAManagerLookup.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/JBossStandaloneJTAManagerLookup.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.transaction;
+package org.infinispan.transaction;
 
 
 import javax.transaction.TransactionManager;

Modified: trunk/core/src/main/java/org/infinispan/transaction/JBossTransactionManagerLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/JBossTransactionManagerLookup.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/JBossTransactionManagerLookup.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.transaction;
+package org.infinispan.transaction;
 
 import javax.naming.InitialContext;
 import javax.transaction.TransactionManager;

Modified: trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,13 +19,13 @@
 * 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.transaction;
+package org.infinispan.transaction;
 
-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.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 java.io.ObjectOutputStream;
 import java.util.ArrayList;

Modified: trunk/core/src/main/java/org/infinispan/transaction/TransactionManagerLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/TransactionManagerLookup.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/TransactionManagerLookup.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.transaction;
+package org.infinispan.transaction;
 
 import javax.transaction.TransactionManager;
 
 /**
- * Factory interface, allows {@link org.infinispan.Cache} to use different transactional systems. Names of implementors of
+ * Factory interface, allows {@link org.infinispan.Cache} to use different transactional systems. Names of implementors of
  * this class can be configured using {@link Configuration#setTransactionManagerLookupClass}.
  *
  * @author Bela Ban, Aug 26 2003

Modified: trunk/core/src/main/java/org/infinispan/transaction/TransactionTable.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/TransactionTable.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/transaction/TransactionTable.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,20 +19,20 @@
  * 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.transaction;
+package org.infinispan.transaction;
 
-import org.infinispan.CacheException;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.context.TransactionContext;
-import org.infinispan.factories.annotations.Inject;
-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.CacheException;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.context.TransactionContext;
+import org.infinispan.factories.annotations.Inject;
+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 javax.transaction.Status;
 import javax.transaction.SystemException;

Modified: trunk/core/src/main/java/org/infinispan/util/AbstractMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/AbstractMap.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/AbstractMap.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.util.Collection;
 import java.util.Map;

Modified: trunk/core/src/main/java/org/infinispan/util/BeanUtils.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/BeanUtils.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/BeanUtils.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.lang.reflect.Method;
 import java.util.Locale;

Modified: trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.util.AbstractCollection;
 import java.util.AbstractSet;

Modified: trunk/core/src/main/java/org/infinispan/util/BidirectionalMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/BidirectionalMap.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/BidirectionalMap.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.util.Map;
 

Modified: trunk/core/src/main/java/org/infinispan/util/FastCopyHashMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/FastCopyHashMap.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/FastCopyHashMap.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.io.IOException;
 import java.io.Serializable;

Modified: trunk/core/src/main/java/org/infinispan/util/FileLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/FileLookup.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/FileLookup.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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;
+package org.infinispan.util;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import java.io.File;
 import java.io.FileInputStream;

Modified: trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.util.AbstractSet;
 import java.util.Collection;

Modified: trunk/core/src/main/java/org/infinispan/util/ImmutableListCopy.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/ImmutableListCopy.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/ImmutableListCopy.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.util;
+package org.infinispan.util;
 
 import net.jcip.annotations.Immutable;
 

Modified: trunk/core/src/main/java/org/infinispan/util/Immutables.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/Immutables.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/Immutables.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;

Modified: trunk/core/src/main/java/org/infinispan/util/ObjectDuplicator.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/ObjectDuplicator.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/ObjectDuplicator.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.util.Collection;
 import java.util.HashMap;

Modified: trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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;
+package org.infinispan.util;
 
-import org.infinispan.CacheException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.CacheException;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;

Modified: trunk/core/src/main/java/org/infinispan/util/ReversibleOrderedSet.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/ReversibleOrderedSet.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/ReversibleOrderedSet.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.util.Iterator;
 import java.util.Set;

Modified: trunk/core/src/main/java/org/infinispan/util/SimpleImmutableEntry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/SimpleImmutableEntry.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/SimpleImmutableEntry.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.io.Serializable;
 import java.util.Map;

Modified: trunk/core/src/main/java/org/infinispan/util/TypedProperties.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/TypedProperties.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/TypedProperties.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.util;
+package org.infinispan.util;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 
 import java.util.Properties;
 

Modified: trunk/core/src/main/java/org/infinispan/util/Util.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/Util.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/Util.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.io.InputStream;
 import java.io.OutputStream;

Modified: trunk/core/src/main/java/org/infinispan/util/VisitableBidirectionalLinkedHashSet.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/VisitableBidirectionalLinkedHashSet.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/VisitableBidirectionalLinkedHashSet.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util;
+package org.infinispan.util;
 
 import java.util.AbstractSet;
 import java.util.Collection;

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/BoundedExecutors.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/BoundedExecutors.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/BoundedExecutors.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.util.concurrent;
+package org.infinispan.util.concurrent;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.util.concurrent;
+package org.infinispan.util.concurrent;
 
 import java.util.AbstractSet;
 import java.util.Collection;

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/ReclosableLatch.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/ReclosableLatch.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/ReclosableLatch.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.util.concurrent;
+package org.infinispan.util.concurrent;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.AbstractQueuedSynchronizer;

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/SynchronizedRestarter.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/SynchronizedRestarter.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/SynchronizedRestarter.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.util.concurrent;
+package org.infinispan.util.concurrent;
 
-import org.infinispan.lifecycle.Lifecycle;
+import org.infinispan.lifecycle.Lifecycle;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.LockSupport;

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/WithinThreadExecutor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/WithinThreadExecutor.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/WithinThreadExecutor.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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;
+package org.infinispan.util.concurrent;
 
-import org.infinispan.CacheException;
+import org.infinispan.CacheException;
 
 import java.util.Collection;
 import java.util.Collections;

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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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;
+package org.infinispan.util.concurrent.locks;
 
 import net.jcip.annotations.ThreadSafe;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.transaction.GlobalTransaction;
+import org.infinispan.invocation.InvocationContextContainer;
+import org.infinispan.transaction.GlobalTransaction;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.AbstractQueuedSynchronizer;

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util.concurrent.locks.containers;
+package org.infinispan.util.concurrent.locks.containers;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.util.concurrent.locks.containers;
+package org.infinispan.util.concurrent.locks.containers;
 
 import net.jcip.annotations.ThreadSafe;
 

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/LockContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/LockContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/LockContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util.concurrent.locks.containers;
+package org.infinispan.util.concurrent.locks.containers;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;

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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantPerEntryLockContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.util.concurrent.locks.containers;
+package org.infinispan.util.concurrent.locks.containers;
 
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.util.concurrent.locks.OwnableReentrantLock;
+import org.infinispan.invocation.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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/OwnableReentrantStripedLockContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,20 +19,20 @@
  * 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.containers;
+package org.infinispan.util.concurrent.locks.containers;
 
 import net.jcip.annotations.ThreadSafe;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.util.concurrent.locks.OwnableReentrantLock;
+import org.infinispan.invocation.InvocationContextContainer;
+import org.infinispan.util.concurrent.locks.OwnableReentrantLock;
 
 import java.util.Arrays;
 
 /**
- * A LockContainer that holds {@link org.infinispan.util.concurrent.locks.OwnableReentrantLock}s.
+ * A LockContainer that holds {@link org.infinispan.util.concurrent.locks.OwnableReentrantLock}s.
  *
  * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
  * @see ReentrantStripedLockContainer
- * @see org.infinispan.util.concurrent.locks.OwnableReentrantLock
+ * @see org.infinispan.util.concurrent.locks.OwnableReentrantLock
  * @since 4.0
  */
 @ThreadSafe

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantPerEntryLockContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantPerEntryLockContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantPerEntryLockContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util.concurrent.locks.containers;
+package org.infinispan.util.concurrent.locks.containers;
 
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantStripedLockContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantStripedLockContainer.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/containers/ReentrantStripedLockContainer.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.util.concurrent.locks.containers;
+package org.infinispan.util.concurrent.locks.containers;
 
 import net.jcip.annotations.ThreadSafe;
 

Modified: trunk/core/src/main/release/licenses/README-bdbje-lib.txt
===================================================================
--- trunk/core/src/main/release/licenses/README-bdbje-lib.txt	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/core/src/main/release/licenses/README-bdbje-lib.txt	2009-04-07 10:54:33 UTC (rev 91)
@@ -3,7 +3,7 @@
 
 NAME:    Sleepycat Berkeley DB Java Edition
 PROJECT: http://www.oracle.com/database/berkeley-db/je/index.html
-PURPOSE: Used for Berkeley DB-based CacheLoader (org.infinispan.loader.bdbje.BdbjeCacheStore) in Infinispan
+PURPOSE: Used for Berkeley DB-based CacheLoader (org.infinispan.loader.bdbje.BdbjeCacheStore) in Infinispan
 RESTRICTION: Infinispan can use Berkeley DB Java Edition from Oracle
              for persistent, reliable and transaction-protected
              data storage. If you choose to use Berkeley DB Java Edition

Modified: trunk/core/src/main/resources/config-samples/all.xml
===================================================================
--- trunk/core/src/main/resources/config-samples/all.xml	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/core/src/main/resources/config-samples/all.xml	2009-04-07 10:54:33 UTC (rev 91)
@@ -9,21 +9,21 @@
    <global>
 
       <!-- Note that if these are left blank, defaults are used.  See the user guide for what these defaults are -->
-      <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+      <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
          <property name="maxThreads" value="5"/>
          <property name="threadNamePrefix" value="AsyncListenerThread"/>
       </asyncListenerExecutor>
 
-      <asyncSerializationExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+      <asyncSerializationExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
          <property name="maxThreads" value="25"/>
          <property name="threadNamePrefix" value="AsyncSerializationThread"/>
       </asyncSerializationExecutor>
 
-      <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+      <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
          <property name="threadNamePrefix" value="EvictionThread"/>
       </evictionScheduledExecutor>
 
-      <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+      <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
          <property name="threadNamePrefix" value="ReplicationQueueThread"/>
       </replicationQueueScheduledExecutor>
 
@@ -34,7 +34,7 @@
          There is no added cost to defining a transport but not creating a cache that uses one, since the transport
          is created and initialized lazily.
       -->
-      <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="infinispan-cluster"
+      <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="infinispan-cluster"
                  distributedSyncTimeout="50000">
          <!-- Note that the JGroups transport uses sensible defaults if no configuration property is defined. -->
          <property name="configurationFile" value="udp.xml"/>
@@ -42,7 +42,7 @@
       </transport>
 
       <!-- Again, sensible defaults are used here if this is omitted.  -->
-      <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"
+      <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"
                      objectInputStreamPoolSize="100" objectOutputStreamPoolSize="100"/>
 
       <!--
@@ -70,7 +70,7 @@
       Used to register a transaction manager and participate in ongoing transactions.
       -->
       <transaction
-            transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup"
+            transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup"
             syncRollbackPhase="false"
             syncCommitPhase="false"/>
 
@@ -143,13 +143,13 @@
          <!--
             We can have multiple cache loaders, which get chained
          -->
-         <loader class="org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore" fetchPersistentState="true"
+         <loader class="org.infinispan.loader.jdbc.stringbased.JdbcStringBasedCacheStore" fetchPersistentState="true"
                  ignoreModifications="true" purgeOnStartup="true">
 
             <!-- See the documentation for more configuration examples and flags. -->
             <properties>
-               <property name="connectionFactoryClass" value="org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory"/>
-               <property name="connectionUrl" value="org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory"/>
+               <property name="connectionFactoryClass" value="org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory"/>
+               <property name="connectionUrl" value="org.infinispan.loader.jdbc.connectionfactory.PooledConnectionFactory"/>
                <property name="userName" value="root"/>
                <property name="driverClass" value="org.dbms.Driver"/>
                <property name="idColumnType" value="VARCHAR2(256)"/>
@@ -182,8 +182,8 @@
          </interceptor>
          <interceptor position="last" class="com.mycompany.CustomInterceptor2"/>
          <interceptor index="3" class="com.mycompany.CustomInterceptor1"/>
-         <interceptor before="org.infinispan.interceptors.CallInterceptor" class="com.mycompany.CustomInterceptor2"/>
-         <interceptor after="org.infinispan.interceptors.CallInterceptor" class="com.mycompany.CustomInterceptor1"/>
+         <interceptor before="org.infinispanpan.interceptors.CallInterceptor" class="com.mycompany.CustomInterceptor2"/>
+         <interceptor after="org.infinispanpan.interceptors.CallInterceptor" class="com.mycompany.CustomInterceptor1"/>
       </customInterceptors>
       -->
    </namedCache>

Copied: trunk/core/src/test/java/org/infinispan (from rev 88, trunk/core/src/test/java/org/infinispan)

Modified: trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.api;
+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.transaction.DummyTransactionManager;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+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.transaction.DummyTransactionManager;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 import org.testng.annotations.Test;
@@ -17,7 +17,7 @@
 import java.util.Map;
 
 /**
- * Tests the {@link org.infinispan.Cache} public API at a high level
+ * Tests the {@link org.infinispan.Cache} public API at a high level
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
  */

Modified: trunk/core/src/test/java/org/infinispan/api/CacheClusterJoinTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/CacheClusterJoinTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/CacheClusterJoinTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.api;
+package org.infinispan.api;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.Configuration.CacheMode;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.Configuration.CacheMode;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.Test;
 
 import java.util.List;

Modified: trunk/core/src/test/java/org/infinispan/api/MixedModeTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/MixedModeTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/MixedModeTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.api;
+package org.infinispan.api;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.config.Configuration;
-import org.infinispan.invocation.Flag;
-import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.AdvancedCache;
+import org.infinispan.config.Configuration;
+import org.infinispan.invocation.Flag;
+import org.infinispan.test.MultipleCacheManagersTest;
 import org.testng.annotations.Test;
 
 @Test(groups = "functional", testName = "api.MixedModeTest")

Modified: trunk/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/batch/AbstractBatchTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.api.batch;
+package org.infinispan.api.batch;
 
-import org.infinispan.Cache;
+import org.infinispan.Cache;
 
 import java.util.concurrent.atomic.AtomicReference;
 

Modified: trunk/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/batch/BatchWithTMTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.api.batch;
+package org.infinispan.api.batch;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/api/batch/BatchWithoutTMTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/batch/BatchWithoutTMTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/batch/BatchWithoutTMTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.api.batch;
+package org.infinispan.api.batch;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.ConfigurationException;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/LockAssert.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.api.mvcc;
+package org.infinispan.api.mvcc;
 
-import org.infinispan.Cache;
-import org.infinispan.invocation.InvocationContextContainer;
-import org.infinispan.lock.LockManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.util.concurrent.locks.containers.LockContainer;
+import org.infinispan.Cache;
+import org.infinispan.invocation.InvocationContextContainer;
+import org.infinispan.lock.LockManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.util.concurrent.locks.containers.LockContainer;
 
 /**
  * Helper class to assert lock status in MVCC

Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/LockPerEntryTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/LockPerEntryTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/LockPerEntryTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.api.mvcc;
+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.manager.CacheManager;
-import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.util.concurrent.locks.containers.LockContainer;
+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.manager.CacheManager;
+import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.util.concurrent.locks.containers.LockContainer;
 import org.testng.annotations.Test;
 
 import java.util.LinkedList;

Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,17 +1,17 @@
-package org.infinispan.api.mvcc;
+package org.infinispan.api.mvcc;
 
-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.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+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.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,23 +1,23 @@
-package org.infinispan.api.mvcc;
+package org.infinispan.api.mvcc;
 
 import org.easymock.EasyMock;
 import static org.easymock.EasyMock.*;
-import org.infinispan.Cache;
-import org.infinispan.commands.CacheRpcCommand;
-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.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;
-import org.infinispan.test.ReplListener;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
-import org.infinispan.transaction.TransactionTable;
+import org.infinispan.Cache;
+import org.infinispan.commands.CacheRpcCommand;
+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.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;
+import org.infinispan.test.ReplListener;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.transaction.TransactionTable;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
 

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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIMVCCTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.api.mvcc.read_committed;
+package org.infinispan.api.mvcc.read_committed;
 
-import org.infinispan.api.CacheAPITest;
-import org.infinispan.lock.IsolationLevel;
+import org.infinispan.api.CacheAPITest;
+import org.infinispan.lock.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/read_committed/ReadCommittedLockTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.api.mvcc.read_committed;
+package org.infinispan.api.mvcc.read_committed;
 
-import org.infinispan.Cache;
-import org.infinispan.api.mvcc.LockTestBase;
+import org.infinispan.Cache;
+import org.infinispan.api.mvcc.LockTestBase;
 import org.testng.annotations.Test;
 
 import javax.transaction.Transaction;

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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/CacheAPIMVCCTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.api.mvcc.repeatable_read;
+package org.infinispan.api.mvcc.repeatable_read;
 
-import org.infinispan.api.CacheAPITest;
-import org.infinispan.lock.IsolationLevel;
+import org.infinispan.api.CacheAPITest;
+import org.infinispan.lock.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/RepeatableReadLockTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.api.mvcc.repeatable_read;
+package org.infinispan.api.mvcc.repeatable_read;
 
-import org.infinispan.Cache;
-import org.infinispan.api.mvcc.LockTestBase;
+import org.infinispan.Cache;
+import org.infinispan.api.mvcc.LockTestBase;
 import org.testng.annotations.Test;
 
 import javax.transaction.Transaction;

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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,15 +1,15 @@
-package org.infinispan.api.mvcc.repeatable_read;
+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.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+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.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/atomic/APITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/APITest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/atomic/APITest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,14 +19,14 @@
  * 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.atomic;
+package org.infinispan.atomic;
 
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import static org.infinispan.atomic.AtomicHashMapTestAssertions.assertIsEmpty;
-import static org.infinispan.atomic.AtomicHashMapTestAssertions.assertIsEmptyMap;
-import org.infinispan.config.Configuration;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import static org.infinispan.atomic.AtomicHashMapTestAssertions.assertIsEmpty;
+import static org.infinispan.atomic.AtomicHashMapTestAssertions.assertIsEmptyMap;
+import org.infinispan.config.Configuration;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;

Modified: trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapConcurrencyTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.atomic;
+package org.infinispan.atomic;
 
-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.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.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -21,7 +21,7 @@
  *
  */
 
-package org.infinispan.atomic;
+package org.infinispan.atomic;
 
 import org.easymock.EasyMock;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.atomic;
+package org.infinispan.atomic;
 
 import java.util.Map;
 

Modified: trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/atomic/AtomicMapFunctionalTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,16 +1,16 @@
-package org.infinispan.atomic;
+package org.infinispan.atomic;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-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.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+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.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/atomic/ClusteredAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/ClusteredAPITest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/atomic/ClusteredAPITest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.atomic;
+package org.infinispan.atomic;
 
-import org.infinispan.Cache;
-import static org.infinispan.atomic.AtomicHashMapTestAssertions.assertIsEmpty;
-import static org.infinispan.atomic.AtomicHashMapTestAssertions.assertIsEmptyMap;
-import org.infinispan.config.Configuration;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.transaction.DummyTransactionManager;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import static org.infinispan.atomic.AtomicHashMapTestAssertions.assertIsEmpty;
+import static org.infinispan.atomic.AtomicHashMapTestAssertions.assertIsEmptyMap;
+import org.infinispan.config.Configuration;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.transaction.DummyTransactionManager;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.Test;
 
 import java.util.List;

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/ConfigurationParserTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.config.parsing;
+package org.infinispan.config.parsing;
 
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.eviction.EvictionStrategy;
-import org.infinispan.loader.CacheStoreConfig;
-import org.infinispan.loader.decorators.SingletonStoreConfig;
-import org.infinispan.loader.file.FileCacheStore;
-import org.infinispan.loader.file.FileCacheStoreConfig;
-import org.infinispan.lock.IsolationLevel;
-import org.infinispan.transaction.GenericTransactionManagerLookup;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.eviction.EvictionStrategy;
+import org.infinispan.loader.CacheStoreConfig;
+import org.infinispan.loader.decorators.SingletonStoreConfig;
+import org.infinispan.loader.file.FileCacheStore;
+import org.infinispan.loader.file.FileCacheStoreConfig;
+import org.infinispan.lock.IsolationLevel;
+import org.infinispan.transaction.GenericTransactionManagerLookup;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
@@ -154,7 +154,7 @@
       XmlConfigurationParserImpl parser = new XmlConfigurationParserImpl();
       String xml =
             "      <loaders passivation=\"true\" shared=\"true\" preload=\"true\">\n" +
-                  "         <loader class=\"org.infinispan.loader.file.FileCacheStore\" fetchPersistentState=\"true\"\n" +
+                  "         <loader class=\"org.infinispan.loader.file.FileCacheStore\" fetchPersistentState=\"true\"\n" +
                   "                 ignoreModifications=\"true\" purgeOnStartup=\"true\">\n" +
                   "            <properties>\n" +
                   "               <property name=\"location\" value=\"blahblah\"/>\n" +
@@ -199,7 +199,7 @@
    public void testCacheLoadersDefaults() throws Exception {
       XmlConfigurationParserImpl parser = new XmlConfigurationParserImpl();
       String xml = "<loaders>\n" +
-            "         <loader class=\"org.infinispan.loader.file.FileCacheStore\">\n" +
+            "         <loader class=\"org.infinispan.loader.file.FileCacheStore\">\n" +
             "            <properties />\n" +
             "         </loader>\n" +
             "      </loaders>";
@@ -216,7 +216,7 @@
       assert !clc.isPreload();
 
       CacheStoreConfig iclc = (CacheStoreConfig) clc.getFirstCacheLoaderConfig();
-      assert iclc.getCacheLoaderClassName().equals("org.infinispan.loader.file.FileCacheStore");
+      assert iclc.getCacheLoaderClassName().equals("org.infinispan.loader.file.FileCacheStore");
       assert !iclc.getAsyncStoreConfig().isEnabled();
       assert !iclc.isFetchPersistentState();
       assert !iclc.isIgnoreModifications();

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.config.parsing;
+package org.infinispan.config.parsing;
 
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.executors.DefaultExecutorFactory;
-import org.infinispan.executors.DefaultScheduledExecutorFactory;
-import org.infinispan.marshall.InfinispanMarshaller;
-import org.infinispan.marshall.VersionAwareMarshaller;
-import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.executors.DefaultExecutorFactory;
+import org.infinispan.executors.DefaultScheduledExecutorFactory;
+import org.infinispan.marshall.InfinispanMarshaller;
+import org.infinispan.marshall.VersionAwareMarshaller;
+import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
@@ -41,7 +41,7 @@
 
    public void testGlobalJmxStatistics() throws Exception {
       XmlConfigurationParserImpl parser = new XmlConfigurationParserImpl();
-      String xml = "<globalJmxStatistics enabled=\"true\" jmxDomain=\"infinispans\" mBeanServerLookup=\"org.infinispan.jmx.PerThreadMBeanServerLookup\" allowDuplicateDomains=\"true\"/>";
+      String xml = "<globalJmxStatistics enabled=\"true\" jmxDomain=\"infinispans\" mBeanServerLookup=\"org.infinispan.jmx.PerThreadMBeanServerLookup\" allowDuplicateDomains=\"true\"/>";
       Element e = XmlConfigHelper.stringToElement(xml);
 
       GlobalConfiguration c = new GlobalConfiguration();
@@ -49,7 +49,7 @@
 
       assert c.isExposeGlobalJmxStatistics();
       assert c.getJmxDomain().equals("infinispans");
-      assert c.getMBeanServerLookup().equals("org.infinispan.jmx.PerThreadMBeanServerLookup");
+      assert c.getMBeanServerLookup().equals("org.infinispan.jmx.PerThreadMBeanServerLookup");
       assert c.isAllowDuplicateDomains();
    }
 
@@ -77,7 +77,7 @@
 
    public void testMarshalling() throws Exception {
       XmlConfigurationParserImpl parser = new XmlConfigurationParserImpl();
-      String xml = "<serialization marshallerClass=\"org.infinispan.marshall.InfinispanMarshaller\" version=\"9.2\"\n" +
+      String xml = "<serialization marshallerClass=\"org.infinispan.marshall.InfinispanMarshaller\" version=\"9.2\"\n" +
             "                     objectInputStreamPoolSize=\"100\" objectOutputStreamPoolSize=\"100\"/>";
       Element e = XmlConfigHelper.stringToElement(xml);
 

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.config.parsing;
+package org.infinispan.config.parsing;
 
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.loader.file.FileCacheStoreConfig;
-import org.infinispan.lock.IsolationLevel;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.loader.file.FileCacheStoreConfig;
+import org.infinispan.lock.IsolationLevel;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
@@ -18,24 +18,24 @@
 
       GlobalConfiguration gc = parser.parseGlobalConfiguration();
 
-      assert gc.getAsyncListenerExecutorFactoryClass().equals("org.infinispan.executors.DefaultExecutorFactory");
+      assert gc.getAsyncListenerExecutorFactoryClass().equals("org.infinispan.executors.DefaultExecutorFactory");
       assert gc.getAsyncListenerExecutorProperties().getProperty("maxThreads").equals("5");
       assert gc.getAsyncListenerExecutorProperties().getProperty("threadNamePrefix").equals("AsyncListenerThread");
 
-      assert gc.getAsyncSerializationExecutorFactoryClass().equals("org.infinispan.executors.DefaultExecutorFactory");
+      assert gc.getAsyncSerializationExecutorFactoryClass().equals("org.infinispan.executors.DefaultExecutorFactory");
       assert gc.getAsyncSerializationExecutorProperties().getProperty("maxThreads").equals("25");
       assert gc.getAsyncSerializationExecutorProperties().getProperty("threadNamePrefix").equals("AsyncSerializationThread");
 
-      assert gc.getEvictionScheduledExecutorFactoryClass().equals("org.infinispan.executors.DefaultScheduledExecutorFactory");
+      assert gc.getEvictionScheduledExecutorFactoryClass().equals("org.infinispan.executors.DefaultScheduledExecutorFactory");
       assert gc.getEvictionScheduledExecutorProperties().getProperty("threadNamePrefix").equals("EvictionThread");
 
-      assert gc.getReplicationQueueScheduledExecutorFactoryClass().equals("org.infinispan.executors.DefaultScheduledExecutorFactory");
+      assert gc.getReplicationQueueScheduledExecutorFactoryClass().equals("org.infinispan.executors.DefaultScheduledExecutorFactory");
       assert gc.getReplicationQueueScheduledExecutorProperties().getProperty("threadNamePrefix").equals("ReplicationQueueThread");
 
-      assert gc.getTransportClass().equals("org.infinispan.remoting.transport.jgroups.JGroupsTransport");
+      assert gc.getTransportClass().equals("org.infinispan.remoting.transport.jgroups.JGroupsTransport");
       assert gc.getTransportProperties().isEmpty();
 
-      assert gc.getMarshallerClass().equals("org.infinispan.marshall.VersionAwareMarshaller");
+      assert gc.getMarshallerClass().equals("org.infinispan.marshall.VersionAwareMarshaller");
       assert gc.getMarshallVersionString().equals("1.0");
       assert gc.getObjectOutputStreamPoolSize() == 100;
       assert gc.getObjectInputStreamPoolSize() == 100;
@@ -50,7 +50,7 @@
 
       Configuration c = namedCaches.get("transactional");
 
-      assert c.getTransactionManagerLookupClass().equals("org.infinispan.transaction.GenericTransactionManagerLookup");
+      assert c.getTransactionManagerLookupClass().equals("org.infinispan.transaction.GenericTransactionManagerLookup");
 
       c = namedCaches.get("syncRepl");
 
@@ -74,7 +74,7 @@
 
       c = namedCaches.get("txSyncRepl");
 
-      assert c.getTransactionManagerLookupClass().equals("org.infinispan.transaction.GenericTransactionManagerLookup");
+      assert c.getTransactionManagerLookupClass().equals("org.infinispan.transaction.GenericTransactionManagerLookup");
       assert c.getCacheMode() == Configuration.CacheMode.REPL_SYNC;
       assert !c.isFetchInMemoryState();
       assert c.getSyncReplTimeout() == 15000;
@@ -95,7 +95,7 @@
       CacheLoaderManagerConfig loaderManagerConfig = c.getCacheLoaderManagerConfig();
       assert loaderManagerConfig.getCacheLoaderConfigs().size() == 1;
       FileCacheStoreConfig csConf = (FileCacheStoreConfig) loaderManagerConfig.getFirstCacheLoaderConfig();
-      assert csConf.getCacheLoaderClassName().equals("org.infinispan.loader.file.FileCacheStore");
+      assert csConf.getCacheLoaderClassName().equals("org.infinispan.loader.file.FileCacheStore");
       assert csConf.isFetchPersistentState();
       assert csConf.isIgnoreModifications();
       assert csConf.isPurgeOnStartup();
@@ -106,7 +106,7 @@
       assert !gc.isExposeGlobalJmxStatistics();
       assert gc.isAllowDuplicateDomains();
       assert gc.getJmxDomain().equals("funky_domain");
-      assert gc.getMBeanServerLookup().equals("org.infinispan.jmx.PerThreadMBeanServerLookup");
+      assert gc.getMBeanServerLookup().equals("org.infinispan.jmx.PerThreadMBeanServerLookup");
    }
 
    public void testConfigurationMerging() throws IOException {
@@ -118,7 +118,7 @@
       c.applyOverrides(namedCaches.get("transactional"));
 
       assert c.getCacheMode() == Configuration.CacheMode.LOCAL;
-      assert c.getTransactionManagerLookupClass().equals("org.infinispan.transaction.GenericTransactionManagerLookup");
+      assert c.getTransactionManagerLookupClass().equals("org.infinispan.transaction.GenericTransactionManagerLookup");
       assert c.getLockAcquisitionTimeout() == 1000;
       assert c.getConcurrencyLevel() == 100;
       assert c.getIsolationLevel() == IsolationLevel.READ_COMMITTED;
@@ -162,7 +162,7 @@
 
       c = defaultCfg.clone();
       c.applyOverrides(namedCaches.get("txSyncRepl"));
-      assert c.getTransactionManagerLookupClass().equals("org.infinispan.transaction.GenericTransactionManagerLookup");
+      assert c.getTransactionManagerLookupClass().equals("org.infinispan.transaction.GenericTransactionManagerLookup");
       assert c.getCacheMode() == Configuration.CacheMode.REPL_SYNC;
       assert !c.isFetchInMemoryState();
       assert c.getSyncReplTimeout() == 15000;

Modified: trunk/core/src/test/java/org/infinispan/container/FIFODataContainerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/container/FIFODataContainerTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/container/FIFODataContainerTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.container;
+package org.infinispan.container;
 
-import org.infinispan.container.entries.ImmortalCacheEntry;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.MortalCacheEntry;
-import org.infinispan.container.entries.TransientCacheEntry;
-import org.infinispan.container.entries.TransientMortalCacheEntry;
+import org.infinispan.container.entries.ImmortalCacheEntry;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.MortalCacheEntry;
+import org.infinispan.container.entries.TransientCacheEntry;
+import org.infinispan.container.entries.TransientMortalCacheEntry;
 import org.testng.annotations.Test;
 
 import java.util.Random;

Modified: trunk/core/src/test/java/org/infinispan/container/LRUDataContainerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/container/LRUDataContainerTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/container/LRUDataContainerTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.container;
+package org.infinispan.container;
 
-import org.infinispan.container.entries.ImmortalCacheEntry;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.MortalCacheEntry;
-import org.infinispan.container.entries.TransientCacheEntry;
-import org.infinispan.container.entries.TransientMortalCacheEntry;
+import org.infinispan.container.entries.ImmortalCacheEntry;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.MortalCacheEntry;
+import org.infinispan.container.entries.TransientCacheEntry;
+import org.infinispan.container.entries.TransientMortalCacheEntry;
 import org.testng.annotations.Test;
 
 @Test(groups = "unit", testName = "container.LRUDataContainerTest")

Modified: trunk/core/src/test/java/org/infinispan/container/SimpleDataContainerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/container/SimpleDataContainerTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/container/SimpleDataContainerTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.container;
+package org.infinispan.container;
 
-import org.infinispan.container.entries.ImmortalCacheEntry;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.MortalCacheEntry;
-import org.infinispan.container.entries.TransientCacheEntry;
-import org.infinispan.container.entries.TransientMortalCacheEntry;
+import org.infinispan.container.entries.ImmortalCacheEntry;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.MortalCacheEntry;
+import org.infinispan.container.entries.TransientCacheEntry;
+import org.infinispan.container.entries.TransientMortalCacheEntry;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.eviction;
+package org.infinispan.eviction;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.Test;
 
 import java.util.Random;

Modified: trunk/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.eviction;
+package org.infinispan.eviction;
 
 import static org.easymock.EasyMock.*;
 import org.easymock.IAnswer;
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalEntryFactory;
 import org.testng.annotations.Test;
 
 import java.util.Iterator;

Modified: trunk/core/src/test/java/org/infinispan/eviction/FIFOEvictionFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/eviction/FIFOEvictionFunctionalTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/eviction/FIFOEvictionFunctionalTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.eviction;
+package org.infinispan.eviction;
 
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/eviction/LRUEvictionFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/eviction/LRUEvictionFunctionalTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/eviction/LRUEvictionFunctionalTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.eviction;
+package org.infinispan.eviction;
 
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/expiry/ExpiryTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/expiry/ExpiryTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/expiry/ExpiryTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.expiry;
+package org.infinispan.expiry;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/expiry/ReplicatedExpiryTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/expiry/ReplicatedExpiryTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/expiry/ReplicatedExpiryTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.expiry;
+package org.infinispan.expiry;
 
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.TransientMortalCacheEntry;
-import org.infinispan.container.entries.MortalCacheEntry;
-import org.infinispan.container.entries.TransientCacheEntry;
-import org.infinispan.config.Configuration;
-import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.TransientMortalCacheEntry;
+import org.infinispan.container.entries.MortalCacheEntry;
+import org.infinispan.container.entries.TransientCacheEntry;
+import org.infinispan.config.Configuration;
+import org.infinispan.test.MultipleCacheManagersTest;
 import org.testng.annotations.Test;
 
 import java.util.List;

Modified: trunk/core/src/test/java/org/infinispan/factories/scopes/ScopeDetectorTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/factories/scopes/ScopeDetectorTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/factories/scopes/ScopeDetectorTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.factories.scopes;
+package org.infinispan.factories.scopes;
 
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/interceptors/MarshalledValueInterceptorTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/interceptors/MarshalledValueInterceptorTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/interceptors/MarshalledValueInterceptorTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.interceptors;
+package org.infinispan.interceptors;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.marshall.MarshalledValue;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.marshall.MarshalledValue;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/invalidation/AsyncInvalidationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/invalidation/AsyncInvalidationTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/invalidation/AsyncInvalidationTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.invalidation;
+package org.infinispan.invalidation;
 
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,22 +1,22 @@
-package org.infinispan.invalidation;
+package org.infinispan.invalidation;
 
 import static org.easymock.EasyMock.*;
-import org.infinispan.AdvancedCache;
-import org.infinispan.Cache;
-import org.infinispan.commands.CacheRpcCommand;
-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.remoting.RpcManager;
-import org.infinispan.remoting.RpcManagerImpl;
-import org.infinispan.remoting.ResponseFilter;
-import org.infinispan.remoting.ResponseMode;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.remoting.transport.Transport;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.AdvancedCache;
+import org.infinispan.Cache;
+import org.infinispan.commands.CacheRpcCommand;
+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.remoting.RpcManager;
+import org.infinispan.remoting.RpcManagerImpl;
+import org.infinispan.remoting.ResponseFilter;
+import org.infinispan.remoting.ResponseMode;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.Transport;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/invalidation/SyncInvalidationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/invalidation/SyncInvalidationTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/invalidation/SyncInvalidationTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.invalidation;
+package org.infinispan.invalidation;
 
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,17 +1,17 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.Cache;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.Cache;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,16 +1,16 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.Test;
 
 import javax.management.MBeanServer;

Modified: trunk/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
@@ -14,7 +14,7 @@
 import java.util.Map;
 
 /**
- * Test functionality in {@link org.infinispan.interceptors.CacheMgmtInterceptor}.
+ * Test functionality in {@link org.infinispan.interceptors.CacheMgmtInterceptor}.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.factories.AbstractComponentRegistry;
-import org.infinispan.interceptors.CacheMgmtInterceptor;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.AdvancedCache;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.factories.AbstractComponentRegistry;
+import org.infinispan.interceptors.CacheMgmtInterceptor;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.CacheException;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.CacheException;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
@@ -31,14 +31,14 @@
    @AfterMethod
    public void destroyCacheManager() {
       TestingUtil.killCacheManagers(cm, cm2, cm3);
-      assert !existsDomains("infinispan");
+      assert !existsDomains("infinispan");
    }
 
    /**
     * Create a local cache, two replicated caches and see that everithing is correctly registered.
     */
    public void testDefaultDomanin() {
-      assert !existsDomains("infinispan");
+      assert !existsDomains("infinispan");
       GlobalConfiguration globalConfiguration = GlobalConfiguration.getClusteredDefault();
       globalConfiguration.setExposeGlobalJmxStatistics(true);
       globalConfiguration.setMBeanServerLookup(PerThreadMBeanServerLookup.class.getName());
@@ -57,21 +57,21 @@
       cm.getCache("remote1");
       cm.getCache("remote2");
 
-      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
-      assert existsObject("infinispan:cache-name=[global],jmx-resource=RpcManager");
-      assert existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
-      assert existsObject("infinispan:cache-name=remote2(invalidation_async),jmx-resource=CacheMgmtInterceptor");
+      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+      assert existsObject("infinispan:cache-name=[global],jmx-resource=RpcManager");
+      assert existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
+      assert existsObject("infinispan:cache-name=remote2(invalidation_async),jmx-resource=CacheMgmtInterceptor");
 
       TestingUtil.killCacheManagers(cm);
 
-      assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
-      assert !existsObject("infinispan:cache-name=[global],jmx-resource=RpcManager");
-      assert !existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
-      assert !existsObject("infinispan:cache-name=remote2(invalidation_async),jmx-resource=CacheMgmtInterceptor");
+      assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+      assert !existsObject("infinispan:cache-name=[global],jmx-resource=RpcManager");
+      assert !existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
+      assert !existsObject("infinispan:cache-name=remote2(invalidation_async),jmx-resource=CacheMgmtInterceptor");
    }
 
    public void testDifferentDomain() {
-      assert !existsDomains("infinispan");
+      assert !existsDomains("infinispan");
       assert !existsDomains("mircea_jmx_domain");
       GlobalConfiguration globalConfiguration = GlobalConfiguration.getClusteredDefault();
       globalConfiguration.setJmxDomain("mircea_jmx_domain");
@@ -87,7 +87,7 @@
 
 
    public void testOnlyGlobalJmxStatsEnabled() {
-      assert !existsDomains("infinispan");
+      assert !existsDomains("infinispan");
       GlobalConfiguration globalConfiguration = GlobalConfiguration.getClusteredDefault();
       globalConfiguration.setExposeGlobalJmxStatistics(true);
       globalConfiguration.setMBeanServerLookup(PerThreadMBeanServerLookup.class.getName());
@@ -104,13 +104,13 @@
       cm.getCache("local_cache");
       cm.getCache("remote1");
 
-      assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
-      assert existsObject("infinispan:cache-name=[global],jmx-resource=RpcManager");
-      assert !existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
+      assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+      assert existsObject("infinispan:cache-name=[global],jmx-resource=RpcManager");
+      assert !existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
    }
 
    public void testOnlyPerCacheJmxStatsEnabled() {
-      assert !existsDomains("infinispan");
+      assert !existsDomains("infinispan");
       GlobalConfiguration globalConfiguration = GlobalConfiguration.getClusteredDefault();
       globalConfiguration.setExposeGlobalJmxStatistics(false);
       globalConfiguration.setMBeanServerLookup(PerThreadMBeanServerLookup.class.getName());
@@ -127,13 +127,13 @@
       cm.getCache("local_cache");
       cm.getCache("remote1");
 
-      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
-      assert !existsObject("infinispan:cache-name=[global],jmx-resource=RpcManager");
-      assert existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
+      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+      assert !existsObject("infinispan:cache-name=[global],jmx-resource=RpcManager");
+      assert existsObject("infinispan:cache-name=remote1(repl_sync),jmx-resource=CacheMgmtInterceptor");
    }
 
    public void testMultipleManagersOnSameServerFails() {
-      assert !existsDomains("infinispan");
+      assert !existsDomains("infinispan");
       GlobalConfiguration globalConfiguration = GlobalConfiguration.getClusteredDefault();
       globalConfiguration.setMBeanServerLookup(PerThreadMBeanServerLookup.class.getName());
       cm = TestCacheManagerFactory.createCacheManager(globalConfiguration);
@@ -141,7 +141,7 @@
       localCache.setExposeJmxStatistics(true);
       cm.defineCache("local_cache", localCache);
       cm.getCache("local_cache");
-      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
 
       GlobalConfiguration globalConfiguration2 = GlobalConfiguration.getClusteredDefault();
       globalConfiguration2.setExposeGlobalJmxStatistics(true);
@@ -160,7 +160,7 @@
    }
 
    public void testMultipleManagersOnSameServer() {
-      assert !existsDomains("infinispan");
+      assert !existsDomains("infinispan");
       GlobalConfiguration globalConfiguration = GlobalConfiguration.getClusteredDefault();
       globalConfiguration.setAllowDuplicateDomains(true);
       globalConfiguration.setExposeGlobalJmxStatistics(true);
@@ -170,7 +170,7 @@
       localCache.setExposeJmxStatistics(true);
       cm.defineCache("local_cache", localCache);
       cm.getCache("local_cache");
-      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
 
       GlobalConfiguration globalConfiguration2 = GlobalConfiguration.getClusteredDefault();
       globalConfiguration2.setExposeGlobalJmxStatistics(true);
@@ -196,7 +196,7 @@
    }
 
    public void testUnregisterJmxInfoOnStop() {
-      assert !existsDomains("infinispan");
+      assert !existsDomains("infinispan");
       GlobalConfiguration globalConfiguration = GlobalConfiguration.getClusteredDefault();
       globalConfiguration.setExposeGlobalJmxStatistics(true);
       globalConfiguration.setMBeanServerLookup(PerThreadMBeanServerLookup.class.getName());
@@ -205,23 +205,23 @@
       localCache.setExposeJmxStatistics(true);
       cm.defineCache("local_cache", localCache);
       cm.getCache("local_cache");
-      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
 
       TestingUtil.killCacheManagers(cm);
 
-      assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
-      assert !existsDomains("infinispan");
+      assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+      assert !existsDomains("infinispan");
    }
 
    public void testCorrectUnregistering() {
-      assert !existsDomains("infinispan");
+      assert !existsDomains("infinispan");
       GlobalConfiguration globalConfiguration = GlobalConfiguration.getNonClusteredDefault();
       globalConfiguration.setMBeanServerLookup(PerThreadMBeanServerLookup.class.getName());
       cm = TestCacheManagerFactory.createCacheManager(globalConfiguration);
       Configuration localCache = config();//local by default
       cm.defineCache("local_cache", localCache);
       cm.getCache("local_cache");
-      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
 
       //now register a global one
       GlobalConfiguration globalConfiguration2 = GlobalConfiguration.getClusteredDefault();
@@ -237,11 +237,11 @@
       assert existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
 
       cm2.stop();
-      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+      assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
       assert !existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
 
       cm.stop();
-      assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+      assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
       assert !existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
    }
 

Modified: trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.Test;
 
 import javax.management.MBeanServer;
@@ -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.lock.LockManagerImpl}.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/core/src/test/java/org/infinispan/jmx/PerThreadMBeanServerLookup.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/PerThreadMBeanServerLookup.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/jmx/PerThreadMBeanServerLookup.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;

Modified: trunk/core/src/test/java/org/infinispan/jmx/ResourceDMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/ResourceDMBeanTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/jmx/ResourceDMBeanTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.jmx.annotations.ManagedOperation;
+import org.infinispan.jmx.annotations.ManagedOperation;
 import org.testng.annotations.Test;
 
 /**

Modified: trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,17 +1,17 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.replay;
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.remoting.RpcManager;
-import org.infinispan.remoting.RpcManagerImpl;
-import org.infinispan.remoting.transport.Transport;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.remoting.RpcManager;
+import org.infinispan.remoting.RpcManagerImpl;
+import org.infinispan.remoting.transport.Transport;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.Test;
 
 import javax.management.MBeanServer;

Modified: trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,13 +1,13 @@
-package org.infinispan.jmx;
+package org.infinispan.jmx;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreConfigTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreConfigTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreConfigTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;

Modified: trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
 import static org.easymock.classextension.EasyMock.createMock;
-import org.infinispan.util.ReflectionUtil;
-import org.infinispan.util.concurrent.WithinThreadExecutor;
+import org.infinispan.util.ReflectionUtil;
+import org.infinispan.util.concurrent.WithinThreadExecutor;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/loader/BaseCacheStoreTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/BaseCacheStoreTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/BaseCacheStoreTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,18 +1,18 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
 import org.easymock.EasyMock;
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.io.UnclosableObjectInputStream;
-import org.infinispan.io.UnclosableObjectOutputStream;
-import org.infinispan.loader.modifications.Clear;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.loader.modifications.Remove;
-import org.infinispan.loader.modifications.Store;
-import org.infinispan.marshall.Marshaller;
-import org.infinispan.marshall.ObjectStreamMarshaller;
-import org.infinispan.util.Util;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.io.UnclosableObjectInputStream;
+import org.infinispan.io.UnclosableObjectOutputStream;
+import org.infinispan.loader.modifications.Clear;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.loader.modifications.Remove;
+import org.infinispan.loader.modifications.Store;
+import org.infinispan.marshall.Marshaller;
+import org.infinispan.marshall.ObjectStreamMarshaller;
+import org.infinispan.util.Util;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/loader/CacheLoaderFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/CacheLoaderFunctionalTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/CacheLoaderFunctionalTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,18 +1,18 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import static org.infinispan.api.mvcc.LockAssert.assertNoLocks;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.lifecycle.ComponentStatus;
-import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import static org.infinispan.api.mvcc.LockAssert.assertNoLocks;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.lifecycle.ComponentStatus;
+import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;

Modified: trunk/core/src/test/java/org/infinispan/loader/ClusterCacheLoaderTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/ClusterCacheLoaderTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/ClusterCacheLoaderTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,19 +1,19 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.Cache;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.loader.cluster.ClusterCacheLoaderConfig;
-import org.infinispan.loader.decorators.ChainingCacheStore;
-import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.Cache;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.loader.cluster.ClusterCacheLoaderConfig;
+import org.infinispan.loader.decorators.ChainingCacheStore;
+import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.Test;
 
 /**
- * Tester for {@link org.infinispan.loader.cluster.ClusterCacheLoader}
+ * Tester for {@link org.infinispan.loader.cluster.ClusterCacheLoader}
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/core/src/test/java/org/infinispan/loader/ConcurrentLoadAndEvictTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/ConcurrentLoadAndEvictTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/ConcurrentLoadAndEvictTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,20 +1,20 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.commands.read.GetKeyValueCommand;
-import org.infinispan.commands.write.EvictCommand;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.CustomInterceptorConfig;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.interceptors.CacheLoaderInterceptor;
-import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.commands.read.GetKeyValueCommand;
+import org.infinispan.commands.write.EvictCommand;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.CustomInterceptorConfig;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.interceptors.CacheLoaderInterceptor;
+import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.Test;
 
 import java.util.Collections;

Modified: trunk/core/src/test/java/org/infinispan/loader/PassivationFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/PassivationFunctionalTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/PassivationFunctionalTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.loader;
+package org.infinispan.loader;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;

Modified: trunk/core/src/test/java/org/infinispan/loader/decorators/AsyncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/decorators/AsyncTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/decorators/AsyncTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.loader.decorators;
+package org.infinispan.loader.decorators;
 
-import org.infinispan.CacheException;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.CacheException;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;

Modified: trunk/core/src/test/java/org/infinispan/loader/decorators/ChainingCacheLoaderTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/decorators/ChainingCacheLoaderTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/decorators/ChainingCacheLoaderTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,20 +1,20 @@
-package org.infinispan.loader.decorators;
+package org.infinispan.loader.decorators;
 
 import org.easymock.EasyMock;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.io.UnclosableObjectInputStream;
-import org.infinispan.io.UnclosableObjectOutputStream;
-import org.infinispan.loader.BaseCacheStoreTest;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.CacheStoreConfig;
-import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
-import org.infinispan.loader.modifications.Clear;
-import org.infinispan.loader.modifications.Modification;
-import org.infinispan.loader.modifications.Remove;
-import org.infinispan.loader.modifications.Store;
-import org.infinispan.marshall.ObjectStreamMarshaller;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.io.UnclosableObjectInputStream;
+import org.infinispan.io.UnclosableObjectOutputStream;
+import org.infinispan.loader.BaseCacheStoreTest;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.CacheStoreConfig;
+import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
+import org.infinispan.loader.modifications.Clear;
+import org.infinispan.loader.modifications.Modification;
+import org.infinispan.loader.modifications.Remove;
+import org.infinispan.loader.modifications.Store;
+import org.infinispan.marshall.ObjectStreamMarshaller;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/loader/decorators/ReadOnlyCacheStoreTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/decorators/ReadOnlyCacheStoreTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/decorators/ReadOnlyCacheStoreTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.loader.decorators;
+package org.infinispan.loader.decorators;
 
 import static org.easymock.EasyMock.*;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.container.entries.InternalCacheEntry;
 import org.testng.annotations.Test;
 
 @Test(groups = "unit", testName = "loader.decorators.ReadOnlyCacheStoreTest")

Modified: trunk/core/src/test/java/org/infinispan/loader/decorators/SingletonStoreTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/decorators/SingletonStoreTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/decorators/SingletonStoreTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,19 +1,19 @@
-package org.infinispan.loader.decorators;
+package org.infinispan.loader.decorators;
 
-import org.infinispan.Cache;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.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.Cache;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.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 static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.fail;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/loader/dummy/DummyInMemoryCacheStore.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/dummy/DummyInMemoryCacheStore.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/dummy/DummyInMemoryCacheStore.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,15 +1,15 @@
-package org.infinispan.loader.dummy;
+package org.infinispan.loader.dummy;
 
-import org.infinispan.Cache;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.loader.AbstractCacheStore;
-import org.infinispan.loader.AbstractCacheStoreConfig;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.marshall.Marshaller;
-import org.infinispan.marshall.ObjectStreamMarshaller;
+import org.infinispan.Cache;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loader.AbstractCacheStore;
+import org.infinispan.loader.AbstractCacheStoreConfig;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.marshall.Marshaller;
+import org.infinispan.marshall.ObjectStreamMarshaller;
 
 import java.io.ObjectInput;
 import java.io.ObjectOutput;

Modified: trunk/core/src/test/java/org/infinispan/loader/dummy/DummyInMemoryCacheStoreTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/dummy/DummyInMemoryCacheStoreTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/dummy/DummyInMemoryCacheStoreTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.loader.dummy;
+package org.infinispan.loader.dummy;
 
-import org.infinispan.loader.BaseCacheStoreTest;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.BaseCacheStoreTest;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.CacheLoaderException;
 import org.testng.annotations.Test;
 
 @Test(groups = "unit", testName = "loader.dummy.DummyInMemoryCacheStoreTest")

Modified: trunk/core/src/test/java/org/infinispan/loader/file/FileCacheStoreTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/file/FileCacheStoreTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/loader/file/FileCacheStoreTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,13 +1,13 @@
-package org.infinispan.loader.file;
+package org.infinispan.loader.file;
 
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.io.UnclosableObjectOutputStream;
-import org.infinispan.loader.BaseCacheStoreTest;
-import org.infinispan.loader.CacheLoaderException;
-import org.infinispan.loader.CacheStore;
-import org.infinispan.loader.bucket.Bucket;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.container.entries.InternalEntryFactory;
+import org.infinispan.io.UnclosableObjectOutputStream;
+import org.infinispan.loader.BaseCacheStoreTest;
+import org.infinispan.loader.CacheLoaderException;
+import org.infinispan.loader.CacheStore;
+import org.infinispan.loader.bucket.Bucket;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.Test;
 
 import java.io.ByteArrayInputStream;

Modified: trunk/core/src/test/java/org/infinispan/lock/LockContainerHashingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/lock/LockContainerHashingTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/lock/LockContainerHashingTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.lock;
+package org.infinispan.lock;
 
-import org.infinispan.util.concurrent.locks.containers.AbstractStripedLockContainer;
-import org.infinispan.util.concurrent.locks.containers.ReentrantStripedLockContainer;
+import org.infinispan.util.concurrent.locks.containers.AbstractStripedLockContainer;
+import org.infinispan.util.concurrent.locks.containers.ReentrantStripedLockContainer;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/lock/StripedLockTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/lock/StripedLockTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/lock/StripedLockTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.lock;
+package org.infinispan.lock;
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -7,7 +7,7 @@
 import java.util.concurrent.BlockingQueue;
 
 /**
- * Tester class for {@link org.infinispan.lock.StripedLock}.
+ * Tester class for {@link org.infinispan.lock.StripedLock}.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/manager/CacheManagerComponentRegistryTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,17 +1,17 @@
-package org.infinispan.manager;
+package org.infinispan.manager;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.eviction.EvictionManager;
-import org.infinispan.eviction.EvictionStrategy;
-import org.infinispan.interceptors.BatchingInterceptor;
-import org.infinispan.interceptors.InterceptorChain;
-import org.infinispan.remoting.RpcManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManager;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.eviction.EvictionManager;
+import org.infinispan.eviction.EvictionStrategy;
+import org.infinispan.interceptors.BatchingInterceptor;
+import org.infinispan.interceptors.InterceptorChain;
+import org.infinispan.remoting.RpcManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManager;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/manager/CacheManagerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/manager/CacheManagerTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/manager/CacheManagerTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.manager;
+package org.infinispan.manager;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.DuplicateCacheNameException;
-import org.infinispan.lifecycle.ComponentStatus;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.DuplicateCacheNameException;
+import org.infinispan.lifecycle.ComponentStatus;
 import org.testng.annotations.Test;
 
 /**

Modified: trunk/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.manager;
+package org.infinispan.manager;
 
-import org.infinispan.Cache;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.DuplicateCacheNameException;
-import org.infinispan.remoting.RpcManager;
+import org.infinispan.Cache;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.DuplicateCacheNameException;
+import org.infinispan.remoting.RpcManager;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
@@ -59,14 +59,14 @@
 
    public void testNamedCacheXMLClashingNames() throws IOException {
       String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-            "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">\n" +
+            "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">\n" +
             "\n" +
             "    <default>\n" +
             "        <locking concurrencyLevel=\"100\" lockAcquisitionTimeout=\"1000\" />\n" +
             "    </default>\n" +
             "\n" +
             "    <namedCache name=\"c1\">\n" +
-            "        <transaction transactionManagerLookupClass=\"org.infinispan.transaction.GenericTransactionManagerLookup\"/>\n" +
+            "        <transaction transactionManagerLookupClass=\"org.infinispan.transaction.GenericTransactionManagerLookup\"/>\n" +
             "    </namedCache>\n" +
             "\n" +
             "    <namedCache name=\"c1\">\n" +
@@ -75,7 +75,7 @@
             "        </clustering>\n" +
             "    </namedCache>\n" +
             "    \n" +
-            "</infinispan>";
+            "</infinispan>";
 
       ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
       try {
@@ -90,17 +90,17 @@
 
    public void testNamedCacheXMLClashingNamesProgrammatic() throws IOException {
       String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-            "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">\n" +
+            "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">\n" +
             "\n" +
             "    <default>\n" +
             "        <locking concurrencyLevel=\"100\" lockAcquisitionTimeout=\"1000\" />\n" +
             "    </default>\n" +
             "\n" +
             "    <namedCache name=\"c1\">\n" +
-            "        <transaction transactionManagerLookupClass=\"org.infinispan.transaction.GenericTransactionManagerLookup\"/>\n" +
+            "        <transaction transactionManagerLookupClass=\"org.infinispan.transaction.GenericTransactionManagerLookup\"/>\n" +
             "    </namedCache>\n" +
             "\n" +
-            "</infinispan>";
+            "</infinispan>";
 
       ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
       cm = new DefaultCacheManager(bais);

Modified: trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,24 +1,24 @@
-package org.infinispan.marshall;
+package org.infinispan.marshall;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.Cache;
-import org.infinispan.CacheException;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.interceptors.InterceptorChain;
-import org.infinispan.interceptors.MarshalledValueInterceptor;
-import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.loader.CacheLoaderConfig;
-import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
-import org.infinispan.notifications.Listener;
-import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified;
-import org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.AdvancedCache;
+import org.infinispan.Cache;
+import org.infinispan.CacheException;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.container.DataContainer;
+import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.interceptors.InterceptorChain;
+import org.infinispan.interceptors.MarshalledValueInterceptor;
+import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.loader.CacheLoaderConfig;
+import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
+import org.infinispan.notifications.Listener;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified;
+import org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -247,7 +247,7 @@
    /**
     * Run this as last method as it creates and stops cache loaders, which might affect other tests.
     */
-   @Test(dependsOnMethods = "org.infinispan.marshall.MarshalledValueTest.test(?!CacheLoaders)[a-zA-Z]*")
+   @Test(dependsOnMethods = "org.infinispan.marshall.MarshalledValueTest.test(?!CacheLoaders)[a-zA-Z]*")
    public void testCacheLoaders() throws CloneNotSupportedException {
       tearDown();
 

Modified: trunk/core/src/test/java/org/infinispan/marshall/ObjectStreamMarshaller.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/marshall/ObjectStreamMarshaller.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/marshall/ObjectStreamMarshaller.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.marshall;
+package org.infinispan.marshall;
 
-import org.infinispan.io.ByteBuffer;
+import org.infinispan.io.ByteBuffer;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Modified: trunk/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/notifications/AsyncNotificationTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.notifications;
+package org.infinispan.notifications;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated;
-import org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated;
+import org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/notifications/CacheListenerCacheLoaderTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,16 +1,16 @@
-package org.infinispan.notifications;
+package org.infinispan.notifications;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.config.Configuration;
-import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.notifications.cachelistener.annotation.CacheEntryActivated;
-import org.infinispan.notifications.cachelistener.annotation.CacheEntryLoaded;
-import org.infinispan.notifications.cachelistener.annotation.CacheEntryPassivated;
-import org.infinispan.notifications.cachelistener.event.CacheEntryEvent;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.config.Configuration;
+import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryActivated;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryLoaded;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryPassivated;
+import org.infinispan.notifications.cachelistener.event.CacheEntryEvent;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.notifications;
+package org.infinispan.notifications;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
-import org.infinispan.notifications.cachelistener.event.Event;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
+import org.infinispan.notifications.cachelistener.event.Event;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/notifications/ConcurrentNotificationTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,16 +1,16 @@
-package org.infinispan.notifications;
+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;
-import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved;
-import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
-import org.infinispan.notifications.cachelistener.event.Event;
-import org.infinispan.test.TestingUtil;
+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;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
+import org.infinispan.notifications.cachelistener.event.Event;
+import org.infinispan.test.TestingUtil;
 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/CacheListener.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheListener.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheListener.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.notifications.cachelistener;
+package org.infinispan.notifications.cachelistener;
 
-import org.infinispan.notifications.Listener;
-import org.infinispan.notifications.cachelistener.annotation.*;
-import org.infinispan.notifications.cachelistener.event.Event;
+import org.infinispan.notifications.Listener;
+import org.infinispan.notifications.cachelistener.annotation.*;
+import org.infinispan.notifications.cachelistener.event.Event;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierImplTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierImplTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierImplTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,18 +1,18 @@
-package org.infinispan.notifications.cachelistener;
+package org.infinispan.notifications.cachelistener;
 
 import org.easymock.EasyMock;
 import static org.easymock.EasyMock.createNiceMock;
-import org.infinispan.Cache;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.context.InvocationContextImpl;
-import org.infinispan.factories.context.ContextFactory;
-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;
-import org.infinispan.notifications.cachelistener.event.Event;
-import org.infinispan.notifications.cachelistener.event.TransactionCompletedEvent;
-import org.infinispan.notifications.cachelistener.event.TransactionRegisteredEvent;
+import org.infinispan.Cache;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.context.InvocationContextImpl;
+import org.infinispan.factories.context.ContextFactory;
+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;
+import org.infinispan.notifications.cachelistener.event.Event;
+import org.infinispan.notifications.cachelistener.event.TransactionCompletedEvent;
+import org.infinispan.notifications.cachelistener.event.TransactionRegisteredEvent;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/notifications/cachelistener/CacheNotifierTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.notifications.cachelistener;
+package org.infinispan.notifications.cachelistener;
 
 import static org.easymock.EasyMock.*;
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-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.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+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.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;

Modified: trunk/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerRegistrationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerRegistrationTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/notifications/cachelistener/ListenerRegistrationTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.notifications.cachelistener;
+package org.infinispan.notifications.cachelistener;
 
-import org.infinispan.notifications.IncorrectListenerException;
-import org.infinispan.notifications.Listener;
-import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved;
-import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
-import org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent;
-import org.infinispan.notifications.cachelistener.event.Event;
+import org.infinispan.notifications.IncorrectListenerException;
+import org.infinispan.notifications.Listener;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
+import org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent;
+import org.infinispan.notifications.cachelistener.event.Event;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerListener.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerListener.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerListener.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.notifications.cachemanagerlistener;
+package org.infinispan.notifications.cachemanagerlistener;
 
-import org.infinispan.notifications.Listener;
-import org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted;
-import org.infinispan.notifications.cachemanagerlistener.annotation.CacheStopped;
-import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
-import org.infinispan.notifications.cachemanagerlistener.event.Event;
+import org.infinispan.notifications.Listener;
+import org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted;
+import org.infinispan.notifications.cachemanagerlistener.annotation.CacheStopped;
+import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
+import org.infinispan.notifications.cachemanagerlistener.event.Event;
 
 @Listener
 public class CacheManagerListener {

Modified: trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImplTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImplTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierImplTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.notifications.cachemanagerlistener;
+package org.infinispan.notifications.cachemanagerlistener;
 
 import org.easymock.EasyMock;
-import org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent;
-import org.infinispan.notifications.cachemanagerlistener.event.CacheStoppedEvent;
-import org.infinispan.notifications.cachemanagerlistener.event.Event;
-import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent;
+import org.infinispan.notifications.cachemanagerlistener.event.CacheStoppedEvent;
+import org.infinispan.notifications.cachemanagerlistener.event.Event;
+import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
+import org.infinispan.remoting.transport.Address;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/notifications/cachemanagerlistener/CacheManagerNotifierTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.notifications.cachemanagerlistener;
+package org.infinispan.notifications.cachemanagerlistener;
 
 import static org.easymock.EasyMock.*;
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/profiling/AbstractProfileTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/profiling/AbstractProfileTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/profiling/AbstractProfileTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.profiling;
+package org.infinispan.profiling;
 
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.manager.DefaultCacheManager;
-import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.DefaultCacheManager;
+import org.infinispan.test.SingleCacheManagerTest;
 import org.testng.annotations.Test;
 
 @Test(groups = "profiling", enabled = false, testName = "profiling.SingleCacheManagerTest")

Modified: trunk/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.profiling;
+package org.infinispan.profiling;
 
-import org.infinispan.Cache;
-import org.infinispan.CacheException;
-import org.infinispan.manager.DefaultCacheManager;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.Cache;
+import org.infinispan.CacheException;
+import org.infinispan.manager.DefaultCacheManager;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.Test;
 
 import java.io.IOException;

Modified: trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/profiling/ProfileTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.profiling;
+package org.infinispan.profiling;
 
-import org.infinispan.profiling.testinternals.Generator;
-import org.infinispan.profiling.testinternals.TaskRunner;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.profiling.testinternals.Generator;
+import org.infinispan.profiling.testinternals.TaskRunner;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;

Modified: trunk/core/src/test/java/org/infinispan/profiling/ProfileTestSlave.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/profiling/ProfileTestSlave.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/profiling/ProfileTestSlave.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.profiling;
+package org.infinispan.profiling;
 
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/profiling/testinternals/Generator.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/profiling/testinternals/Generator.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/profiling/testinternals/Generator.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.profiling.testinternals;
+package org.infinispan.profiling.testinternals;
 
-//import org.infinispan.tree.Fqn;
+//import org.infinispan.tree.Fqn;
 
 import java.util.List;
 import java.util.Random;

Modified: trunk/core/src/test/java/org/infinispan/profiling/testinternals/TaskRunner.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/profiling/testinternals/TaskRunner.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/profiling/testinternals/TaskRunner.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.profiling.testinternals;
+package org.infinispan.profiling.testinternals;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

Modified: trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -6,13 +6,13 @@
  * See terms of license at gnu.org.
  */
 
-package org.infinispan.replication;
+package org.infinispan.replication;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import static org.testng.AssertJUnit.assertEquals;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/replication/AsyncReplicatedAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/AsyncReplicatedAPITest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/replication/AsyncReplicatedAPITest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.replication;
+package org.infinispan.replication;
 
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/replication/BaseReplicatedAPITest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,16 +1,16 @@
-package org.infinispan.replication;
+package org.infinispan.replication;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.Cache;
-import org.infinispan.commands.write.ClearCommand;
-import org.infinispan.commands.write.PutKeyValueCommand;
-import org.infinispan.commands.write.PutMapCommand;
-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.test.MultipleCacheManagersTest;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.AdvancedCache;
+import org.infinispan.Cache;
+import org.infinispan.commands.write.ClearCommand;
+import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.PutMapCommand;
+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.test.MultipleCacheManagersTest;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 
 import java.util.HashMap;
 import java.util.List;

Modified: trunk/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/replication/ReplicationExceptionTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -5,19 +5,19 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package org.infinispan.replication;
+package org.infinispan.replication;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.Cache;
-import org.infinispan.commands.VisitableCommand;
-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.AdvancedCache;
+import org.infinispan.Cache;
+import org.infinispan.commands.VisitableCommand;
+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 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/ReplicationQueueTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,15 +1,15 @@
-package org.infinispan.replication;
+package org.infinispan.replication;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.executors.ScheduledExecutorFactory;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.remoting.ReplicationQueue;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.executors.ScheduledExecutorFactory;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.remoting.ReplicationQueue;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.Test;
 
 import javax.transaction.TransactionManager;

Modified: trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -5,22 +5,22 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package org.infinispan.replication;
+package org.infinispan.replication;
 
-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;
-import org.infinispan.notifications.cachelistener.event.Event;
-import org.infinispan.notifications.cachelistener.event.TransactionalEvent;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+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;
+import org.infinispan.notifications.cachelistener.event.Event;
+import org.infinispan.notifications.cachelistener.event.TransactionalEvent;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/replication/SyncReplTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/SyncReplTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/replication/SyncReplTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -4,20 +4,20 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package org.infinispan.replication;
+package org.infinispan.replication;
 
 import static org.easymock.EasyMock.*;
-import org.infinispan.Cache;
-import org.infinispan.commands.CacheRpcCommand;
-import org.infinispan.config.Configuration;
-import org.infinispan.remoting.RpcManager;
-import org.infinispan.remoting.RpcManagerImpl;
-import org.infinispan.remoting.ResponseFilter;
-import org.infinispan.remoting.ResponseMode;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.remoting.transport.Transport;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.Cache;
+import org.infinispan.commands.CacheRpcCommand;
+import org.infinispan.config.Configuration;
+import org.infinispan.remoting.RpcManager;
+import org.infinispan.remoting.RpcManagerImpl;
+import org.infinispan.remoting.ResponseFilter;
+import org.infinispan.remoting.ResponseMode;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.remoting.transport.Transport;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
 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/replication/SyncReplicatedAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/SyncReplicatedAPITest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/replication/SyncReplicatedAPITest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.replication;
+package org.infinispan.replication;
 
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/statetransfer/Address.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/Address.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/Address.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.statetransfer;
+package org.infinispan.statetransfer;
 
 import java.io.Serializable;
 

Modified: trunk/core/src/test/java/org/infinispan/statetransfer/Person.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/Person.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/Person.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.statetransfer;
+package org.infinispan.statetransfer;
 
 import java.io.Serializable;
 

Modified: trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferCacheLoaderFunctionalTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,13 +1,13 @@
-package org.infinispan.statetransfer;
+package org.infinispan.statetransfer;
 
-import org.infinispan.Cache;
-import org.infinispan.config.CacheLoaderManagerConfig;
-import org.infinispan.loader.CacheLoader;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.loader.CacheStoreConfig;
-import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.Cache;
+import org.infinispan.config.CacheLoaderManagerConfig;
+import org.infinispan.loader.CacheLoader;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.loader.CacheStoreConfig;
+import org.infinispan.loader.dummy.DummyInMemoryCacheStore;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.Test;
 
 @Test(groups = "functional", testName = "statetransfer.StateTransferCacheLoaderFunctionalTest")

Modified: trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/statetransfer/StateTransferFunctionalTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,13 +1,13 @@
-package org.infinispan.statetransfer;
+package org.infinispan.statetransfer;
 
-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.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.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-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/test/AbstractCacheTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,18 +1,18 @@
-package org.infinispan.test;
+package org.infinispan.test;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.container.DataContainer;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.lifecycle.ComponentStatus;
-import org.infinispan.loader.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.AdvancedCache;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.container.DataContainer;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.lifecycle.ComponentStatus;
+import org.infinispan.loader.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 javax.transaction.TransactionManager;
 import java.util.Collections;
@@ -21,7 +21,7 @@
 import java.util.concurrent.ConcurrentMap;
 
 /**
- * Base class for {@link org.infinispan.test.SingleCacheManagerTest} and {@link org.infinispan.test.MultipleCacheManagersTest}.
+ * Base class for {@link org.infinispan.test.SingleCacheManagerTest} and {@link org.infinispan.test.MultipleCacheManagersTest}.
  *
  * @author Mircea.Markus at jboss.com
  */

Modified: trunk/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/test/MultipleCacheManagersTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.test;
+package org.infinispan.test;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
-import org.infinispan.manager.CacheManager;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.manager.CacheManager;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
@@ -24,7 +24,7 @@
  *       are expensive to create.
  * </pre>
  * If, however, you would like your cache managers destroyed after every <i>test method</i> instead of the </i>test
- * class</i>, you could set the <tt>cleanup</tt> field to {@link org.infinispan.test.MultipleCacheManagersTest.CleanupPhase#AFTER_METHOD}
+ * class</i>, you could set the <tt>cleanup</tt> field to {@link org.infinispan.test.MultipleCacheManagersTest.CleanupPhase#AFTER_METHOD}
  * in your test's constructor.  E.g.:
  * <pre>
  * <p/>

Modified: trunk/core/src/test/java/org/infinispan/test/ReplListener.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/ReplListener.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/test/ReplListener.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.test;
+package org.infinispan.test;
 
-import org.infinispan.Cache;
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.commands.tx.CommitCommand;
-import org.infinispan.commands.tx.PrepareCommand;
-import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.context.InvocationContext;
-import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.Cache;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.commands.tx.CommitCommand;
+import org.infinispan.commands.tx.PrepareCommand;
+import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.context.InvocationContext;
+import org.infinispan.interceptors.base.CommandInterceptor;
 
 import java.util.Arrays;
 import java.util.HashSet;

Modified: trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.test;
+package org.infinispan.test;
 
-import org.infinispan.Cache;
-import org.infinispan.manager.CacheManager;
+import org.infinispan.Cache;
+import org.infinispan.manager.CacheManager;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
@@ -10,10 +10,10 @@
 
 /**
  * Base class for tests that operate on a single (most likely local) cache instance. This operates similar to {@link
- * org.infinispan.test.MultipleCacheManagersTest}, but on only once CacheManager.
+ * org.infinispan.test.MultipleCacheManagersTest}, but on only once CacheManager.
  *
  * @author Mircea.Markus at jboss.com
- * @see org.infinispan.test.MultipleCacheManagersTest
+ * @see org.infinispan.test.MultipleCacheManagersTest
  */
 @Test(groups = {"functional", "unit"})
 public abstract class SingleCacheManagerTest extends AbstractCacheTest {
@@ -34,7 +34,7 @@
    // Due to some weirdness with TestNG, it always appends the package and class name to the method names
    // provided on dependsOnMethods unless it thinks there already is a package.  This does accept regular expressions
    // though so .*. works.  Otherwise it won't detect overridden methods in subclasses.
-   @BeforeClass(dependsOnMethods = "org.infinispan.*.preCreate")
+   @BeforeClass(dependsOnMethods = "org.infinispan.*.preCreate")
    protected void createBeforeClass() throws Exception {
       if (cleanup == CleanupPhase.AFTER_TEST) cacheManager = createCacheManager();
    }

Modified: trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/TestingUtil.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/test/TestingUtil.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -5,23 +5,23 @@
  * See terms of license at gnu.org.
  */
 
-package org.infinispan.test;
+package org.infinispan.test;
 
-import org.infinispan.AdvancedCache;
-import org.infinispan.Cache;
-import org.infinispan.CacheDelegate;
-import org.infinispan.commands.CommandsFactory;
-import org.infinispan.commands.VisitableCommand;
-import org.infinispan.factories.ComponentRegistry;
-import org.infinispan.factories.GlobalComponentRegistry;
-import org.infinispan.interceptors.InterceptorChain;
-import org.infinispan.interceptors.base.CommandInterceptor;
-import org.infinispan.lifecycle.ComponentStatus;
-import org.infinispan.loader.CacheLoader;
-import org.infinispan.loader.CacheLoaderManager;
-import org.infinispan.lock.LockManager;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.remoting.transport.Address;
+import org.infinispan.AdvancedCache;
+import org.infinispan.Cache;
+import org.infinispan.CacheDelegate;
+import org.infinispan.commands.CommandsFactory;
+import org.infinispan.commands.VisitableCommand;
+import org.infinispan.factories.ComponentRegistry;
+import org.infinispan.factories.GlobalComponentRegistry;
+import org.infinispan.interceptors.InterceptorChain;
+import org.infinispan.interceptors.base.CommandInterceptor;
+import org.infinispan.lifecycle.ComponentStatus;
+import org.infinispan.loader.CacheLoader;
+import org.infinispan.loader.CacheLoaderManager;
+import org.infinispan.lock.LockManager;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.remoting.transport.Address;
 
 import javax.transaction.TransactionManager;
 import java.io.File;
@@ -123,7 +123,7 @@
 
    /**
     * 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
+    * #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.

Modified: trunk/core/src/test/java/org/infinispan/test/ViewChangeListener.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/ViewChangeListener.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/test/ViewChangeListener.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.test;
+package org.infinispan.test;
 
-import org.infinispan.Cache;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.notifications.Listener;
-import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
-import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
+import org.infinispan.Cache;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.notifications.Listener;
+import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
+import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.test.fwk;
+package org.infinispan.test.fwk;
 
-import org.infinispan.config.parsing.JGroupsStackParser;
-import org.infinispan.config.parsing.XmlConfigHelper;
+import org.infinispan.config.parsing.JGroupsStackParser;
+import org.infinispan.config.parsing.XmlConfigHelper;
 import org.w3c.dom.Element;
 
 import java.io.BufferedReader;

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,10 +1,10 @@
-package org.infinispan.test.fwk;
+package org.infinispan.test.fwk;
 
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.manager.DefaultCacheManager;
-import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
+import org.infinispan.config.Configuration;
+import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.DefaultCacheManager;
+import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
 
 import java.util.Properties;
 

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.test.fwk;
+package org.infinispan.test.fwk;
 
 import org.testng.annotations.Test;
 
@@ -21,7 +21,7 @@
 @Test(groups = "functional", testName = "test.fwk.TestNameVerifier")
 public class TestNameVerifier {
    protected String moduleName = "core";
-   String dir = "src/test/java/org/infinispan";
+   String dir = "src/test/java/org/infinispan";
 
    Pattern packageLinePattern = Pattern.compile("package org.infinispan[^;]*");
    Pattern classLinePattern = Pattern.compile("(abstract\\s*)??(public\\s*)(abstract\\s*)??class [^\\s]*");
@@ -89,7 +89,7 @@
 
       classNamePart = classNamePart.substring("public class ".length());
       String packagePart = getPackagePart(javaString, filename);
-      //if the test is in org.infinispan package then make sure no . is prepanded
+      //if the test is in org.infinispan package then make sure no . is prepanded
       String packagePrepend = ((packagePart != null) && (packagePart.length() > 0)) ? packagePart + "." : "";
       return packagePrepend + classNamePart;
    }
@@ -106,7 +106,7 @@
       boolean found = matcher.find();
       assert found : "Could not determine package name for file: " + filename;
       String theMatch = matcher.group();
-      String partial = theMatch.substring("package org.infinispan".length());
+      String partial = theMatch.substring("package org.infinispan".length());
       if (partial.trim().length() == 0) return partial.trim();
       return partial.substring(1);//drop the leading dot.
    }

Modified: trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,8 +1,8 @@
-package org.infinispan.test.testng;
+package org.infinispan.test.testng;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
-import org.infinispan.test.TestingUtil;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
+import org.infinispan.test.TestingUtil;
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;

Modified: trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/test/testng/UnitTestTestNGListener.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,7 +1,7 @@
-package org.infinispan.test.testng;
+package org.infinispan.test.testng;
 
-import org.infinispan.logging.Log;
-import org.infinispan.logging.LogFactory;
+import org.infinispan.logging.Log;
+import org.infinispan.logging.LogFactory;
 import org.testng.IClass;
 import org.testng.ITestContext;
 import org.testng.ITestListener;

Modified: trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/tx/LocalModeTxTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,15 +19,15 @@
  * 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.tx;
+package org.infinispan.tx;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.Test;
 
 import javax.transaction.Transaction;

Modified: trunk/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/tx/MarkAsRollbackTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.tx;
+package org.infinispan.tx;
 
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.Test;
 
 import javax.transaction.RollbackException;

Modified: trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningCaches.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,12 +1,12 @@
-package org.infinispan.tx;
+package org.infinispan.tx;
 
-import org.infinispan.Cache;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.Test;
 
 import javax.transaction.Transaction;

Modified: trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCaches.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCaches.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/tx/TransactionsSpanningReplicatedCaches.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,11 +1,11 @@
-package org.infinispan.tx;
+package org.infinispan.tx;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
 import org.testng.annotations.Test;
 
 import javax.transaction.Transaction;

Modified: trunk/core/src/test/java/org/infinispan/util/BidirectionalLinkedHashMapTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/util/BidirectionalLinkedHashMapTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/util/BidirectionalLinkedHashMapTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util;
+package org.infinispan.util;
 
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/java/org/infinispan/util/VisitableBidirectionalLinkedHashSetTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/util/VisitableBidirectionalLinkedHashSetTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/core/src/test/java/org/infinispan/util/VisitableBidirectionalLinkedHashSetTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.util;
+package org.infinispan.util;
 
 import org.testng.annotations.Test;
 

Modified: trunk/core/src/test/resources/configs/named-cache-test.xml
===================================================================
--- trunk/core/src/test/resources/configs/named-cache-test.xml	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/core/src/test/resources/configs/named-cache-test.xml	2009-04-07 10:54:33 UTC (rev 91)
@@ -3,30 +3,30 @@
 
    <global>
 
-      <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+      <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
          <property name="maxThreads" value="5"/>
          <property name="threadNamePrefix" value="AsyncListenerThread"/>
       </asyncListenerExecutor>
 
-      <asyncSerializationExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+      <asyncSerializationExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
          <property name="maxThreads" value="25"/>
          <property name="threadNamePrefix" value="AsyncSerializationThread"/>
       </asyncSerializationExecutor>
 
-      <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+      <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
          <property name="threadNamePrefix" value="EvictionThread"/>
       </evictionScheduledExecutor>
 
-      <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+      <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
          <property name="threadNamePrefix" value="ReplicationQueueThread"/>
       </replicationQueueScheduledExecutor>
 
-      <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport"/>
+      <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport"/>
 
-      <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"
+      <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"
                      objectInputStreamPoolSize="100" objectOutputStreamPoolSize="100"/>
       <globalJmxStatistics enabled="false" jmxDomain="funky_domain"
-                           mBeanServerLookup="org.infinispan.jmx.PerThreadMBeanServerLookup" allowDuplicateDomains="true"/>
+                           mBeanServerLookup="org.infinispan.jmx.PerThreadMBeanServerLookup" allowDuplicateDomains="true"/>
 
    </global>
 
@@ -36,7 +36,7 @@
    </default>
 
    <namedCache name="transactional">
-      <transaction transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup"/>
+      <transaction transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup"/>
    </namedCache>
 
    <namedCache name="syncRepl">
@@ -83,7 +83,7 @@
          <!--
             We can have multiple cache loaders, which get chained
          -->
-         <loader class="org.infinispan.loader.file.FileCacheStore" fetchPersistentState="true"
+         <loader class="org.infinispan.loader.file.FileCacheStore" fetchPersistentState="true"
                  ignoreModifications="true" purgeOnStartup="true">
 
             <!-- See the documentation for more configuration examples and flags. -->

Modified: trunk/core/src/test/resources/configs/string-property-replaced.xml
===================================================================
--- trunk/core/src/test/resources/configs/string-property-replaced.xml	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/core/src/test/resources/configs/string-property-replaced.xml	2009-04-07 10:54:33 UTC (rev 91)
@@ -8,12 +8,12 @@
 
    <global>
 
-      <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+      <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
          <property name="maxThreads" value="${test.property.asyncListenerMaxThreads:5}"/>
          <property name="threadNamePrefix" value="AsyncListenerThread"/>
       </asyncListenerExecutor>
 
-      <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport">
+      <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport">
          <property name="configurationFile" value="${test.property.jgroupsConfigFile:udp.xml}"/>
       </transport>
 
@@ -30,7 +30,7 @@
             concurrencyLevel="500"/>
 
       <transaction
-            transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup"
+            transactionManagerLookupClass="org.infinispan.transaction.GenericTransactionManagerLookup"
             syncRollbackPhase="false"
             syncCommitPhase="${test.property.SyncCommitPhase:true}"/>
 

Modified: trunk/core/src/test/resources/log4j.xml
===================================================================
--- trunk/core/src/test/resources/log4j.xml	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/core/src/test/resources/log4j.xml	2009-04-07 10:54:33 UTC (rev 91)
@@ -44,19 +44,19 @@
    <!-- Limit categories -->
    <!-- ================ -->
 
-   <category name="org.infinispan">
+   <category name="org.infinispan">
       <priority value="WARN"/>
    </category>
 
-   <category name="org.infinispan.profiling">
+   <category name="org.infinispan.profiling">
       <priority value="WARN"/>
    </category>
 
-   <category name="org.infinispan.jmx">
+   <category name="org.infinispan.jmx">
       <priority value="WARN"/>
    </category>
 
-   <category name="org.infinispan.factories">
+   <category name="org.infinispan.factories">
       <priority value="WARN"/>
    </category>
 

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/parent/pom.xml	2009-04-07 10:54:33 UTC (rev 91)
@@ -7,7 +7,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <properties>
-      <project-package>org.infinispan</project-package>
+      <project-package>org.infinispan</project-package>
       <project-version>4.0.0-SNAPSHOT</project-version>
       <defaultTestGroup>functional,unit</defaultTestGroup>
       <!-- By default only generate Javadocs when we install the module. -->
@@ -19,12 +19,12 @@
       <artifactId>jbosscache-common-parent</artifactId>
       <version>1.5</version>
    </parent>
-   <groupId>org.infinispan</groupId>
-   <artifactId>infinispan-parent</artifactId>
+   <groupId>org.infinispan</groupId>
+   <artifactId>infinispan-parent</artifactId>
    <version>4.0.0-SNAPSHOT</version>
-   <name>Infinispan - Parent</name>
-   <description>Infinispan - Open Source Data Grids</description>
-   <url>http://www.infinispan-project.org</url>
+   <name>Infinispan - Parent</name>
+   <description>INFINISPAN - Open Source Data Grids</description>
+   <url>http://www.jboss.org/infinispan</url>
    <packaging>pom</packaging>
    <dependencies>
       <dependency>
@@ -92,7 +92,7 @@
                <properties>
                   <property>
                      <name>listener</name>
-                     <value>org.infinispan.test.testng.UnitTestTestNGListener</value>
+                     <value>org.infinispan.test.testng.UnitTestTestNGListener</value>
                   </property>
                </properties>
             </configuration>
@@ -105,7 +105,7 @@
                   <manifest>
                      <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                      <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                     <mainClass>org.infinispan.Version</mainClass>
+                     <mainClass>org.infinispan.Version</mainClass>
                   </manifest>
                </archive>
             </configuration>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/pom.xml	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,45 +1,37 @@
 <?xml version="1.0"?>
-
-<!-- Aggregator module for the infinispan sub-projects -->
-
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-parent</artifactId>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-parent</artifactId>
       <version>4.0.0-SNAPSHOT</version>
       <relativePath>parent/pom.xml</relativePath>
    </parent>
 
-   <groupId>org.infinispan</groupId>
-   <artifactId>infinispan</artifactId>
+   <groupId>org.infinispan</groupId>
+   <artifactId>infinispan-aggregator</artifactId>
    <version>4.0.0-SNAPSHOT</version>
 
-   <name>Infinispan (Aggregate)</name>
-   <description>Infinispan - Open Source Data Grids. This is the aggregator module.</description>
-   <url>http://www.infinispan-project.org</url>
+   <name>Infinispan (Aggregator)</name>
+   <description>INFINISPAN - Open Source Data Grids. This is the aggregator module.</description>
    <packaging>pom</packaging>
 
-
    <reporting>
       <plugins>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
-               <excludePackageNames>org.infinispan</excludePackageNames>
+               <excludePackageNames>org.infinispan</excludePackageNames>
             </configuration>
          </plugin>
       </plugins>
-
    </reporting>
 
    <modules>
-
       <module>parent</module>
       <module>core</module>
       <module>tree</module>

Modified: trunk/tree/pom.xml
===================================================================
--- trunk/tree/pom.xml	2009-04-07 10:52:42 UTC (rev 90)
+++ trunk/tree/pom.xml	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,32 +1,29 @@
 <?xml version="1.0"?>
-
-<!-- This is the current pom for the core directory (or project) for Infinispan tree api-->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-parent</artifactId>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-parent</artifactId>
       <version>4.0.0-SNAPSHOT</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
-   <groupId>org.infinispan</groupId>
-   <artifactId>infinispan-tree</artifactId>
-   <name>Infinispan - Tree API</name>
-   <description>Infinispan - Open Source Data Grids. This is the tree api package.</description>
+   <groupId>org.infinispan</groupId>
+   <artifactId>infinispan-tree</artifactId>
+   <name>Infinispan - Tree API</name>
+   <description>INFINISPAN - Open Source Data Grids. This is the tree api package.</description>
    <dependencies>
       <dependency>
          <groupId>${project-package}</groupId>
-         <artifactId>infinispan-core</artifactId>
+         <artifactId>infinispan-core</artifactId>
          <version>${project-version}</version>
       </dependency>
 
       <dependency>
          <groupId>${project-package}</groupId>
-         <artifactId>infinispan-core</artifactId>
+         <artifactId>infinispan-core</artifactId>
          <version>${project-version}</version>
          <type>test-jar</type>
          <scope>test</scope>

Copied: trunk/tree/src/main/java/org/infinispan (from rev 88, trunk/tree/src/main/java/org/infinispan)

Modified: trunk/tree/src/main/java/org/infinispan/tree/Fqn.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/Fqn.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/main/java/org/infinispan/tree/Fqn.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,11 +19,11 @@
  * 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.tree;
+package org.infinispan.tree;
 
 
 import net.jcip.annotations.Immutable;
-import org.infinispan.util.Immutables;
+import org.infinispan.util.Immutables;
 
 import java.io.Externalizable;
 import java.io.IOException;

Modified: trunk/tree/src/main/java/org/infinispan/tree/FqnComparator.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/FqnComparator.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/main/java/org/infinispan/tree/FqnComparator.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.infinispan.tree;
+package org.infinispan.tree;
 
 import net.jcip.annotations.Immutable;
 

Modified: trunk/tree/src/main/java/org/infinispan/tree/Node.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/Node.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/main/java/org/infinispan/tree/Node.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,10 +19,10 @@
  * 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.tree;
+package org.infinispan.tree;
 
 import net.jcip.annotations.ThreadSafe;
-import org.infinispan.invocation.Flag;
+import org.infinispan.invocation.Flag;
 
 import java.util.Map;
 import java.util.Set;
@@ -42,7 +42,7 @@
  * <p/>
  *
  * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a>
- * @see org.infinispan.tree.TreeCache
+ * @see org.infinispan.tree.TreeCache
  * @since 4.0
  */
 @ThreadSafe
@@ -324,7 +324,7 @@
    /**
     * Tests if a node reference is still valid.  A node reference may become invalid if it has been removed, invalidated
     * or moved, either locally or remotely.  If a node is invalid, it should be fetched again from the cache or a valid
-    * parent node.  Operations on invalid nodes will throw a {@link org.infinispan.tree.NodeNotValidException}.
+    * parent node.  Operations on invalid nodes will throw a {@link org.infinispan.tree.NodeNotValidException}.
     *
     * @return true if the node is valid.
     */

Modified: trunk/tree/src/main/java/org/infinispan/tree/NodeImpl.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/NodeImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/main/java/org/infinispan/tree/NodeImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,15 +19,15 @@
  * 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.tree;
+package org.infinispan.tree;
 
-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.util.Immutables;
-import org.infinispan.util.Util;
+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.util.Immutables;
+import org.infinispan.util.Util;
 
 import java.util.Collections;
 import java.util.HashMap;

Modified: trunk/tree/src/main/java/org/infinispan/tree/NodeKey.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/NodeKey.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/main/java/org/infinispan/tree/NodeKey.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -21,9 +21,9 @@
  *
  */
 
-package org.infinispan.tree;
+package org.infinispan.tree;
 
-import org.infinispan.util.Util;
+import org.infinispan.util.Util;
 
 import java.io.Serializable;
 

Modified: trunk/tree/src/main/java/org/infinispan/tree/NodeNotExistsException.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/NodeNotExistsException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/main/java/org/infinispan/tree/NodeNotExistsException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.tree;
+package org.infinispan.tree;
 
-import org.infinispan.CacheException;
+import org.infinispan.CacheException;
 
 
 /**

Modified: trunk/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,9 +19,9 @@
  * 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.tree;
+package org.infinispan.tree;
 
-import org.infinispan.CacheException;
+import org.infinispan.CacheException;
 
 /**
  * Thrown whenever operations are attempted on a node that is no longer valid.  See {@link Node#isValid()} for details.

Modified: trunk/tree/src/main/java/org/infinispan/tree/TreeCache.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/TreeCache.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/main/java/org/infinispan/tree/TreeCache.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,12 +19,12 @@
  * 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.tree;
+package org.infinispan.tree;
 
-import org.infinispan.Cache;
-import org.infinispan.CacheException;
-import org.infinispan.invocation.Flag;
-import org.infinispan.lifecycle.Lifecycle;
+import org.infinispan.Cache;
+import org.infinispan.CacheException;
+import org.infinispan.invocation.Flag;
+import org.infinispan.lifecycle.Lifecycle;
 
 import java.util.Map;
 import java.util.Set;
@@ -264,7 +264,7 @@
     * @param newParent  new location under which to attach the node being moved.
     * @throws NodeNotExistsException may throw one of these if the target node does not exist or if a different thread
     *                                has moved this node elsewhere already.
-    * @throws IllegalStateException  if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
+    * @throws IllegalStateException  if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
     */
    void move(Fqn nodeToMove, Fqn newParent) throws NodeNotExistsException;
 
@@ -273,7 +273,7 @@
    /**
     * Convenience method that takes in string representations of Fqns.  Otherwise identical to {@link #move(Fqn, Fqn)}
     *
-    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
+    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
     */
    void move(String nodeToMove, String newParent) throws NodeNotExistsException;
 
@@ -286,7 +286,7 @@
     * @param fqn
     * @return map of data, or an empty map
     * @throws CacheException
-    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
+    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
     */
    Map<K, V> getData(Fqn fqn);
 
@@ -307,7 +307,7 @@
     * A convenience method to retrieving a node and getting keys from the node directly.
     *
     * @param fqn name of the node
-    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
+    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
     */
    Set<K> getKeys(Fqn fqn);
 
@@ -317,7 +317,7 @@
     * Convenience method that takes in a String represenation of the Fqn.  Otherwise identical to {@link
     * #clearData(Fqn)}.
     *
-    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
+    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
     */
    void clearData(String fqn);
 
@@ -329,7 +329,7 @@
     * A convenience method to retrieving a node and getting keys from the node directly.
     *
     * @param fqn name of the node
-    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
+    * @throws IllegalStateException if {@link #getStatus()} would not return {@link org.infinispan.lifecycle.ComponentStatus#STARTED}.
     */
    void clearData(Fqn fqn);
 

Modified: trunk/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/main/java/org/infinispan/tree/TreeCacheImpl.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,15 +19,15 @@
  * 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.tree;
+package org.infinispan.tree;
 
-import org.infinispan.AdvancedCache;
-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.AdvancedCache;
+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 java.util.Map;
 import java.util.Set;

Modified: trunk/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -19,18 +19,18 @@
  * 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.tree;
+package org.infinispan.tree;
 
-import org.infinispan.Cache;
-import org.infinispan.atomic.AtomicMap;
-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.Cache;
+import org.infinispan.atomic.AtomicMap;
+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;
 
 public class TreeStructureSupport extends AutoBatchSupport {
    private static Log log = LogFactory.getLog(TreeStructureSupport.class);

Copied: trunk/tree/src/test/java/org/infinispan (from rev 88, trunk/tree/src/test/java/org/infinispan)

Modified: trunk/tree/src/test/java/org/infinispan/api/tree/NodeAPITest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/NodeAPITest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/NodeAPITest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,14 +1,14 @@
-package org.infinispan.api.tree;
+package org.infinispan.api.tree;
 
-import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.config.Configuration;
-import org.infinispan.manager.CacheManager;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
-import org.infinispan.tree.Fqn;
-import org.infinispan.tree.Node;
-import org.infinispan.tree.TreeCache;
-import org.infinispan.tree.TreeCacheImpl;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.infinispan.config.Configuration;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.tree.Fqn;
+import org.infinispan.tree.Node;
+import org.infinispan.tree.TreeCache;
+import org.infinispan.tree.TreeCacheImpl;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;

Modified: trunk/tree/src/test/java/org/infinispan/api/tree/NodeLockSupport.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/NodeLockSupport.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/NodeLockSupport.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -21,14 +21,14 @@
  *
  */
 
-package org.infinispan.api.tree;
+package org.infinispan.api.tree;
 
-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.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 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-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPITest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,21 +1,21 @@
-package org.infinispan.api.tree;
+package org.infinispan.api.tree;
 
-import org.infinispan.api.mvcc.LockAssert;
-import org.infinispan.config.Configuration;
-import org.infinispan.container.DataContainer;
-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.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.api.mvcc.LockAssert;
+import org.infinispan.config.Configuration;
+import org.infinispan.container.DataContainer;
+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.tree.Fqn;
+import org.infinispan.tree.Node;
+import org.infinispan.tree.TreeCacheImpl;
+import org.infinispan.tree.TreeStructureSupport;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
 

Modified: trunk/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/NodeReplicatedMoveTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -4,17 +4,17 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package org.infinispan.api.tree;
+package org.infinispan.api.tree;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
-import org.infinispan.tree.Fqn;
-import org.infinispan.tree.Node;
-import org.infinispan.tree.TreeCache;
-import org.infinispan.tree.TreeCacheImpl;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.tree.Fqn;
+import org.infinispan.tree.Node;
+import org.infinispan.tree.TreeCache;
+import org.infinispan.tree.TreeCacheImpl;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 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-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -5,16 +5,16 @@
  * See terms of license at gnu.org.
  */
 
-package org.infinispan.api.tree;
+package org.infinispan.api.tree;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.invocation.Flag;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.tree.Fqn;
-import org.infinispan.tree.Node;
-import org.infinispan.tree.TreeCache;
-import org.infinispan.tree.TreeCacheImpl;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.invocation.Flag;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.tree.Fqn;
+import org.infinispan.tree.Node;
+import org.infinispan.tree.TreeCache;
+import org.infinispan.tree.TreeCacheImpl;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
 

Modified: trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/SyncReplTxTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -5,17 +5,17 @@
  * See terms of license at gnu.org.
  */
 
-package org.infinispan.api.tree;
+package org.infinispan.api.tree;
 
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.transaction.DummyTransactionManagerLookup;
-import org.infinispan.tree.Fqn;
-import org.infinispan.tree.Node;
-import org.infinispan.tree.TreeCache;
-import org.infinispan.tree.TreeCacheImpl;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.test.MultipleCacheManagersTest;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.transaction.DummyTransactionManagerLookup;
+import org.infinispan.tree.Fqn;
+import org.infinispan.tree.Node;
+import org.infinispan.tree.TreeCache;
+import org.infinispan.tree.TreeCacheImpl;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
 

Modified: trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/TreeCacheAPITest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,20 +1,20 @@
-package org.infinispan.api.tree;
+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.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.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.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 static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;

Modified: trunk/tree/src/test/java/org/infinispan/api/tree/TreeStructureHashCodeTest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/TreeStructureHashCodeTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/TreeStructureHashCodeTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,9 +1,9 @@
-package org.infinispan.api.tree;
+package org.infinispan.api.tree;
 
-import org.infinispan.tree.Fqn;
-import org.infinispan.tree.NodeKey;
-import org.infinispan.util.concurrent.locks.containers.LockContainer;
-import org.infinispan.util.concurrent.locks.containers.ReentrantStripedLockContainer;
+import org.infinispan.tree.Fqn;
+import org.infinispan.tree.NodeKey;
+import org.infinispan.util.concurrent.locks.containers.LockContainer;
+import org.infinispan.util.concurrent.locks.containers.ReentrantStripedLockContainer;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;

Modified: trunk/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/profiling/TreeProfileTest.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,21 +1,21 @@
-package org.infinispan.profiling;
+package org.infinispan.profiling;
 
-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;
-import org.infinispan.profiling.testinternals.Generator;
-import org.infinispan.profiling.testinternals.TaskRunner;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.TreeTestingUtil;
-import org.infinispan.transaction.DummyTransactionManager;
-import org.infinispan.tree.Fqn;
-import org.infinispan.tree.TreeCache;
-import org.infinispan.tree.TreeCacheImpl;
+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;
+import org.infinispan.profiling.testinternals.Generator;
+import org.infinispan.profiling.testinternals.TaskRunner;
+import org.infinispan.test.TestingUtil;
+import org.infinispan.test.TreeTestingUtil;
+import org.infinispan.transaction.DummyTransactionManager;
+import org.infinispan.tree.Fqn;
+import org.infinispan.tree.TreeCache;
+import org.infinispan.tree.TreeCacheImpl;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

Modified: trunk/tree/src/test/java/org/infinispan/profiling/testinternals/FqnGenerator.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/profiling/testinternals/FqnGenerator.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/profiling/testinternals/FqnGenerator.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.profiling.testinternals;
+package org.infinispan.profiling.testinternals;
 
-import org.infinispan.tree.Fqn;
+import org.infinispan.tree.Fqn;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: trunk/tree/src/test/java/org/infinispan/test/TreeTestingUtil.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/test/TreeTestingUtil.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/test/TreeTestingUtil.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,6 +1,6 @@
-package org.infinispan.test;
+package org.infinispan.test;
 
-import org.infinispan.tree.TreeCache;
+import org.infinispan.tree.TreeCache;
 
 import java.util.Collection;
 

Modified: trunk/tree/src/test/java/org/infinispan/test/fwk/TreeTestNameVerifier.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/test/fwk/TreeTestNameVerifier.java	2009-04-06 17:46:53 UTC (rev 88)
+++ trunk/tree/src/test/java/org/infinispan/test/fwk/TreeTestNameVerifier.java	2009-04-07 10:54:33 UTC (rev 91)
@@ -1,4 +1,4 @@
-package org.infinispan.test.fwk;
+package org.infinispan.test.fwk;
 
 import org.testng.annotations.Test;
 




More information about the infinispan-commits mailing list