From 0b8f539ca9818c9e9e50c8e5c270dd737d4f3f8e Mon Sep 17 00:00:00 2001 From: Jonathan Gamba Date: Thu, 4 May 2017 11:48:34 -0600 Subject: [PATCH] Changed cache provider to CaffineCache --- .../it-dotmarketing-config.properties | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties b/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties index 8a847c86b6fe..cf274c7649f7 100644 --- a/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties +++ b/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties @@ -504,15 +504,17 @@ ES_URL_ENDPOINT=http://localhost:9200/ asset.cache.control.max.days=30 ##################### dotCMS Cache Configuration ##################### -cache.default.chain=com.dotmarketing.business.cache.provider.guava.GuavaCache -cache.velocitymemoryonlycache.chain=com.dotmarketing.business.cache.provider.guava.GuavaCache -cache.contentletcache.chain=com.dotmarketing.business.cache.provider.guava.GuavaCache,com.dotmarketing.business.cache.provider.h22.H22Cache -cache.velocitycache.chain=com.dotmarketing.business.cache.provider.guava.GuavaCache,com.dotmarketing.business.cache.provider.h22.H22Cache +cache.default.chain =com.dotmarketing.business.cache.provider.caffine.CaffineCache +cache.contentletcache.chain =com.dotmarketing.business.cache.provider.caffine.CaffineCache,com.dotmarketing.business.cache.provider.h22.H22Cache +cache.velocitycache.chain =com.dotmarketing.business.cache.provider.caffine.CaffineCache,com.dotmarketing.business.cache.provider.h22.H22Cache +#cache.default.chain=com.dotmarketing.business.cache.provider.hazelcast.HazelCastEmbeddedProvider +#cache.default.chain=com.dotmarketing.business.cache.provider.hazelcast.HazelCastClientProvider + +CACHE_INVALIDATION_TRANSPORT_CLASS=com.dotcms.cache.transport.HazelCastCacheTransport + ## Default Caching Settings cache.default.size=1000 -cache.livecache.size=1000 -cache.workingcache.size=1000 ## Region Specific Guava cache setting Settings cache.concurrencylevel=32 @@ -533,11 +535,14 @@ cache.pushedassetscache.size=5000 cache.structurecache.size=500 cache.templatecache.size=500 cache.translatedquerycache.size=5000 -cache.velocityuservtlcache.size=500 cache.versioncache.size=50000 cache.versioninfocache.size=50000 cache.workflowactioncache.size=10000 cache.workflowtaskcache.size=10000 +cache.shorty.size=25000 +cache.identifier404cache.size=5000 +cache.virtuallinkscache.size=25000 +cache.velocitycache.size=1000 #Available cache regions @@ -558,9 +563,6 @@ cache.workflowtaskcache.size=10000 #cache.dotcmsrolekeycache.size=1000 #cache.dotcmsrootrolescache.size=1000 #cache.dotcmsuserrolecache.size=1000 -#cache.fieldscache.size=1000 -#cache.fieldsvarcache.size=1000 -#cache.filecache.size=1000 #cache.foldercache.size=1000 #cache.hostaliascache.size=1000 #cache.hostcache.size=1000 @@ -572,7 +574,6 @@ cache.workflowtaskcache.size=10000 #cache.newnotificationcache.size=1000 #cache.plugincache.size=1000 #cache.propertycache.size=1000 -#cache.ratingcache.size=1000 #cache.relationshipcachebyinode.size=1000 #cache.relationshipcachebyname.size=1000 #cache.ruleactionscache.size=1000 @@ -585,10 +586,6 @@ cache.workflowtaskcache.size=10000 #cache.useremaildotcmscache.size=1000 #cache.userproxycache.size=1000 #cache.velocitycache.size=1000 -#cache.velocitymemoryonlycache.size=1000 -#cache.velocitymenucache.size=1000 -#cache.velocitymisscache.size=1000 -#cache.virtuallinkscache.size=1000 #cache.workflowcache.size=1000 #cache.workflowstepcache.size=1000