Rename cache2k-impl to cache2k-core again, #80

cache2k · Jul 21, 2018 · 624ea50 · 624ea50
1 parent da8f75b
commit 624ea50
Show file tree

Hide file tree

Showing 221 changed files with 17 additions and 17 deletions.
diff --git a/cache2k-impl/LICENSE.txt → cache2k-core/LICENSE.txt b/cache2k-impl/LICENSE.txt → cache2k-core/LICENSE.txt
diff --git a/cache2k-impl/pom.xml → cache2k-core/pom.xml b/cache2k-impl/pom.xml → cache2k-core/pom.xml
@@ -7,7 +7,7 @@
     <version>1.2-SNAPSHOT</version>
   </parent>
 
-  <artifactId>cache2k-impl</artifactId>
+  <artifactId>cache2k-core</artifactId>
   <version>1.2-SNAPSHOT</version>
   <name>cache2k implementation</name>
 

diff --git a/...va/org/cache2k/core/AbstractEviction.java → ...va/org/cache2k/core/AbstractEviction.java b/...va/org/cache2k/core/AbstractEviction.java → ...va/org/cache2k/core/AbstractEviction.java
diff --git a/...main/java/org/cache2k/core/BaseCache.java → ...main/java/org/cache2k/core/BaseCache.java b/...main/java/org/cache2k/core/BaseCache.java → ...main/java/org/cache2k/core/BaseCache.java
diff --git a/...cache2k/core/Cache2kCoreProviderImpl.java → ...cache2k/core/Cache2kCoreProviderImpl.java b/...cache2k/core/Cache2kCoreProviderImpl.java → ...cache2k/core/Cache2kCoreProviderImpl.java
diff --git a/.../java/org/cache2k/core/CacheBaseInfo.java → .../java/org/cache2k/core/CacheBaseInfo.java b/.../java/org/cache2k/core/CacheBaseInfo.java → .../java/org/cache2k/core/CacheBaseInfo.java
diff --git a/...rg/cache2k/core/CacheClosedException.java → ...rg/cache2k/core/CacheClosedException.java b/...rg/cache2k/core/CacheClosedException.java → ...rg/cache2k/core/CacheClosedException.java
diff --git a/.../org/cache2k/core/CacheInternalError.java → .../org/cache2k/core/CacheInternalError.java b/.../org/cache2k/core/CacheInternalError.java → .../org/cache2k/core/CacheInternalError.java
diff --git a/...va/org/cache2k/core/CacheManagerImpl.java → ...va/org/cache2k/core/CacheManagerImpl.java b/...va/org/cache2k/core/CacheManagerImpl.java → ...va/org/cache2k/core/CacheManagerImpl.java
diff --git a/...g/cache2k/core/CacheStorageException.java → ...g/cache2k/core/CacheStorageException.java b/...g/cache2k/core/CacheStorageException.java → ...g/cache2k/core/CacheStorageException.java
diff --git a/...a/org/cache2k/core/CanCheckIntegrity.java → ...a/org/cache2k/core/CanCheckIntegrity.java b/...a/org/cache2k/core/CanCheckIntegrity.java → ...a/org/cache2k/core/CanCheckIntegrity.java
diff --git a/...rg/cache2k/core/ClockProPlusEviction.java → ...rg/cache2k/core/ClockProPlusEviction.java b/...rg/cache2k/core/ClockProPlusEviction.java → ...rg/cache2k/core/ClockProPlusEviction.java
diff --git a/.../java/org/cache2k/core/CollisionInfo.java → .../java/org/cache2k/core/CollisionInfo.java b/.../java/org/cache2k/core/CollisionInfo.java → .../java/org/cache2k/core/CollisionInfo.java
diff --git a/.../java/org/cache2k/core/CommonMetrics.java → .../java/org/cache2k/core/CommonMetrics.java b/.../java/org/cache2k/core/CommonMetrics.java → .../java/org/cache2k/core/CommonMetrics.java
diff --git a/...rg/cache2k/core/CommonMetricsFactory.java → ...rg/cache2k/core/CommonMetricsFactory.java b/...rg/cache2k/core/CommonMetricsFactory.java → ...rg/cache2k/core/CommonMetricsFactory.java
diff --git a/...cache2k/core/ConcurrentEntryIterator.java → ...cache2k/core/ConcurrentEntryIterator.java b/...cache2k/core/ConcurrentEntryIterator.java → ...cache2k/core/ConcurrentEntryIterator.java
diff --git a/...rg/cache2k/core/ConcurrentMapWrapper.java → ...rg/cache2k/core/ConcurrentMapWrapper.java b/...rg/cache2k/core/ConcurrentMapWrapper.java → ...rg/cache2k/core/ConcurrentMapWrapper.java
diff --git a/...cache2k/core/DefaultResiliencePolicy.java → ...cache2k/core/DefaultResiliencePolicy.java b/...cache2k/core/DefaultResiliencePolicy.java → ...cache2k/core/DefaultResiliencePolicy.java
diff --git a/...he2k/core/DummyConfigurationProvider.java → ...he2k/core/DummyConfigurationProvider.java b/...he2k/core/DummyConfigurationProvider.java → ...he2k/core/DummyConfigurationProvider.java
diff --git a/...src/main/java/org/cache2k/core/Entry.java → ...src/main/java/org/cache2k/core/Entry.java b/...src/main/java/org/cache2k/core/Entry.java → ...src/main/java/org/cache2k/core/Entry.java
diff --git a/...in/java/org/cache2k/core/EntryAction.java → ...in/java/org/cache2k/core/EntryAction.java b/...in/java/org/cache2k/core/EntryAction.java → ...in/java/org/cache2k/core/EntryAction.java
diff --git a/...n/java/org/cache2k/core/EventCounter.java → ...n/java/org/cache2k/core/EventCounter.java b/...n/java/org/cache2k/core/EventCounter.java → ...n/java/org/cache2k/core/EventCounter.java
diff --git a/.../main/java/org/cache2k/core/Eviction.java → .../main/java/org/cache2k/core/Eviction.java b/.../main/java/org/cache2k/core/Eviction.java → .../main/java/org/cache2k/core/Eviction.java
diff --git a/...ava/org/cache2k/core/EvictionMetrics.java → ...ava/org/cache2k/core/EvictionMetrics.java b/...ava/org/cache2k/core/EvictionMetrics.java → ...ava/org/cache2k/core/EvictionMetrics.java
diff --git a/...va/org/cache2k/core/ExceptionWrapper.java → ...va/org/cache2k/core/ExceptionWrapper.java b/...va/org/cache2k/core/ExceptionWrapper.java → ...va/org/cache2k/core/ExceptionWrapper.java
diff --git a/...a/org/cache2k/core/ExclusiveExecutor.java → ...a/org/cache2k/core/ExclusiveExecutor.java b/...a/org/cache2k/core/ExclusiveExecutor.java → ...a/org/cache2k/core/ExclusiveExecutor.java
diff --git a/...g/cache2k/core/ExpiryPolicyException.java → ...g/cache2k/core/ExpiryPolicyException.java b/...g/cache2k/core/ExpiryPolicyException.java → ...g/cache2k/core/ExpiryPolicyException.java
diff --git a/...src/main/java/org/cache2k/core/Hash2.java → ...src/main/java/org/cache2k/core/Hash2.java b/...src/main/java/org/cache2k/core/Hash2.java → ...src/main/java/org/cache2k/core/Hash2.java
diff --git a/...a/org/cache2k/core/HealthInfoElement.java → ...a/org/cache2k/core/HealthInfoElement.java b/...a/org/cache2k/core/HealthInfoElement.java → ...a/org/cache2k/core/HealthInfoElement.java
diff --git a/...main/java/org/cache2k/core/HeapCache.java → ...main/java/org/cache2k/core/HeapCache.java b/...main/java/org/cache2k/core/HeapCache.java → ...main/java/org/cache2k/core/HeapCache.java
diff --git a/...a/org/cache2k/core/HeapCacheListener.java → ...a/org/cache2k/core/HeapCacheListener.java b/...a/org/cache2k/core/HeapCacheListener.java → ...a/org/cache2k/core/HeapCacheListener.java
diff --git a/...n/java/org/cache2k/core/IntHeapCache.java → ...n/java/org/cache2k/core/IntHeapCache.java b/...n/java/org/cache2k/core/IntHeapCache.java → ...n/java/org/cache2k/core/IntHeapCache.java
diff --git a/.../java/org/cache2k/core/IntWiredCache.java → .../java/org/cache2k/core/IntWiredCache.java b/.../java/org/cache2k/core/IntWiredCache.java → .../java/org/cache2k/core/IntWiredCache.java
diff --git a/...java/org/cache2k/core/IntegrityState.java → ...java/org/cache2k/core/IntegrityState.java b/...java/org/cache2k/core/IntegrityState.java → ...java/org/cache2k/core/IntegrityState.java
diff --git a/.../java/org/cache2k/core/InternalCache.java → .../java/org/cache2k/core/InternalCache.java b/.../java/org/cache2k/core/InternalCache.java → .../java/org/cache2k/core/InternalCache.java
diff --git a/.../cache2k/core/InternalCache2kBuilder.java → .../cache2k/core/InternalCache2kBuilder.java b/.../cache2k/core/InternalCache2kBuilder.java → .../cache2k/core/InternalCache2kBuilder.java
diff --git a/...a/org/cache2k/core/InternalCacheInfo.java → ...a/org/cache2k/core/InternalCacheInfo.java b/...a/org/cache2k/core/InternalCacheInfo.java → ...a/org/cache2k/core/InternalCacheInfo.java
diff --git a/.../java/org/cache2k/core/LongHeapCache.java → .../java/org/cache2k/core/LongHeapCache.java b/.../java/org/cache2k/core/LongHeapCache.java → .../java/org/cache2k/core/LongHeapCache.java
diff --git a/...java/org/cache2k/core/LongWiredCache.java → ...java/org/cache2k/core/LongWiredCache.java b/...java/org/cache2k/core/LongWiredCache.java → ...java/org/cache2k/core/LongWiredCache.java
diff --git a/.../cache2k/core/MapValueConverterProxy.java → .../cache2k/core/MapValueConverterProxy.java b/.../cache2k/core/MapValueConverterProxy.java → .../cache2k/core/MapValueConverterProxy.java
diff --git a/...java/org/cache2k/core/RandomEviction.java → ...java/org/cache2k/core/RandomEviction.java b/...java/org/cache2k/core/RandomEviction.java → ...java/org/cache2k/core/RandomEviction.java
diff --git a/...che2k/core/ResiliencePolicyException.java → ...che2k/core/ResiliencePolicyException.java b/...che2k/core/ResiliencePolicyException.java → ...che2k/core/ResiliencePolicyException.java
diff --git a/...a/org/cache2k/core/SegmentedEviction.java → ...a/org/cache2k/core/SegmentedEviction.java b/...a/org/cache2k/core/SegmentedEviction.java → ...a/org/cache2k/core/SegmentedEviction.java
diff --git a/...g/cache2k/core/StandardCommonMetrics.java → ...g/cache2k/core/StandardCommonMetrics.java b/...g/cache2k/core/StandardCommonMetrics.java → ...g/cache2k/core/StandardCommonMetrics.java
diff --git a/...2k/core/StandardCommonMetricsFactory.java → ...2k/core/StandardCommonMetricsFactory.java b/...2k/core/StandardCommonMetricsFactory.java → ...2k/core/StandardCommonMetricsFactory.java
diff --git a/...e2k/core/StandardExceptionPropagator.java → ...e2k/core/StandardExceptionPropagator.java b/...e2k/core/StandardExceptionPropagator.java → ...e2k/core/StandardExceptionPropagator.java
diff --git a/.../java/org/cache2k/core/TimingHandler.java → .../java/org/cache2k/core/TimingHandler.java b/.../java/org/cache2k/core/TimingHandler.java → .../java/org/cache2k/core/TimingHandler.java
diff --git a/...ain/java/org/cache2k/core/WiredCache.java → ...ain/java/org/cache2k/core/WiredCache.java b/...ain/java/org/cache2k/core/WiredCache.java → ...ain/java/org/cache2k/core/WiredCache.java
diff --git a/...urrency/DefaultThreadFactoryProvider.java → ...urrency/DefaultThreadFactoryProvider.java b/...urrency/DefaultThreadFactoryProvider.java → ...urrency/DefaultThreadFactoryProvider.java
diff --git a/...core/concurrency/GlobalThreadFactory.java → ...core/concurrency/GlobalThreadFactory.java b/...core/concurrency/GlobalThreadFactory.java → ...core/concurrency/GlobalThreadFactory.java
diff --git a/...ava/org/cache2k/core/concurrency/Job.java → ...ava/org/cache2k/core/concurrency/Job.java b/...ava/org/cache2k/core/concurrency/Job.java → ...ava/org/cache2k/core/concurrency/Job.java
diff --git a/...a/org/cache2k/core/concurrency/Locks.java → ...a/org/cache2k/core/concurrency/Locks.java b/...a/org/cache2k/core/concurrency/Locks.java → ...a/org/cache2k/core/concurrency/Locks.java
diff --git a/...k/core/concurrency/NonOptimisticLock.java → ...k/core/concurrency/NonOptimisticLock.java b/...k/core/concurrency/NonOptimisticLock.java → ...k/core/concurrency/NonOptimisticLock.java
diff --git a/...he2k/core/concurrency/OptimisticLock.java → ...he2k/core/concurrency/OptimisticLock.java b/...he2k/core/concurrency/OptimisticLock.java → ...he2k/core/concurrency/OptimisticLock.java
diff --git a/...re/concurrency/OptimisticLockStamped.java → ...re/concurrency/OptimisticLockStamped.java b/...re/concurrency/OptimisticLockStamped.java → ...re/concurrency/OptimisticLockStamped.java
diff --git a/...re/concurrency/ThreadFactoryProvider.java → ...re/concurrency/ThreadFactoryProvider.java b/...re/concurrency/ThreadFactoryProvider.java → ...re/concurrency/ThreadFactoryProvider.java
diff --git a/...g/cache2k/core/event/AsyncDispatcher.java → ...g/cache2k/core/event/AsyncDispatcher.java b/...g/cache2k/core/event/AsyncDispatcher.java → ...g/cache2k/core/event/AsyncDispatcher.java
diff --git a/...va/org/cache2k/core/event/AsyncEvent.java → ...va/org/cache2k/core/event/AsyncEvent.java b/...va/org/cache2k/core/event/AsyncEvent.java → ...va/org/cache2k/core/event/AsyncEvent.java
diff --git a/...ore/experimentalApi/AsyncCacheLoader.java → ...ore/experimentalApi/AsyncCacheLoader.java b/...ore/experimentalApi/AsyncCacheLoader.java → ...ore/experimentalApi/AsyncCacheLoader.java
diff --git a/...ore/experimentalApi/AsyncCacheWriter.java → ...ore/experimentalApi/AsyncCacheWriter.java b/...ore/experimentalApi/AsyncCacheWriter.java → ...ore/experimentalApi/AsyncCacheWriter.java
diff --git a/...he2k/core/operation/ExaminationEntry.java → ...he2k/core/operation/ExaminationEntry.java b/...he2k/core/operation/ExaminationEntry.java → ...he2k/core/operation/ExaminationEntry.java
diff --git a/...g/cache2k/core/operation/LoadedEntry.java → ...g/cache2k/core/operation/LoadedEntry.java b/...g/cache2k/core/operation/LoadedEntry.java → ...g/cache2k/core/operation/LoadedEntry.java
diff --git a/...ore/operation/MutableEntryOnProgress.java → ...ore/operation/MutableEntryOnProgress.java b/...ore/operation/MutableEntryOnProgress.java → ...ore/operation/MutableEntryOnProgress.java
diff --git a/...rg/cache2k/core/operation/Operations.java → ...rg/cache2k/core/operation/Operations.java b/...rg/cache2k/core/operation/Operations.java → ...rg/cache2k/core/operation/Operations.java
diff --git a/.../org/cache2k/core/operation/Progress.java → .../org/cache2k/core/operation/Progress.java b/.../org/cache2k/core/operation/Progress.java → .../org/cache2k/core/operation/Progress.java
diff --git a/...2k/core/operation/ReadOnlyCacheEntry.java → ...2k/core/operation/ReadOnlyCacheEntry.java b/...2k/core/operation/ReadOnlyCacheEntry.java → ...2k/core/operation/ReadOnlyCacheEntry.java
diff --git a/...g/cache2k/core/operation/ResultEntry.java → ...g/cache2k/core/operation/ResultEntry.java b/...g/cache2k/core/operation/ResultEntry.java → ...g/cache2k/core/operation/ResultEntry.java
diff --git a/.../org/cache2k/core/operation/Semantic.java → .../org/cache2k/core/operation/Semantic.java b/.../org/cache2k/core/operation/Semantic.java → .../org/cache2k/core/operation/Semantic.java
diff --git a/.../core/spi/CacheConfigurationProvider.java → .../core/spi/CacheConfigurationProvider.java b/.../core/spi/CacheConfigurationProvider.java → .../core/spi/CacheConfigurationProvider.java
diff --git a/...he2k/core/spi/CacheLifeCycleListener.java → ...he2k/core/spi/CacheLifeCycleListener.java b/...he2k/core/spi/CacheLifeCycleListener.java → ...he2k/core/spi/CacheLifeCycleListener.java
diff --git a/...re/spi/CacheManagerLifeCycleListener.java → ...re/spi/CacheManagerLifeCycleListener.java b/...re/spi/CacheManagerLifeCycleListener.java → ...re/spi/CacheManagerLifeCycleListener.java
diff --git a/...cache2k/core/storageApi/CacheStorage.java → ...cache2k/core/storageApi/CacheStorage.java b/...cache2k/core/storageApi/CacheStorage.java → ...cache2k/core/storageApi/CacheStorage.java
diff --git a/...e2k/core/storageApi/PurgeableStorage.java → ...e2k/core/storageApi/PurgeableStorage.java b/...e2k/core/storageApi/PurgeableStorage.java → ...e2k/core/storageApi/PurgeableStorage.java
diff --git a/...che2k/core/storageApi/StorageAdapter.java → ...che2k/core/storageApi/StorageAdapter.java b/...che2k/core/storageApi/StorageAdapter.java → ...che2k/core/storageApi/StorageAdapter.java
diff --git a/...he2k/core/storageApi/StorageCallback.java → ...he2k/core/storageApi/StorageCallback.java b/...he2k/core/storageApi/StorageCallback.java → ...he2k/core/storageApi/StorageCallback.java
diff --git a/...cache2k/core/storageApi/StorageEntry.java → ...cache2k/core/storageApi/StorageEntry.java b/...cache2k/core/storageApi/StorageEntry.java → ...cache2k/core/storageApi/StorageEntry.java
diff --git a/...org/cache2k/core/util/Cache2kVersion.java → ...org/cache2k/core/util/Cache2kVersion.java b/...org/cache2k/core/util/Cache2kVersion.java → ...org/cache2k/core/util/Cache2kVersion.java
diff --git a/...g/cache2k/core/util/ClockDefaultImpl.java → ...g/cache2k/core/util/ClockDefaultImpl.java b/...g/cache2k/core/util/ClockDefaultImpl.java → ...g/cache2k/core/util/ClockDefaultImpl.java
diff --git a/.../org/cache2k/core/util/InternalClock.java → .../org/cache2k/core/util/InternalClock.java b/.../org/cache2k/core/util/InternalClock.java → .../org/cache2k/core/util/InternalClock.java
diff --git a/.../main/java/org/cache2k/core/util/Log.java → .../main/java/org/cache2k/core/util/Log.java b/.../main/java/org/cache2k/core/util/Log.java → .../main/java/org/cache2k/core/util/Log.java
diff --git a/...ava/org/cache2k/core/util/LogFactory.java → ...ava/org/cache2k/core/util/LogFactory.java b/...ava/org/cache2k/core/util/LogFactory.java → ...ava/org/cache2k/core/util/LogFactory.java
diff --git a/...org/cache2k/core/util/ScheduledClock.java → ...org/cache2k/core/util/ScheduledClock.java b/...org/cache2k/core/util/ScheduledClock.java → ...org/cache2k/core/util/ScheduledClock.java
diff --git a/...ava/org/cache2k/core/util/SimpleTask.java → ...ava/org/cache2k/core/util/SimpleTask.java b/...ava/org/cache2k/core/util/SimpleTask.java → ...ava/org/cache2k/core/util/SimpleTask.java
diff --git a/...va/org/cache2k/core/util/SimpleTimer.java → ...va/org/cache2k/core/util/SimpleTimer.java b/...va/org/cache2k/core/util/SimpleTimer.java → ...va/org/cache2k/core/util/SimpleTimer.java
diff --git a/...g/cache2k/core/util/TunableConstants.java → ...g/cache2k/core/util/TunableConstants.java b/...g/cache2k/core/util/TunableConstants.java → ...g/cache2k/core/util/TunableConstants.java
diff --git a/...org/cache2k/core/util/TunableFactory.java → ...org/cache2k/core/util/TunableFactory.java b/...org/cache2k/core/util/TunableFactory.java → ...org/cache2k/core/util/TunableFactory.java
diff --git a/...main/java/org/cache2k/core/util/Util.java → ...main/java/org/cache2k/core/util/Util.java b/...main/java/org/cache2k/core/util/Util.java → ...main/java/org/cache2k/core/util/Util.java
diff --git a/...he2k/impl/serverSide/CacheMXBeanImpl.java → ...he2k/impl/serverSide/CacheMXBeanImpl.java b/...he2k/impl/serverSide/CacheMXBeanImpl.java → ...he2k/impl/serverSide/CacheMXBeanImpl.java
diff --git a/...g/cache2k/impl/serverSide/JmxSupport.java → ...g/cache2k/impl/serverSide/JmxSupport.java b/...g/cache2k/impl/serverSide/JmxSupport.java → ...g/cache2k/impl/serverSide/JmxSupport.java
diff --git a/...l/serverSide/JndiDefaultNameProvider.java → ...l/serverSide/JndiDefaultNameProvider.java b/...l/serverSide/JndiDefaultNameProvider.java → ...l/serverSide/JndiDefaultNameProvider.java
diff --git a/...2k/impl/serverSide/ManagerMXBeanImpl.java → ...2k/impl/serverSide/ManagerMXBeanImpl.java b/...2k/impl/serverSide/ManagerMXBeanImpl.java → ...2k/impl/serverSide/ManagerMXBeanImpl.java
diff --git a/...ation/AbstractConfigurationTokenizer.java → ...ation/AbstractConfigurationTokenizer.java b/...ation/AbstractConfigurationTokenizer.java → ...ation/AbstractConfigurationTokenizer.java
diff --git a/...xmlConfiguration/BeanPropertyMutator.java → ...xmlConfiguration/BeanPropertyMutator.java b/...xmlConfiguration/BeanPropertyMutator.java → ...xmlConfiguration/BeanPropertyMutator.java
diff --git a/...ation/CacheConfigurationProviderImpl.java → ...ation/CacheConfigurationProviderImpl.java b/...ation/CacheConfigurationProviderImpl.java → ...ation/CacheConfigurationProviderImpl.java
diff --git a/...mlConfiguration/ConfigurationContext.java → ...mlConfiguration/ConfigurationContext.java b/...mlConfiguration/ConfigurationContext.java → ...mlConfiguration/ConfigurationContext.java
diff --git a/...Configuration/ConfigurationException.java → ...Configuration/ConfigurationException.java b/...Configuration/ConfigurationException.java → ...Configuration/ConfigurationException.java
diff --git a/...xmlConfiguration/ConfigurationParser.java → ...xmlConfiguration/ConfigurationParser.java b/...xmlConfiguration/ConfigurationParser.java → ...xmlConfiguration/ConfigurationParser.java
diff --git a/...Configuration/ConfigurationTokenizer.java → ...Configuration/ConfigurationTokenizer.java b/...Configuration/ConfigurationTokenizer.java → ...Configuration/ConfigurationTokenizer.java
diff --git a/...guration/FlexibleXmlTokenizerFactory.java → ...guration/FlexibleXmlTokenizerFactory.java b/...guration/FlexibleXmlTokenizerFactory.java → ...guration/FlexibleXmlTokenizerFactory.java
diff --git a/...xmlConfiguration/ParsedConfiguration.java → ...xmlConfiguration/ParsedConfiguration.java b/...xmlConfiguration/ParsedConfiguration.java → ...xmlConfiguration/ParsedConfiguration.java
diff --git a/...impl/xmlConfiguration/PropertyParser.java → ...impl/xmlConfiguration/PropertyParser.java b/...impl/xmlConfiguration/PropertyParser.java → ...impl/xmlConfiguration/PropertyParser.java
diff --git a/...impl/xmlConfiguration/SourceLocation.java → ...impl/xmlConfiguration/SourceLocation.java b/...impl/xmlConfiguration/SourceLocation.java → ...impl/xmlConfiguration/SourceLocation.java
diff --git a/...Configuration/StandardPropertyParser.java → ...Configuration/StandardPropertyParser.java b/...Configuration/StandardPropertyParser.java → ...Configuration/StandardPropertyParser.java
diff --git a/...nfiguration/StandardVariableExpander.java → ...nfiguration/StandardVariableExpander.java b/...nfiguration/StandardVariableExpander.java → ...nfiguration/StandardVariableExpander.java
diff --git a/...xmlConfiguration/StaxConfigTokenizer.java → ...xmlConfiguration/StaxConfigTokenizer.java b/...xmlConfiguration/StaxConfigTokenizer.java → ...xmlConfiguration/StaxConfigTokenizer.java
diff --git a/...pl/xmlConfiguration/TokenizerFactory.java → ...pl/xmlConfiguration/TokenizerFactory.java b/...pl/xmlConfiguration/TokenizerFactory.java → ...pl/xmlConfiguration/TokenizerFactory.java
diff --git a/...impl/xmlConfiguration/ValueConverter.java → ...impl/xmlConfiguration/ValueConverter.java b/...impl/xmlConfiguration/ValueConverter.java → ...impl/xmlConfiguration/ValueConverter.java
diff --git a/...pl/xmlConfiguration/VariableExpander.java → ...pl/xmlConfiguration/VariableExpander.java b/...pl/xmlConfiguration/VariableExpander.java → ...pl/xmlConfiguration/VariableExpander.java
diff --git a/.../xmlConfiguration/XppConfigTokenizer.java → .../xmlConfiguration/XppConfigTokenizer.java b/.../xmlConfiguration/XppConfigTokenizer.java → .../xmlConfiguration/XppConfigTokenizer.java
diff --git a/...g.cache2k.core.spi.CacheLifeCycleListener → ...g.cache2k.core.spi.CacheLifeCycleListener b/...g.cache2k.core.spi.CacheLifeCycleListener → ...g.cache2k.core.spi.CacheLifeCycleListener
diff --git a/...2k.core.spi.CacheManagerLifeCycleListener → ...2k.core.spi.CacheManagerLifeCycleListener b/...2k.core.spi.CacheManagerLifeCycleListener → ...2k.core.spi.CacheManagerLifeCycleListener
diff --git a/...vices/org.cache2k.spi.Cache2kCoreProvider → ...vices/org.cache2k.spi.Cache2kCoreProvider b/...vices/org.cache2k.spi.Cache2kCoreProvider → ...vices/org.cache2k.spi.Cache2kCoreProvider
diff --git a/.../org.cache2k.spi.Cache2kExtensionProvider → .../org.cache2k.spi.Cache2kExtensionProvider b/.../org.cache2k.spi.Cache2kExtensionProvider → .../org.cache2k.spi.Cache2kExtensionProvider
diff --git a/...in/resources/org.cache2k.impl.version.txt → ...in/resources/org.cache2k.impl.version.txt b/...in/resources/org.cache2k.impl.version.txt → ...in/resources/org.cache2k.impl.version.txt
diff --git a/...che2k.core.spi.CacheConfigurationProvider → ...che2k.core.spi.CacheConfigurationProvider b/...che2k.core.spi.CacheConfigurationProvider → ...che2k.core.spi.CacheConfigurationProvider
diff --git a/...vices/org.cache2k.spi.Cache2kCoreProvider → ...vices/org.cache2k.spi.Cache2kCoreProvider b/...vices/org.cache2k.spi.Cache2kCoreProvider → ...vices/org.cache2k.spi.Cache2kCoreProvider
diff --git a/...k-impl/src/test/java/BasicTimingTest.java → ...k-core/src/test/java/BasicTimingTest.java b/...k-impl/src/test/java/BasicTimingTest.java → ...k-core/src/test/java/BasicTimingTest.java
diff --git a/cache2k-impl/src/test/java/CacheTest.java → cache2k-core/src/test/java/CacheTest.java b/cache2k-impl/src/test/java/CacheTest.java → cache2k-core/src/test/java/CacheTest.java
diff --git a/.../org/cache2k/ExpiryPolicyExampleTest.java → .../org/cache2k/ExpiryPolicyExampleTest.java b/.../org/cache2k/ExpiryPolicyExampleTest.java → .../org/cache2k/ExpiryPolicyExampleTest.java
diff --git a/...a/org/cache2k/ReadThroughExampleTest.java → ...a/org/cache2k/ReadThroughExampleTest.java b/...a/org/cache2k/ReadThroughExampleTest.java → ...a/org/cache2k/ReadThroughExampleTest.java
diff --git a/...eadThroughWithCompoundKeyExampleTest.java → ...eadThroughWithCompoundKeyExampleTest.java b/...eadThroughWithCompoundKeyExampleTest.java → ...eadThroughWithCompoundKeyExampleTest.java
diff --git a/...a/org/cache2k/core/CacheBaseInfoTest.java → ...a/org/cache2k/core/CacheBaseInfoTest.java b/...a/org/cache2k/core/CacheBaseInfoTest.java → ...a/org/cache2k/core/CacheBaseInfoTest.java
diff --git a/...rg/cache2k/core/CacheManagerImplTest.java → ...rg/cache2k/core/CacheManagerImplTest.java b/...rg/cache2k/core/CacheManagerImplTest.java → ...rg/cache2k/core/CacheManagerImplTest.java
diff --git a/...a/org/cache2k/core/ConcurrentMapTest.java → ...a/org/cache2k/core/ConcurrentMapTest.java b/...a/org/cache2k/core/ConcurrentMapTest.java → ...a/org/cache2k/core/ConcurrentMapTest.java
diff --git a/...he2k/core/ConcurrentMapWithCacheTest.java → ...he2k/core/ConcurrentMapWithCacheTest.java b/...he2k/core/ConcurrentMapWithCacheTest.java → ...he2k/core/ConcurrentMapWithCacheTest.java
diff --git a/...e2k/core/DefaultResiliencePolicyTest.java → ...e2k/core/DefaultResiliencePolicyTest.java b/...e2k/core/DefaultResiliencePolicyTest.java → ...e2k/core/DefaultResiliencePolicyTest.java
diff --git a/...core/DefaultResiliencePolicyUnitTest.java → ...core/DefaultResiliencePolicyUnitTest.java b/...core/DefaultResiliencePolicyUnitTest.java → ...core/DefaultResiliencePolicyUnitTest.java
diff --git a/...test/java/org/cache2k/core/EntryTest.java → ...test/java/org/cache2k/core/EntryTest.java b/...test/java/org/cache2k/core/EntryTest.java → ...test/java/org/cache2k/core/EntryTest.java
diff --git a/...t/java/org/cache2k/core/EvictionTest.java → ...t/java/org/cache2k/core/EvictionTest.java b/...t/java/org/cache2k/core/EvictionTest.java → ...t/java/org/cache2k/core/EvictionTest.java
diff --git a/...he2k/core/InternalCache2kBuilderTest.java → ...he2k/core/InternalCache2kBuilderTest.java b/...he2k/core/InternalCache2kBuilderTest.java → ...he2k/core/InternalCache2kBuilderTest.java
diff --git a/...core/StandardExceptionPropagatorTest.java → ...core/StandardExceptionPropagatorTest.java b/...core/StandardExceptionPropagatorTest.java → ...core/StandardExceptionPropagatorTest.java
diff --git a/...a/org/cache2k/core/TimingHandlerTest.java → ...a/org/cache2k/core/TimingHandlerTest.java b/...a/org/cache2k/core/TimingHandlerTest.java → ...a/org/cache2k/core/TimingHandlerTest.java
diff --git a/...cache2k/core/util/Cache2kVersionTest.java → ...cache2k/core/util/Cache2kVersionTest.java b/...cache2k/core/util/Cache2kVersionTest.java → ...cache2k/core/util/Cache2kVersionTest.java
diff --git a/...rg/cache2k/core/util/SimpleTimerTest.java → ...rg/cache2k/core/util/SimpleTimerTest.java b/...rg/cache2k/core/util/SimpleTimerTest.java → ...rg/cache2k/core/util/SimpleTimerTest.java
diff --git a/...org/cache2k/core/util/SimulatedClock.java → ...org/cache2k/core/util/SimulatedClock.java b/...org/cache2k/core/util/SimulatedClock.java → ...org/cache2k/core/util/SimulatedClock.java
diff --git a/...cache2k/core/util/SimulatedClockTest.java → ...cache2k/core/util/SimulatedClockTest.java b/...cache2k/core/util/SimulatedClockTest.java → ...cache2k/core/util/SimulatedClockTest.java
diff --git a/...ava/org/cache2k/core/util/ThreadDump.java → ...ava/org/cache2k/core/util/ThreadDump.java b/...ava/org/cache2k/core/util/ThreadDump.java → ...ava/org/cache2k/core/util/ThreadDump.java
diff --git a/...e2k/impl/serverSide/IllegalNamesTest.java → ...e2k/impl/serverSide/IllegalNamesTest.java b/...e2k/impl/serverSide/IllegalNamesTest.java → ...e2k/impl/serverSide/IllegalNamesTest.java
diff --git a/...che2k/impl/serverSide/JmxSupportTest.java → ...che2k/impl/serverSide/JmxSupportTest.java b/...che2k/impl/serverSide/JmxSupportTest.java → ...che2k/impl/serverSide/JmxSupportTest.java
diff --git a/...che2k/impl/serverSide/LegalNamesTest.java → ...che2k/impl/serverSide/LegalNamesTest.java b/...che2k/impl/serverSide/LegalNamesTest.java → ...che2k/impl/serverSide/LegalNamesTest.java
diff --git a/...mpl/xmlConfiguration/IntegrationTest.java → ...mpl/xmlConfiguration/IntegrationTest.java b/...mpl/xmlConfiguration/IntegrationTest.java → ...mpl/xmlConfiguration/IntegrationTest.java
diff --git a/...mpl/xmlConfiguration/NotSerializable.java → ...mpl/xmlConfiguration/NotSerializable.java b/...mpl/xmlConfiguration/NotSerializable.java → ...mpl/xmlConfiguration/NotSerializable.java
diff --git a/...l/xmlConfiguration/ParseCompleteTest.java → ...l/xmlConfiguration/ParseCompleteTest.java b/...l/xmlConfiguration/ParseCompleteTest.java → ...l/xmlConfiguration/ParseCompleteTest.java
diff --git a/...iguration/StandardPropertyParserTest.java → ...iguration/StandardPropertyParserTest.java b/...iguration/StandardPropertyParserTest.java → ...iguration/StandardPropertyParserTest.java
diff --git a/...eOperationsWithoutCustomizationsTest.java → ...eOperationsWithoutCustomizationsTest.java b/...eOperationsWithoutCustomizationsTest.java → ...eOperationsWithoutCustomizationsTest.java
diff --git a/...org/cache2k/test/core/BasicCacheTest.java → ...org/cache2k/test/core/BasicCacheTest.java b/...org/cache2k/test/core/BasicCacheTest.java → ...org/cache2k/test/core/BasicCacheTest.java
diff --git a/...est/core/BasicIntCacheOperationsTest.java → ...est/core/BasicIntCacheOperationsTest.java b/...est/core/BasicIntCacheOperationsTest.java → ...est/core/BasicIntCacheOperationsTest.java
diff --git a/...ore/BasicIntWiredCacheOperationsTest.java → ...ore/BasicIntWiredCacheOperationsTest.java b/...ore/BasicIntWiredCacheOperationsTest.java → ...ore/BasicIntWiredCacheOperationsTest.java
diff --git a/...st/core/BasicLongCacheOperationsTest.java → ...st/core/BasicLongCacheOperationsTest.java b/...st/core/BasicLongCacheOperationsTest.java → ...st/core/BasicLongCacheOperationsTest.java
diff --git a/...re/BasicLongWiredCacheOperationsTest.java → ...re/BasicLongWiredCacheOperationsTest.java b/...re/BasicLongWiredCacheOperationsTest.java → ...re/BasicLongWiredCacheOperationsTest.java
diff --git a/...cache2k/test/core/Cache2kBuilderTest.java → ...cache2k/test/core/Cache2kBuilderTest.java b/...cache2k/test/core/Cache2kBuilderTest.java → ...cache2k/test/core/Cache2kBuilderTest.java
diff --git a/...rg/cache2k/test/core/CacheClosedTest.java → ...rg/cache2k/test/core/CacheClosedTest.java b/...rg/cache2k/test/core/CacheClosedTest.java → ...rg/cache2k/test/core/CacheClosedTest.java
diff --git a/...rg/cache2k/test/core/CacheLoaderTest.java → ...rg/cache2k/test/core/CacheLoaderTest.java b/...rg/cache2k/test/core/CacheLoaderTest.java → ...rg/cache2k/test/core/CacheLoaderTest.java
diff --git a/.../test/core/CacheLoaderWiredCacheTest.java → .../test/core/CacheLoaderWiredCacheTest.java b/.../test/core/CacheLoaderWiredCacheTest.java → .../test/core/CacheLoaderWiredCacheTest.java
diff --git a/.../test/core/CacheManagerExclusiveTest.java → .../test/core/CacheManagerExclusiveTest.java b/.../test/core/CacheManagerExclusiveTest.java → .../test/core/CacheManagerExclusiveTest.java
diff --git a/.../test/core/CacheManagerLifeCycleTest.java → .../test/core/CacheManagerLifeCycleTest.java b/.../test/core/CacheManagerLifeCycleTest.java → .../test/core/CacheManagerLifeCycleTest.java
diff --git a/.../org/cache2k/test/core/CacheNameTest.java → .../org/cache2k/test/core/CacheNameTest.java b/.../org/cache2k/test/core/CacheNameTest.java → .../org/cache2k/test/core/CacheNameTest.java
diff --git a/...test/core/EntryProcessorCacheWrapper.java → ...test/core/EntryProcessorCacheWrapper.java b/...test/core/EntryProcessorCacheWrapper.java → ...test/core/EntryProcessorCacheWrapper.java
diff --git a/...cache2k/test/core/EntryProcessorTest.java → ...cache2k/test/core/EntryProcessorTest.java b/...cache2k/test/core/EntryProcessorTest.java → ...cache2k/test/core/EntryProcessorTest.java
diff --git a/...2k/test/core/ExceptionPropagatorTest.java → ...2k/test/core/ExceptionPropagatorTest.java b/...2k/test/core/ExceptionPropagatorTest.java → ...2k/test/core/ExceptionPropagatorTest.java
diff --git a/...re/ExceptionPropagatorWiredCacheTest.java → ...re/ExceptionPropagatorWiredCacheTest.java b/...re/ExceptionPropagatorWiredCacheTest.java → ...re/ExceptionPropagatorWiredCacheTest.java
diff --git a/...a/org/cache2k/test/core/IteratorTest.java → ...a/org/cache2k/test/core/IteratorTest.java b/...a/org/cache2k/test/core/IteratorTest.java → ...a/org/cache2k/test/core/IteratorTest.java
diff --git a/...a/org/cache2k/test/core/ListenerTest.java → ...a/org/cache2k/test/core/ListenerTest.java b/...a/org/cache2k/test/core/ListenerTest.java → ...a/org/cache2k/test/core/ListenerTest.java
diff --git a/...e2k/test/core/PersistenceExampleTest.java → ...e2k/test/core/PersistenceExampleTest.java b/...e2k/test/core/PersistenceExampleTest.java → ...e2k/test/core/PersistenceExampleTest.java
diff --git a/...ache2k/test/core/RejectNullValueTest.java → ...ache2k/test/core/RejectNullValueTest.java b/...ache2k/test/core/RejectNullValueTest.java → ...ache2k/test/core/RejectNullValueTest.java
diff --git a/...t/core/RejectNullValueWiredCacheTest.java → ...t/core/RejectNullValueWiredCacheTest.java b/...t/core/RejectNullValueWiredCacheTest.java → ...t/core/RejectNullValueWiredCacheTest.java
diff --git a/...e2k/test/core/SlowEntryProcessorTest.java → ...e2k/test/core/SlowEntryProcessorTest.java b/...e2k/test/core/SlowEntryProcessorTest.java → ...e2k/test/core/SlowEntryProcessorTest.java
diff --git a/...ava/org/cache2k/test/core/StaticUtil.java → ...ava/org/cache2k/test/core/StaticUtil.java b/...ava/org/cache2k/test/core/StaticUtil.java → ...ava/org/cache2k/test/core/StaticUtil.java
diff --git a/...ava/org/cache2k/test/core/Statistics.java → ...ava/org/cache2k/test/core/Statistics.java b/...ava/org/cache2k/test/core/Statistics.java → ...ava/org/cache2k/test/core/Statistics.java
diff --git a/.../cache2k/test/core/TestingParameters.java → .../cache2k/test/core/TestingParameters.java b/.../cache2k/test/core/TestingParameters.java → .../cache2k/test/core/TestingParameters.java
diff --git a/...st/core/expiry/AllMutatorsExpireTest.java → ...st/core/expiry/AllMutatorsExpireTest.java b/...st/core/expiry/AllMutatorsExpireTest.java → ...st/core/expiry/AllMutatorsExpireTest.java
diff --git a/...piry/AllMutatorsExpireWiredCacheTest.java → ...piry/AllMutatorsExpireWiredCacheTest.java b/...piry/AllMutatorsExpireWiredCacheTest.java → ...piry/AllMutatorsExpireWiredCacheTest.java
diff --git a/.../cache2k/test/core/expiry/ExpiryTest.java → .../cache2k/test/core/expiry/ExpiryTest.java b/.../cache2k/test/core/expiry/ExpiryTest.java → .../cache2k/test/core/expiry/ExpiryTest.java
diff --git a/...est/core/expiry/ExpiryWiredCacheTest.java → ...est/core/expiry/ExpiryWiredCacheTest.java b/...est/core/expiry/ExpiryWiredCacheTest.java → ...est/core/expiry/ExpiryWiredCacheTest.java
diff --git a/...ore/expiry/FastAllMutatorsExpireTest.java → ...ore/expiry/FastAllMutatorsExpireTest.java b/...ore/expiry/FastAllMutatorsExpireTest.java → ...ore/expiry/FastAllMutatorsExpireTest.java
diff --git a/.../FastAllMutatorsExpireWiredCacheTest.java → .../FastAllMutatorsExpireWiredCacheTest.java b/.../FastAllMutatorsExpireWiredCacheTest.java → .../FastAllMutatorsExpireWiredCacheTest.java
diff --git a/...he2k/test/core/expiry/FastExpiryTest.java → ...he2k/test/core/expiry/FastExpiryTest.java b/...he2k/test/core/expiry/FastExpiryTest.java → ...he2k/test/core/expiry/FastExpiryTest.java
diff --git a/...he2k/test/core/expiry/SlowExpiryTest.java → ...he2k/test/core/expiry/SlowExpiryTest.java b/...he2k/test/core/expiry/SlowExpiryTest.java → ...he2k/test/core/expiry/SlowExpiryTest.java
diff --git a/...core/expiry/SlowExpiryWiredCacheTest.java → ...core/expiry/SlowExpiryWiredCacheTest.java b/...core/expiry/SlowExpiryWiredCacheTest.java → ...core/expiry/SlowExpiryWiredCacheTest.java
diff --git a/...t/java/org/cache2k/test/package-info.java → ...t/java/org/cache2k/test/package-info.java b/...t/java/org/cache2k/test/package-info.java → ...t/java/org/cache2k/test/package-info.java
diff --git a/...java/org/cache2k/test/util/CacheRule.java → ...java/org/cache2k/test/util/CacheRule.java b/...java/org/cache2k/test/util/CacheRule.java → ...java/org/cache2k/test/util/CacheRule.java
diff --git a/...he2k/test/util/CacheSourceForTesting.java → ...he2k/test/util/CacheSourceForTesting.java b/...he2k/test/util/CacheSourceForTesting.java → ...he2k/test/util/CacheSourceForTesting.java
diff --git a/.../cache2k/test/util/ConcurrencyHelper.java → .../cache2k/test/util/ConcurrencyHelper.java b/.../cache2k/test/util/ConcurrencyHelper.java → .../cache2k/test/util/ConcurrencyHelper.java
diff --git a/...java/org/cache2k/test/util/Condition.java → ...java/org/cache2k/test/util/Condition.java b/...java/org/cache2k/test/util/Condition.java → ...java/org/cache2k/test/util/Condition.java
diff --git a/...a/org/cache2k/test/util/IntCacheRule.java → ...a/org/cache2k/test/util/IntCacheRule.java b/...a/org/cache2k/test/util/IntCacheRule.java → ...a/org/cache2k/test/util/IntCacheRule.java
diff --git a/...e2k/test/util/IntCountingCacheSource.java → ...e2k/test/util/IntCountingCacheSource.java b/...e2k/test/util/IntCountingCacheSource.java → ...e2k/test/util/IntCountingCacheSource.java
diff --git a/...test/util/PerMethodCacheProviderTest.java → ...test/util/PerMethodCacheProviderTest.java b/...test/util/PerMethodCacheProviderTest.java → ...test/util/PerMethodCacheProviderTest.java
diff --git a/...2k/test/util/SharedCacheProviderTest.java → ...2k/test/util/SharedCacheProviderTest.java b/...2k/test/util/SharedCacheProviderTest.java → ...2k/test/util/SharedCacheProviderTest.java
diff --git a/...va/org/cache2k/test/util/TestingBase.java → ...va/org/cache2k/test/util/TestingBase.java b/...va/org/cache2k/test/util/TestingBase.java → ...va/org/cache2k/test/util/TestingBase.java
diff --git a/...he2k/test/util/ThreadingStressTester.java → ...he2k/test/util/ThreadingStressTester.java b/...he2k/test/util/ThreadingStressTester.java → ...he2k/test/util/ThreadingStressTester.java
diff --git a/...t/java/org/cache2k/test/util/TimeBox.java → ...t/java/org/cache2k/test/util/TimeBox.java b/...t/java/org/cache2k/test/util/TimeBox.java → ...t/java/org/cache2k/test/util/TimeBox.java
diff --git a/...va/org/cache2k/test/util/TimeStepper.java → ...va/org/cache2k/test/util/TimeStepper.java b/...va/org/cache2k/test/util/TimeStepper.java → ...va/org/cache2k/test/util/TimeStepper.java
diff --git a/...c/test/resources/cache2k-cache-sample.xml → ...c/test/resources/cache2k-cache-sample.xml b/...c/test/resources/cache2k-cache-sample.xml → ...c/test/resources/cache2k-cache-sample.xml
diff --git a/...esources/cache2k-customizationExample.xml → ...esources/cache2k-customizationExample.xml b/...esources/cache2k-customizationExample.xml → ...esources/cache2k-customizationExample.xml
diff --git a/...impl/src/test/resources/cache2k-empty.xml → ...core/src/test/resources/cache2k-empty.xml b/...impl/src/test/resources/cache2k-empty.xml → ...core/src/test/resources/cache2k-empty.xml
diff --git a/...pl/src/test/resources/cache2k-example.xml → ...re/src/test/resources/cache2k-example.xml b/...pl/src/test/resources/cache2k-example.xml → ...re/src/test/resources/cache2k-example.xml
diff --git a/...est/resources/cache2k-notSerializable.xml → ...est/resources/cache2k-notSerializable.xml b/...est/resources/cache2k-notSerializable.xml → ...est/resources/cache2k-notSerializable.xml
diff --git a/...rc/test/resources/cache2k-onlyDefault.xml → ...rc/test/resources/cache2k-onlyDefault.xml b/...rc/test/resources/cache2k-onlyDefault.xml → ...rc/test/resources/cache2k-onlyDefault.xml
diff --git a/...src/test/resources/cache2k-parseError.xml → ...src/test/resources/cache2k-parseError.xml b/...src/test/resources/cache2k-parseError.xml → ...src/test/resources/cache2k-parseError.xml
diff --git a/.../resources/cache2k-parseErrorWrongXml.xml → .../resources/cache2k-parseErrorWrongXml.xml b/.../resources/cache2k-parseErrorWrongXml.xml → .../resources/cache2k-parseErrorWrongXml.xml
diff --git a/...c/test/resources/cache2k-specialCases.xml → ...c/test/resources/cache2k-specialCases.xml b/...c/test/resources/cache2k-specialCases.xml → ...c/test/resources/cache2k-specialCases.xml
diff --git a/...est/resources/cache2k-unknownProperty.xml → ...est/resources/cache2k-unknownProperty.xml b/...est/resources/cache2k-unknownProperty.xml → ...est/resources/cache2k-unknownProperty.xml
diff --git a/cache2k-impl/src/test/resources/cache2k.xml → cache2k-core/src/test/resources/cache2k.xml b/cache2k-impl/src/test/resources/cache2k.xml → cache2k-core/src/test/resources/cache2k.xml
diff --git a/cache2k-impl/src/test/resources/config.xml → cache2k-core/src/test/resources/config.xml b/cache2k-impl/src/test/resources/config.xml → cache2k-core/src/test/resources/config.xml
diff --git a/...pl/src/test/resources/cyclic-variable.xml → ...re/src/test/resources/cyclic-variable.xml b/...pl/src/test/resources/cyclic-variable.xml → ...re/src/test/resources/cyclic-variable.xml
diff --git a/...rc/test/resources/simplelogger.properties → ...rc/test/resources/simplelogger.properties b/...rc/test/resources/simplelogger.properties → ...rc/test/resources/simplelogger.properties
diff --git a/...k-impl/src/test/resources/test-config.xml → ...k-core/src/test/resources/test-config.xml b/...k-impl/src/test/resources/test-config.xml → ...k-core/src/test/resources/test-config.xml
diff --git a/cache2k-jcache-tests/pom.xml b/cache2k-jcache-tests/pom.xml
@@ -135,7 +135,7 @@
       <dependencies>
         <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>cache2k-impl</artifactId>
