This is an automated email from the ASF dual-hosted git repository. tv pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit 362175d77700e7133b4599f0714fe17399b83231 Author: Thomas Vandahl <[email protected]> AuthorDate: Sun Feb 8 23:00:34 2026 +0100 Remove default settings from example configurations --- .../src/test/test-conf/TestBlockDiskCache.ccf | 16 ----- .../src/test/test-conf/TestBlockDiskCacheCon.ccf | 14 ---- .../src/test/test-conf/TestBlockDiskCacheHuge.ccf | 4 -- .../test-conf/TestBlockDiskCacheSteadyLoad.ccf | 2 - .../src/test/test-conf/TestDiskCache.ccf | 16 ----- .../src/test/test-conf/TestDiskCacheCon.ccf | 14 ---- .../test-conf/TestDiskCacheDefragPerformance.ccf | 2 - .../src/test/test-conf/TestDiskCacheHuge.ccf | 4 -- .../src/test/test-conf/TestDiskCacheNoMemory.ccf | 16 ----- .../src/test/test-conf/TestDiskCacheSteadyLoad.ccf | 2 - .../test/test-conf/TestDiskCacheUsagePattern.ccf | 8 --- .../src/test/test-conf/TestElementSerializer.ccf | 13 ---- .../src/test/test-conf/TestHSQLDiskCache.ccf | 8 --- .../test/test-conf/TestHSQLDiskCacheConcurrent.ccf | 8 --- .../src/test/test-conf/TestJCS-73.ccf | 4 -- .../src/test/test-conf/TestJCSvHashtablePerf.ccf | 4 -- .../src/test/test-conf/TestJDBCDiskCache.ccf | 6 -- .../test/test-conf/TestJDBCDiskCacheRemoval.ccf | 6 -- .../test/test-conf/TestJDBCDiskCacheSharedPool.ccf | 6 -- .../src/test/test-conf/TestJDBCDiskCacheShrink.ccf | 12 ---- .../src/test/test-conf/TestLHMLRUCache.ccf | 1 - .../src/test/test-conf/TestMRUCache.ccf | 8 --- .../src/test/test-conf/TestMySQLDiskCache.ccf | 6 -- .../test/test-conf/TestRemoteCacheClientServer.ccf | 2 - .../src/test/test-conf/TestRemoteCacheServer.ccf | 2 - .../src/test/test-conf/TestRemoteClient.ccf | 6 -- .../src/test/test-conf/TestRemoteHttpCache.ccf | 6 -- .../src/test/test-conf/TestRemoteServer.ccf | 6 -- .../src/test/test-conf/TestRemoval.ccf | 6 -- .../src/test/test-conf/TestSimpleEventHandling.ccf | 12 ---- .../src/test/test-conf/TestSimpleLoad.ccf | 4 -- .../src/test/test-conf/TestSoftReferenceCache.ccf | 6 -- .../src/test/test-conf/TestSystemProperties.ccf | 4 -- .../src/test/test-conf/TestSystemPropertyUsage.ccf | 2 - .../src/test/test-conf/TestTCPLateralCache.ccf | 4 -- .../test-conf/TestTCPLateralCacheConcurrent.ccf | 2 - .../test-conf/TestTCPLateralIssueRemoveCache.ccf | 4 -- .../test/test-conf/TestTCPLateralRemoveFilter.ccf | 4 -- .../src/test/test-conf/TestThrash.ccf | 2 - .../src/test/test-conf/TestZeroSizeCache.ccf | 6 -- xdocs/BDBJEDiskCache.ccf | 84 ---------------------- xdocs/BasicJCSConfiguration.xml | 3 - xdocs/BlockDiskCache.xml | 2 - xdocs/ElementAttributes.xml | 4 -- xdocs/IndexedDiskAuxCache.xml | 10 --- xdocs/JDBCDiskCache.xml | 18 ----- xdocs/RegionProperties.xml | 7 -- xdocs/UsingJCSBasicWeb.xml | 3 - xdocs/getting_started/intro.xml | 9 --- 49 files changed, 398 deletions(-) diff --git a/commons-jcs4-core/src/test/test-conf/TestBlockDiskCache.ccf b/commons-jcs4-core/src/test/test-conf/TestBlockDiskCache.ccf index f7090ca6..25d477b2 100644 --- a/commons-jcs4-core/src/test/test-conf/TestBlockDiskCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestBlockDiskCache.ccf @@ -18,38 +18,22 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=blockDiskCache -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # SYSTEM GROUP ID CACHE jcs.system.groupIdCache=blockDiskCache -jcs.system.groupIdCache.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.system.groupIdCache.cacheattributes.MaxObjects=10000 -jcs.system.groupIdCache.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.blockRegion1=blockDiskCache -jcs.region.blockRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.blockRegion1.cacheattributes.MaxObjects=100 -jcs.region.blockRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.blockRegion2=blockDiskCache -jcs.region.blockRegion2.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.blockRegion2.cacheattributes.MaxObjects=100 -jcs.region.blockRegion2.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.blockRegion3=blockDiskCache -jcs.region.blockRegion3.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.blockRegion3.cacheattributes.MaxObjects=100 -jcs.region.blockRegion3.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.blockRegion4=blockDiskCache2 -jcs.region.blockRegion4.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.blockRegion4.cacheattributes.MaxObjects=100 -jcs.region.blockRegion4.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheCon.ccf b/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheCon.ccf index f4a3c4e5..8cee3d0d 100644 --- a/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheCon.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheCon.ccf @@ -18,33 +18,19 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=blockDiskCache -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.blockRegion1=blockDiskCache -jcs.region.blockRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.blockRegion1.cacheattributes.MaxObjects=100 -jcs.region.blockRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.blockRegion2=blockDiskCache -jcs.region.blockRegion2.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.blockRegion2.cacheattributes.MaxObjects=100 -jcs.region.blockRegion2.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.blockRegion3=blockDiskCache -jcs.region.blockRegion3.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.blockRegion3.cacheattributes.MaxObjects=100 -jcs.region.blockRegion3.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.blockRegion4=blockDiskCache -jcs.region.blockRegion4.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.blockRegion4.cacheattributes.MaxObjects=100 -jcs.region.blockRegion4.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheHuge.ccf b/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheHuge.ccf index c11c5b9b..96903612 100644 --- a/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheHuge.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheHuge.ccf @@ -18,17 +18,13 @@ # a maximum of 0 objects, so objects should get pushed into the disk cache jcs.default=blockDiskCache -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=0 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.blockRegion1=blockDiskCache -jcs.region.blockRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.blockRegion1.cacheattributes.MaxObjects=0 -jcs.region.blockRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheSteadyLoad.ccf b/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheSteadyLoad.ccf index 90616ef0..f81da512 100644 --- a/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheSteadyLoad.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestBlockDiskCacheSteadyLoad.ccf @@ -18,9 +18,7 @@ # DEFAULT CACHE REGION jcs.default=DC -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.DiskUsagePattern=UPDATE diff --git a/commons-jcs4-core/src/test/test-conf/TestDiskCache.ccf b/commons-jcs4-core/src/test/test-conf/TestDiskCache.ccf index a77ae524..ebc49248 100644 --- a/commons-jcs4-core/src/test/test-conf/TestDiskCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestDiskCache.ccf @@ -18,38 +18,22 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=indexedDiskCache -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # SYSTEM GROUP ID CACHE jcs.system.groupIdCache=indexedDiskCache -jcs.system.groupIdCache.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.system.groupIdCache.cacheattributes.MaxObjects=10000 -jcs.system.groupIdCache.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.indexedRegion1=indexedDiskCache -jcs.region.indexedRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion1.cacheattributes.MaxObjects=100 -jcs.region.indexedRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.indexedRegion2=indexedDiskCache -jcs.region.indexedRegion2.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion2.cacheattributes.MaxObjects=100 -jcs.region.indexedRegion2.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.indexedRegion3=indexedDiskCache -jcs.region.indexedRegion3.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion3.cacheattributes.MaxObjects=100 -jcs.region.indexedRegion3.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.indexedRegion4=indexedDiskCache2 -jcs.region.indexedRegion4.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion4.cacheattributes.MaxObjects=100 -jcs.region.indexedRegion4.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestDiskCacheCon.ccf b/commons-jcs4-core/src/test/test-conf/TestDiskCacheCon.ccf index dd09f088..7a92a050 100644 --- a/commons-jcs4-core/src/test/test-conf/TestDiskCacheCon.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestDiskCacheCon.ccf @@ -18,33 +18,19 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=indexedDiskCache -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.indexedRegion1=indexedDiskCache -jcs.region.indexedRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion1.cacheattributes.MaxObjects=100 -jcs.region.indexedRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.indexedRegion2=indexedDiskCache -jcs.region.indexedRegion2.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion2.cacheattributes.MaxObjects=100 -jcs.region.indexedRegion2.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.indexedRegion3=indexedDiskCache -jcs.region.indexedRegion3.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion3.cacheattributes.MaxObjects=100 -jcs.region.indexedRegion3.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.indexedRegion4=indexedDiskCache -jcs.region.indexedRegion4.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion4.cacheattributes.MaxObjects=100 -jcs.region.indexedRegion4.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestDiskCacheDefragPerformance.ccf b/commons-jcs4-core/src/test/test-conf/TestDiskCacheDefragPerformance.ccf index 8f7f7344..1f06f0eb 100644 --- a/commons-jcs4-core/src/test/test-conf/TestDiskCacheDefragPerformance.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestDiskCacheDefragPerformance.ccf @@ -18,9 +18,7 @@ # DEFAULT CACHE REGION jcs.default=DC -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache cs.default.cacheattributes.DiskUsagePatterName=UPDATE # AVAILABLE AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestDiskCacheHuge.ccf b/commons-jcs4-core/src/test/test-conf/TestDiskCacheHuge.ccf index 4f5c1f64..3970407e 100644 --- a/commons-jcs4-core/src/test/test-conf/TestDiskCacheHuge.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestDiskCacheHuge.ccf @@ -18,17 +18,13 @@ # a maximum of 0 objects, so objects should get pushed into the disk cache jcs.default=indexedDiskCache -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=0 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.indexedRegion1=indexedDiskCache -jcs.region.indexedRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.indexedRegion1.cacheattributes.MaxObjects=0 -jcs.region.indexedRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestDiskCacheNoMemory.ccf b/commons-jcs4-core/src/test/test-conf/TestDiskCacheNoMemory.ccf index 1e292548..d09109f4 100644 --- a/commons-jcs4-core/src/test/test-conf/TestDiskCacheNoMemory.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestDiskCacheNoMemory.ccf @@ -18,38 +18,22 @@ # a maximum of 0 objects, so objects should get pushed into the disk cache jcs.default=indexedDiskCache -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=0 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # SYSTEM GROUP ID CACHE jcs.system.groupIdCache=indexedDiskCache -jcs.system.groupIdCache.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.system.groupIdCache.cacheattributes.MaxObjects=0 -jcs.system.groupIdCache.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.indexedRegion1=indexedDiskCache -jcs.region.indexedRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion1.cacheattributes.MaxObjects=0 -jcs.region.indexedRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.indexedRegion2=indexedDiskCache -jcs.region.indexedRegion2.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion2.cacheattributes.MaxObjects=0 -jcs.region.indexedRegion2.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.indexedRegion3=indexedDiskCache -jcs.region.indexedRegion3.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion3.cacheattributes.MaxObjects=0 -jcs.region.indexedRegion3.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.indexedRegion4=indexedDiskCache2 -jcs.region.indexedRegion4.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.indexedRegion4.cacheattributes.MaxObjects=0 -jcs.region.indexedRegion4.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestDiskCacheSteadyLoad.ccf b/commons-jcs4-core/src/test/test-conf/TestDiskCacheSteadyLoad.ccf index cbe31e85..cdd08d7d 100644 --- a/commons-jcs4-core/src/test/test-conf/TestDiskCacheSteadyLoad.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestDiskCacheSteadyLoad.ccf @@ -18,9 +18,7 @@ # DEFAULT CACHE REGION jcs.default=DC -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.DiskUsagePattern=UPDATE diff --git a/commons-jcs4-core/src/test/test-conf/TestDiskCacheUsagePattern.ccf b/commons-jcs4-core/src/test/test-conf/TestDiskCacheUsagePattern.ccf index 8ff31971..ca7b58e5 100644 --- a/commons-jcs4-core/src/test/test-conf/TestDiskCacheUsagePattern.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestDiskCacheUsagePattern.ccf @@ -18,22 +18,14 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=indexedDiskCache -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.Swap=indexedDiskCache -jcs.region.Swap.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.Swap.cacheattributes.MaxObjects=100 -jcs.region.Swap.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.Swap.cacheattributes.DiskUsagePattern=SWAP jcs.region.Update=indexedDiskCache -jcs.region.Update.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.Update.cacheattributes.MaxObjects=100 -jcs.region.Update.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.Update.cacheattributes.DiskUsagePattern=UPDATE diff --git a/commons-jcs4-core/src/test/test-conf/TestElementSerializer.ccf b/commons-jcs4-core/src/test/test-conf/TestElementSerializer.ccf index 5c770eb1..403ba6db 100644 --- a/commons-jcs4-core/src/test/test-conf/TestElementSerializer.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestElementSerializer.ccf @@ -18,33 +18,20 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=blockDiskCache -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # SYSTEM GROUP ID CACHE jcs.system.groupIdCache=blockDiskCache -jcs.system.groupIdCache.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.system.groupIdCache.cacheattributes.MaxObjects=10000 -jcs.system.groupIdCache.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.blockRegion1=blockDiskCache -jcs.region.blockRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.blockRegion1.cacheattributes.MaxObjects=100 -jcs.region.blockRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.blockRegion2=blockDiskCache2 -jcs.region.blockRegion2.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.blockRegion2.cacheattributes.MaxObjects=100 -jcs.region.blockRegion2.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.blockRegion3=blockDiskCache3 -jcs.region.blockRegion3.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes -jcs.region.blockRegion3.cacheattributes.MaxObjects=100 -jcs.region.blockRegion3.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestHSQLDiskCache.ccf b/commons-jcs4-core/src/test/test-conf/TestHSQLDiskCache.ccf index 0340adbf..ae8bae2d 100644 --- a/commons-jcs4-core/src/test/test-conf/TestHSQLDiskCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestHSQLDiskCache.ccf @@ -18,25 +18,17 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=HSQL -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=0 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=false jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true jcs.region.noRemoveAll=HSQL_NORA -jcs.region.noRemoveAll.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.noRemoveAll.cacheattributes.MaxObjects=0 -jcs.region.noRemoveAll.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache diff --git a/commons-jcs4-core/src/test/test-conf/TestHSQLDiskCacheConcurrent.ccf b/commons-jcs4-core/src/test/test-conf/TestHSQLDiskCacheConcurrent.ccf index f022d427..197bdec7 100644 --- a/commons-jcs4-core/src/test/test-conf/TestHSQLDiskCacheConcurrent.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestHSQLDiskCacheConcurrent.ccf @@ -18,25 +18,17 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=HSQL -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=0 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=false jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true jcs.region.noRemoveAll=HSQL_NORA -jcs.region.noRemoveAll.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.noRemoveAll.cacheattributes.MaxObjects=0 -jcs.region.noRemoveAll.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache diff --git a/commons-jcs4-core/src/test/test-conf/TestJCS-73.ccf b/commons-jcs4-core/src/test/test-conf/TestJCS-73.ccf index c31a7090..a66b8106 100644 --- a/commons-jcs4-core/src/test/test-conf/TestJCS-73.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestJCS-73.ccf @@ -17,17 +17,13 @@ # Cache configuration for the 'JCSConcurrentCacheAccessUnitTest' test. jcs.default=CACHE -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=-1 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.DiskUsagePattern=UPDATE jcs.default.cacheattributes.UseMemoryShrinker=true jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=10 jcs.default.cacheattributes.ShrinkerIntervalSeconds=10 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsRemote=false jcs.default.elementattributes.IsLateral=false -jcs.default.elementattributes.IsSpool=true jcs.default.elementattributes.IsEternal=true jcs.auxiliary.CACHE=org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheFactory diff --git a/commons-jcs4-core/src/test/test-conf/TestJCSvHashtablePerf.ccf b/commons-jcs4-core/src/test/test-conf/TestJCSvHashtablePerf.ccf index 3df00ba8..64deaf25 100644 --- a/commons-jcs4-core/src/test/test-conf/TestJCSvHashtablePerf.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestJCSvHashtablePerf.ccf @@ -18,17 +18,13 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.testCache1= -jcs.region.testCache1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.testCache1.cacheattributes.MaxObjects=100000 -jcs.region.testCache1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # ############################################################# diff --git a/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCache.ccf b/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCache.ccf index 235de35b..c6e73207 100644 --- a/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCache.ccf @@ -18,19 +18,13 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=JDBC -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=false jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true # ############################################################# # ################# AUXILIARY CACHES AVAILABLE ################ diff --git a/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheRemoval.ccf b/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheRemoval.ccf index 44709ac8..1c273a49 100644 --- a/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheRemoval.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheRemoval.ccf @@ -18,19 +18,13 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=JDBC -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=0 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=false jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true # ############################################################# # ################# AUXILIARY CACHES AVAILABLE ################ diff --git a/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheSharedPool.ccf b/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheSharedPool.ccf index c5b633e1..9940a1dd 100644 --- a/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheSharedPool.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheSharedPool.ccf @@ -18,19 +18,13 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=JDBC_0 -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=false jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true # ############################################################# # ################# CONFIGURED REGIONS ######################## diff --git a/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheShrink.ccf b/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheShrink.ccf index 9dcaf7e3..cb3e0c55 100644 --- a/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheShrink.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestJDBCDiskCacheShrink.ccf @@ -18,38 +18,26 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=JDBC -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=false jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true # ############################################################# # ################# REGIONS ################################### jcs.region.expire1Second=JDBC -jcs.region.expire1Second.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.expire1Second.cacheattributes.MaxObjects=0 -jcs.region.expire1Second.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.expire1Second.elementattributes.MaxLife=1 jcs.region.expire100Second=JDBC -jcs.region.expire100Second.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.expire100Second.cacheattributes.MaxObjects=0 -jcs.region.expire100Second.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.expire100Second.elementattributes.MaxLife=100 jcs.region.eternal=JDBC -jcs.region.eternal.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.eternal.cacheattributes.MaxObjects=0 -jcs.region.eternal.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.eternal.elementattributes.MaxLife=1 jcs.region.eternal.elementattributes.IsEternal=true diff --git a/commons-jcs4-core/src/test/test-conf/TestLHMLRUCache.ccf b/commons-jcs4-core/src/test/test-conf/TestLHMLRUCache.ccf index b63bc850..a31a86f4 100644 --- a/commons-jcs4-core/src/test/test-conf/TestLHMLRUCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestLHMLRUCache.ccf @@ -18,6 +18,5 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LHMLRUMemoryCache diff --git a/commons-jcs4-core/src/test/test-conf/TestMRUCache.ccf b/commons-jcs4-core/src/test/test-conf/TestMRUCache.ccf index 617af6fc..306f2200 100644 --- a/commons-jcs4-core/src/test/test-conf/TestMRUCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestMRUCache.ccf @@ -18,28 +18,20 @@ # with the memory shrinker on. jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=1000 jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.mru.MRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=true jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=1 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=600 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true # Region defined that uses the MRU jcs.region.mruDefined= -jcs.region.mruDefined.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.mruDefined.cacheattributes.MaxObjects=100000 jcs.region.mruDefined.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.mru.MRUMemoryCache # Region defined that uses the LRU jcs.region.lruDefined= -jcs.region.lruDefined.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.lruDefined.cacheattributes.MaxObjects=100000 -jcs.region.lruDefined.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache diff --git a/commons-jcs4-core/src/test/test-conf/TestMySQLDiskCache.ccf b/commons-jcs4-core/src/test/test-conf/TestMySQLDiskCache.ccf index a236f0ba..7658b984 100644 --- a/commons-jcs4-core/src/test/test-conf/TestMySQLDiskCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestMySQLDiskCache.ccf @@ -20,19 +20,13 @@ # verify that the mysql disk cache works. jcs.default=MYSQL -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=0 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=false jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true # ############################################################# # ################# AUXILIARY CACHES AVAILABLE ################ diff --git a/commons-jcs4-core/src/test/test-conf/TestRemoteCacheClientServer.ccf b/commons-jcs4-core/src/test/test-conf/TestRemoteCacheClientServer.ccf index 15586fdc..52e0428d 100644 --- a/commons-jcs4-core/src/test/test-conf/TestRemoteCacheClientServer.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestRemoteCacheClientServer.ccf @@ -30,9 +30,7 @@ jcs.remotecache.serverattributes.LocalClusterConsistency=true # ############################################################# # ################# DEFAULT CACHE REGION ##################### jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=1000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # ############################################################# diff --git a/commons-jcs4-core/src/test/test-conf/TestRemoteCacheServer.ccf b/commons-jcs4-core/src/test/test-conf/TestRemoteCacheServer.ccf index dd1db649..bfa40254 100644 --- a/commons-jcs4-core/src/test/test-conf/TestRemoteCacheServer.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestRemoteCacheServer.ccf @@ -17,6 +17,4 @@ # ############################################################# # ################# DEFAULT CACHE REGION ##################### jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=1000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache diff --git a/commons-jcs4-core/src/test/test-conf/TestRemoteClient.ccf b/commons-jcs4-core/src/test/test-conf/TestRemoteClient.ccf index 6ec3e7c6..aaf38fb3 100644 --- a/commons-jcs4-core/src/test/test-conf/TestRemoteClient.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestRemoteClient.ccf @@ -18,19 +18,13 @@ # ################# DEFAULT CACHE REGION ##################### # sets the default aux value for any non configured caches jcs.default=RC -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=200001 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=true jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true jcs.auxiliary.RC=org.apache.commons.jcs4.auxiliary.remote.RemoteCacheFactory diff --git a/commons-jcs4-core/src/test/test-conf/TestRemoteHttpCache.ccf b/commons-jcs4-core/src/test/test-conf/TestRemoteHttpCache.ccf index c14de962..dffc2773 100644 --- a/commons-jcs4-core/src/test/test-conf/TestRemoteHttpCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestRemoteHttpCache.ccf @@ -18,19 +18,13 @@ # ################# DEFAULT CACHE REGION ##################### # sets the default aux value for any non configured caches jcs.default=RC -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=0 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=true jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true ## The Http Remote Cache Client diff --git a/commons-jcs4-core/src/test/test-conf/TestRemoteServer.ccf b/commons-jcs4-core/src/test/test-conf/TestRemoteServer.ccf index 22b8db6b..bccfbe39 100644 --- a/commons-jcs4-core/src/test/test-conf/TestRemoteServer.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestRemoteServer.ccf @@ -28,17 +28,11 @@ jcs.remotecache.serverattributes.LocalClusterConsistency=true # ################# DEFAULT CACHE REGION ##################### # sets the default aux value for any non configured caches jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=200000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=true jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=7000 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true diff --git a/commons-jcs4-core/src/test/test-conf/TestRemoval.ccf b/commons-jcs4-core/src/test/test-conf/TestRemoval.ccf index 514a9c72..c2cb64e9 100644 --- a/commons-jcs4-core/src/test/test-conf/TestRemoval.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestRemoval.ccf @@ -17,19 +17,13 @@ # JCS Config for unit testing, just a simple memory only cache jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=1000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.system.groupIdCache= -jcs.system.groupIdCache.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.system.groupIdCache.cacheattributes.MaxObjects=10000 -jcs.system.groupIdCache.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.testCache1= -jcs.region.testCache1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.testCache1.cacheattributes.MaxObjects=1000 -jcs.region.testCache1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # ############################################################# diff --git a/commons-jcs4-core/src/test/test-conf/TestSimpleEventHandling.ccf b/commons-jcs4-core/src/test/test-conf/TestSimpleEventHandling.ccf index 5f2aa90e..260bb3c1 100644 --- a/commons-jcs4-core/src/test/test-conf/TestSimpleEventHandling.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestSimpleEventHandling.ccf @@ -18,41 +18,29 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.WithDisk=indexedDiskCache -jcs.region.WithDisk.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.WithDisk.cacheattributes.MaxObjects=0 -jcs.region.WithDisk.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.WithDisk.elementattributes.IsSpool=true jcs.region.NoDisk= -jcs.region.NoDisk.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.NoDisk.cacheattributes.MaxObjects=0 -jcs.region.NoDisk.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.NoDisk.elementattributes.IsSpool=true jcs.region.DiskButNotAllowed=indexedDiskCache -jcs.region.DiskButNotAllowed.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.DiskButNotAllowed.cacheattributes.MaxObjects=0 -jcs.region.DiskButNotAllowed.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.DiskButNotAllowed.elementattributes.IsSpool=false jcs.region.Maxlife= -jcs.region.Maxlife.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.Maxlife.cacheattributes.MaxObjects=200 -jcs.region.Maxlife.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.Maxlife.elementattributes.IsEternal=false jcs.region.Maxlife.elementattributes.MaxLife=1 jcs.region.Idletime= -jcs.region.Idletime.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.Idletime.cacheattributes.MaxObjects=200 -jcs.region.Idletime.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.Idletime.elementattributes.IsEternal=false jcs.region.Idletime.elementattributes.MaxLife=300 jcs.region.Idletime.elementattributes.MaxIdleTime=1 diff --git a/commons-jcs4-core/src/test/test-conf/TestSimpleLoad.ccf b/commons-jcs4-core/src/test/test-conf/TestSimpleLoad.ccf index aae9ad39..d20cf796 100644 --- a/commons-jcs4-core/src/test/test-conf/TestSimpleLoad.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestSimpleLoad.ccf @@ -17,12 +17,8 @@ # JCS Config for unit testing, just a simple memory only cache jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=1000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.testCache1= -jcs.region.testCache1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.testCache1.cacheattributes.MaxObjects=20001 -jcs.region.testCache1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache diff --git a/commons-jcs4-core/src/test/test-conf/TestSoftReferenceCache.ccf b/commons-jcs4-core/src/test/test-conf/TestSoftReferenceCache.ccf index 7b4f1d85..209c65d3 100644 --- a/commons-jcs4-core/src/test/test-conf/TestSoftReferenceCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestSoftReferenceCache.ccf @@ -17,21 +17,15 @@ # JCS Config for unit testing jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.soft.SoftReferenceMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=false jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=600 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true # Region defined that uses the Soft Reference jcs.region.srDefined= -jcs.region.srDefined.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.srDefined.cacheattributes.MaxObjects=100000 jcs.region.srDefined.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.soft.SoftReferenceMemoryCache diff --git a/commons-jcs4-core/src/test/test-conf/TestSystemProperties.ccf b/commons-jcs4-core/src/test/test-conf/TestSystemProperties.ccf index eeb4de68..f5fc6d31 100644 --- a/commons-jcs4-core/src/test/test-conf/TestSystemProperties.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestSystemProperties.ccf @@ -18,15 +18,11 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=indexedDiskCache -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=${MY_SYSTEM_PROPERTY_MAX_SIZE} -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.missing= -jcs.region.missing.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.missing.cacheattributes.MaxObjects=${NO_SUCH_PROPERTY} -jcs.region.missing.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestSystemPropertyUsage.ccf b/commons-jcs4-core/src/test/test-conf/TestSystemPropertyUsage.ccf index 7afda85d..724ba430 100644 --- a/commons-jcs4-core/src/test/test-conf/TestSystemPropertyUsage.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestSystemPropertyUsage.ccf @@ -15,6 +15,4 @@ # specific language governing permissions and limitations # under the License. jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=10 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache diff --git a/commons-jcs4-core/src/test/test-conf/TestTCPLateralCache.ccf b/commons-jcs4-core/src/test/test-conf/TestTCPLateralCache.ccf index b7553a2c..eb3b8783 100644 --- a/commons-jcs4-core/src/test/test-conf/TestTCPLateralCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestTCPLateralCache.ccf @@ -18,17 +18,13 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=LTCP -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=10000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.testTcpRegion1=LTCP -jcs.region.testTcpRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.testTcpRegion1.cacheattributes.MaxObjects=10000 -jcs.region.testTcpRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestTCPLateralCacheConcurrent.ccf b/commons-jcs4-core/src/test/test-conf/TestTCPLateralCacheConcurrent.ccf index bd2f3b88..2d41616e 100644 --- a/commons-jcs4-core/src/test/test-conf/TestTCPLateralCacheConcurrent.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestTCPLateralCacheConcurrent.ccf @@ -15,9 +15,7 @@ # specific language governing permissions and limitations # under the License. jcs.default=LTCP -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=10000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES # simple Lateral TCP auxiliary diff --git a/commons-jcs4-core/src/test/test-conf/TestTCPLateralIssueRemoveCache.ccf b/commons-jcs4-core/src/test/test-conf/TestTCPLateralIssueRemoveCache.ccf index ce606bb6..b941d403 100644 --- a/commons-jcs4-core/src/test/test-conf/TestTCPLateralIssueRemoveCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestTCPLateralIssueRemoveCache.ccf @@ -18,17 +18,13 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=LTCP -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=10000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.testTcpRegion1=LTCP -jcs.region.testTcpRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.testTcpRegion1.cacheattributes.MaxObjects=10000 -jcs.region.testTcpRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestTCPLateralRemoveFilter.ccf b/commons-jcs4-core/src/test/test-conf/TestTCPLateralRemoveFilter.ccf index d9a71890..99899767 100644 --- a/commons-jcs4-core/src/test/test-conf/TestTCPLateralRemoveFilter.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestTCPLateralRemoveFilter.ccf @@ -18,17 +18,13 @@ # a maximum of 100 objects, so objects should get pushed into the disk cache jcs.default=LTCP -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=10000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### CACHE REGIONS FOR TEST jcs.region.testTcpRegion1=LTCP -jcs.region.testTcpRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.testTcpRegion1.cacheattributes.MaxObjects=10000 -jcs.region.testTcpRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache # #### AUXILIARY CACHES diff --git a/commons-jcs4-core/src/test/test-conf/TestThrash.ccf b/commons-jcs4-core/src/test/test-conf/TestThrash.ccf index 91d5354b..ff1b6bd3 100644 --- a/commons-jcs4-core/src/test/test-conf/TestThrash.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestThrash.ccf @@ -15,6 +15,4 @@ # specific language governing permissions and limitations # under the License. jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=10000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache diff --git a/commons-jcs4-core/src/test/test-conf/TestZeroSizeCache.ccf b/commons-jcs4-core/src/test/test-conf/TestZeroSizeCache.ccf index 44b9dd86..a455d266 100644 --- a/commons-jcs4-core/src/test/test-conf/TestZeroSizeCache.ccf +++ b/commons-jcs4-core/src/test/test-conf/TestZeroSizeCache.ccf @@ -18,16 +18,10 @@ # with the memory shrinker on. jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=0 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=true jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=1 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=600 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true diff --git a/xdocs/BDBJEDiskCache.ccf b/xdocs/BDBJEDiskCache.ccf deleted file mode 100644 index cc1ea308..00000000 --- a/xdocs/BDBJEDiskCache.ccf +++ /dev/null @@ -1,84 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -<?xml version="1.0"?> - -<document> - <properties> - <title>Berkeley DB Disk Auxiliary Cache</title> - <author email="[email protected]">Aaron Smuts</author> - </properties> - - <body> - <section name="Berkeley DB Disk Auxiliary Cache"> - <p> - The Berkeley DB Disk Auxiliary Cache is an optional plugin for the - JCS. It is primarily intended to provide a secondary store to - ease the memory burden of the cache. When the memory cache - exceeds its maximum size it tells the cache hub that the item - to be removed from memory should be spooled to disk. The cache - checks to see if any auxiliaries of type "disk" have been - configured for the region. If the "Berkeley DB Disk Auxiliary Cache" - is used, the item will be spooled to disk. - </p> - <p> - The Berkeley DB is far slower than the Indexed Disk Cache, especially for puts. - This is partially due to the fact that the BDB store its keys on disk. - However, any items stored in the BDB will be available on restart, even if - the cache is not shutdown properly. - </p> - <p> - The Berkeley DB requires jdk1.4 and above. As such, it is distributed - in the jdk14-ext jar. - </p> - - <subsection name="Configuration"> - <p> - The configuration is simple and is done in the auxiliary - cache section of the <code>cache.ccf</code> configuration file. - In the example below, I created a Berkeley DB Auxiliary Cache - referenced by <code>BDBDC</code>. It uses files located in the - "DiskPath" directory. - </p> - - <source><![CDATA[ -# ############################################################# -# #### Default Region Configuration -jcs.default=BDBDC -jcs.default.cacheattributes=org.apache.commons.jcs.engine.CompositeCacheAttributes -jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache - -# ############################################################# -# #### CACHE REGIONS -jcs.region.myRegion1=BDBDC -jcs.region.myRegion1.cacheattributes=org.apache.commons.jcs.engine.CompositeCacheAttributes -jcs.region.myRegion1.cacheattributes.MaxObjects=1000 -jcs.region.myRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache - -# ############################################################# -# #### AUXILIARY CACHES -# Berkeley DB JE -jcs.auxiliary.BDBDC=org.apache.commons.jcs.auxiliary.disk.bdbje.BDBJECacheFactory -jcs.auxiliary.BDBDC.attributes=org.apache.commons.jcs.auxiliary.disk.bdbje.BDBJECacheAttributes -jcs.auxiliary.BDBDC.attributes.DiskPath=target/ -jcs.auxiliary.BDBDC.attributes.MaxPurgatorySize=100000 - ]]></source> - </subsection> - - </section> - </body> -</document> diff --git a/xdocs/BasicJCSConfiguration.xml b/xdocs/BasicJCSConfiguration.xml index 0b589b61..78651779 100644 --- a/xdocs/BasicJCSConfiguration.xml +++ b/xdocs/BasicJCSConfiguration.xml @@ -60,7 +60,6 @@ jcs.default.cacheattributes.UseMemoryShrinker=true jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 jcs.default.cacheattributes.MaxSpoolPerRun=500 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false ]]></source> <p> @@ -98,7 +97,6 @@ jcs.region.testCache1.cacheattributes.UseMemoryShrinker=true jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=60 jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=500 -jcs.region.testCache1.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.region.testCache1.elementattributes.IsEternal=false ]]></source> @@ -167,7 +165,6 @@ jcs.region.testCache1.cacheattributes.UseMemoryShrinker=true jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=60 jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=500 -jcs.region.testCache1.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.region.testCache1.elementattributes.IsEternal=false diff --git a/xdocs/BlockDiskCache.xml b/xdocs/BlockDiskCache.xml index 8e5ec90c..0d0eaaf1 100644 --- a/xdocs/BlockDiskCache.xml +++ b/xdocs/BlockDiskCache.xml @@ -64,9 +64,7 @@ ##### DEFAULT REGION ######################################## jcs.default=blockDiskCache -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=0 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache ############################################################## ##### AUXILIARY CACHES ###################################### diff --git a/xdocs/ElementAttributes.xml b/xdocs/ElementAttributes.xml index 8332c53f..b026e8d3 100644 --- a/xdocs/ElementAttributes.xml +++ b/xdocs/ElementAttributes.xml @@ -56,13 +56,9 @@ jcs.default.cacheattributes.MemoryCacheName= jcs.default.cacheattributes.UseMemoryShrinker=true jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true ]]> </source> <p> diff --git a/xdocs/IndexedDiskAuxCache.xml b/xdocs/IndexedDiskAuxCache.xml index 75ebfa17..ad2ed3d3 100644 --- a/xdocs/IndexedDiskAuxCache.xml +++ b/xdocs/IndexedDiskAuxCache.xml @@ -201,16 +201,12 @@ jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=30000 ############################################################## ##### Default Region Configuration jcs.default=DC -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache ############################################################## ##### CACHE REGIONS jcs.region.myRegion1=DC -jcs.region.myRegion1.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.myRegion1.cacheattributes.MaxObjects=1000 -jcs.region.myRegion1.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache ############################################################## ##### AUXILIARY CACHES @@ -249,19 +245,13 @@ jcs.auxiliary.DC.attributes.DiskLimitType=COUNT ################## DEFAULT CACHE REGION ##################### # sets the default aux value for any non configured caches jcs.default=DC2 -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=200001 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=false jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true ############################################################## ################## AUXILIARY CACHES AVAILABLE ################ diff --git a/xdocs/JDBCDiskCache.xml b/xdocs/JDBCDiskCache.xml index bb972a28..f8151d7d 100644 --- a/xdocs/JDBCDiskCache.xml +++ b/xdocs/JDBCDiskCache.xml @@ -38,19 +38,13 @@ ################## DEFAULT CACHE REGION ##################### # sets the default aux value for any non configured caches jcs.default=MYSQL,RCluster -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=5000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=true jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=7200 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=14400 jcs.default.elementattributes.MaxIdleTime=14400 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true ############################################################## ################## CACHE REGIONS AVAILABLE ################### @@ -95,19 +89,13 @@ thread_pool.disk_cache_event_queue.startUpSize=10 <source> <![CDATA[ jcs.default=JDBC_0 -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=false jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true # ############################################################# # ################# CONFIGURED REGIONS ######################## @@ -169,19 +157,13 @@ thread_pool.disk_cache_event_queue.startUpSize=10 <source> <![CDATA[ jcs.default=JDBC_0 -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=100 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=false jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true # ############################################################# # ################# CONFIGURED REGIONS ######################## diff --git a/xdocs/RegionProperties.xml b/xdocs/RegionProperties.xml index 9f296a7f..1f5a3813 100644 --- a/xdocs/RegionProperties.xml +++ b/xdocs/RegionProperties.xml @@ -238,18 +238,12 @@ <source> <![CDATA[ jcs.default= -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=200001 -jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.cacheattributes.UseMemoryShrinker=true jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -jcs.default.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=700 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true # optional region "testCache1" specific configuration settings (only those that differ from default) jcs.region.testCache1= @@ -257,7 +251,6 @@ jcs.region.testCache1.cacheattributes.MaxObjects=123456 jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=30 jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=300 jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=100 -jcs.region.testCache1.elementattributes=org.apache.commons.jcs4.engine.ElementAttributes jcs.region.testCache1.elementattributes.MaxLife=60000 ]]> </source> diff --git a/xdocs/UsingJCSBasicWeb.xml b/xdocs/UsingJCSBasicWeb.xml index c44507de..2f7faf1d 100644 --- a/xdocs/UsingJCSBasicWeb.xml +++ b/xdocs/UsingJCSBasicWeb.xml @@ -370,9 +370,6 @@ jcs.default.cacheattributes.MemoryCacheName= jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=3600 jcs.default.elementattributes.MaxIdleTime=1800 -jcs.default.elementattributes.IsSpool=true -jcs.default.elementattributes.IsRemote=true -jcs.default.elementattributes.IsLateral=true # CACHE REGIONS AVAILABLE diff --git a/xdocs/getting_started/intro.xml b/xdocs/getting_started/intro.xml index 70ad69ab..74c27fc8 100644 --- a/xdocs/getting_started/intro.xml +++ b/xdocs/getting_started/intro.xml @@ -148,30 +148,21 @@ <