+          <artifactId>cache2k-core</artifactId>
           <version>${project.version}</version>
           <scope>test</scope>
         </dependency>

diff --git a/cache2k-jcache/pom.xml b/cache2k-jcache/pom.xml
@@ -29,7 +29,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>cache2k-impl</artifactId>
+      <artifactId>cache2k-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/cache2k-osgi-all/pom.xml b/cache2k-osgi-all/pom.xml
@@ -29,7 +29,7 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>cache2k-impl</artifactId>
+      <artifactId>cache2k-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>

diff --git a/cache2k-spring/pom.xml b/cache2k-spring/pom.xml
@@ -45,7 +45,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>cache2k-impl</artifactId>
+      <artifactId>cache2k-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/documentation/src/docs/asciidoc/user-guide/sections/_android.adoc b/documentation/src/docs/asciidoc/user-guide/sections/_android.adoc
@@ -22,7 +22,7 @@ For cache2k version 1.1 and above, include the following dependencies:
     </dependency>
     <dependency>
       <groupId>org.cache2k</groupId>
-      <artifactId>cache2k-impl</artifactId>
+      <artifactId>cache2k-core</artifactId>
       <version>${cache2k-version}</version>
       <scope>runtime</scope>
     </dependency>
@@ -35,7 +35,7 @@ used instead of Stax. The XML configuration code will be removed via Proguard, i
 
 === Proguard Rules
 
-The `cache2k-impl` contains code relevant for server based software or enterprise software that is
+The `cache2k-core` contains code relevant for server based software or enterprise software that is
 usually not needed within Android. One example is the exposure of statistics via JMX. The code base is
 modular, and code needed within server environments is usually not loaded whithin Android applications.
 To minimize the footprint of the application the unused code can be removed via Proguard rules.

diff --git a/documentation/src/docs/asciidoc/user-guide/sections/_configuration.adoc b/documentation/src/docs/asciidoc/user-guide/sections/_configuration.adoc
@@ -16,7 +16,7 @@ Here is an example:
 
 [source,xml]
 ----
-include::../../../../../../cache2k-impl/src/test/resources/cache2k-example.xml[]
+include::../../../../../../cache2k-core/src/test/resources/cache2k-example.xml[]
 ----
 
 === Combine Programmatic and XML Configuration

diff --git a/documentation/src/docs/asciidoc/user-guide/sections/_jcache.adoc b/documentation/src/docs/asciidoc/user-guide/sections/_jcache.adoc
@@ -16,7 +16,7 @@ To use cache2k via JCache the following dependencies need to be added:
     </dependency>
     <dependency>
       <groupId>org.cache2k</groupId>
-      <artifactId>cache2k-impl</artifactId>
+      <artifactId>cache2k-core</artifactId>
       <version>${cache2k-version}</version>
       <scope>runtime</scope>
     </dependency>

diff --git a/documentation/src/docs/asciidoc/user-guide/sections/_osgi.adoc b/documentation/src/docs/asciidoc/user-guide/sections/_osgi.adoc
@@ -1,9 +1,9 @@
 [[osgi]]
 == OSGi
 
-The Jar-Files `cache2k-api` and `cache2k-impl` currently lack OSGi bundle information. For OSGi users
+The Jar-Files `cache2k-api` and `cache2k-core` currently lack OSGi bundle information. For OSGi users
 the bundle `cache2k-osgi-bundle` provided which is a combination of both artifacts including the needed
 OSGi meta information.
 
-Eventually `cache2k-api` and `cache2k-impl` should become proper meta information and be usable with
+Eventually `cache2k-api` and `cache2k-core` should become proper meta information and be usable with
 OSGi drirectly. Volunteers using OSGi please check https://github.com/cache2k/cache2k/issues/83[GH 83]
diff --git a/documentation/src/docs/asciidoc/user-guide/sections/_spring.adoc b/documentation/src/docs/asciidoc/user-guide/sections/_spring.adoc
@@ -18,7 +18,7 @@ To use cache2k in you Spring project, add the following libraries:
     </dependency>
     <dependency>
       <groupId>org.cache2k</groupId>
-      <artifactId>cache2k-impl</artifactId>
+      <artifactId>cache2k-core</artifactId>
       <version>${cache2k-version}</version>
       <scope>runtime</scope>
     </dependency>

diff --git a/documentation/src/docs/asciidoc/user-guide/sections/_start.adoc b/documentation/src/docs/asciidoc/user-guide/sections/_start.adoc
@@ -20,7 +20,7 @@ in your project is to add the following dependencies:
       </dependency>
       <dependency>
         <groupId>org.cache2k</groupId>
-        <artifactId>cache2k-impl</artifactId>
+        <artifactId>cache2k-core</artifactId>
         <version>${cache2k-version}</version>
         <scope>runtime</scope>
       </dependency>

diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,7 @@
 
   <modules>
     <module>cache2k-api</module>
-    <module>cache2k-impl</module>
+    <module>cache2k-core</module>
     <module>cache2k-osgi-all</module>
     <!-- not deployed on OSS central -->
     <module>cache2k-jcache-tests</module>

diff --git a/test-android-proguard/pom.xml b/test-android-proguard/pom.xml
@@ -44,7 +44,7 @@
     </dependency>
     <dependency>
       <groupId>org.cache2k</groupId>
-      <artifactId>cache2k-impl</artifactId>
+      <artifactId>cache2k-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/test-android/pom.xml b/test-android/pom.xml
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.cache2k</groupId>
-      <artifactId>cache2k-impl</artifactId>
+      <artifactId>cache2k-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/test-osgi/src/test/java/org/cache2k/test/osgi/OsgiIT.java b/test-osgi/src/test/java/org/cache2k/test/osgi/OsgiIT.java
@@ -64,7 +64,7 @@ public Option[] config() {
       try to use api and impl directly
       https://github.com/cache2k/cache2k/issues/83
       bundle("file:///" + _workspaceDir + "/cache2k-api/target/cache2k-api-" + System.getProperty("cache2k.version") + ".jar"),
-      bundle("file:///" + _workspaceDir + "/cache2k-impl/target/cache2k-impl-" + System.getProperty("cache2k.version") + ".jar"),
+      bundle("file:///" + _workspaceDir + "/cache2k-core/target/cache2k-core-" + System.getProperty("cache2k.version") + ".jar"),
       */
       junitBundles()
     );