From 944df98bbf1cd69eb13442a4d4c492ecd7e01d77 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Fri, 15 Nov 2024 17:42:47 +0100 Subject: [PATCH] feat: Centralize Cache configuration in Meeds package - MEED-7742 - Meeds-io/meeds#2537 (#4192) This change will centralize the Cache configuration into Meeds package to ease its maintainability and evolutivity. In fact, this will allow to override the Meeds caches configurations by one single file override. --- webapp/pom.xml | 6 - .../webapp/WEB-INF/conf/configuration.xml | 1 - .../social/cache-configuration.xml | 287 ------------------ 3 files changed, 294 deletions(-) delete mode 100644 webapp/src/main/webapp/WEB-INF/conf/social-extension/social/cache-configuration.xml diff --git a/webapp/pom.xml b/webapp/pom.xml index 195afa6b7f9..d2306020575 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -337,12 +337,6 @@ test - - - io.meeds.kernel - exo.kernel.component.ext.cache.impl.infinispan.v8 - - io.meeds.portal diff --git a/webapp/src/main/webapp/WEB-INF/conf/configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/configuration.xml index 23d97947e32..0863ec7bddf 100644 --- a/webapp/src/main/webapp/WEB-INF/conf/configuration.xml +++ b/webapp/src/main/webapp/WEB-INF/conf/configuration.xml @@ -29,7 +29,6 @@ war:/conf/social-extension/portal/upgrade-plugins-configuration.xml war:/conf/social-extension/social/social-configuration.xml war:/conf/social-extension/social/component-plugins-configuration.xml - war:/conf/social-extension/social/cache-configuration.xml war:/conf/social-extension/social/common-configuration.xml war:/conf/social-extension/social/core-configuration.xml war:/conf/social-extension/social/service-configuration.xml diff --git a/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/cache-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/cache-configuration.xml deleted file mode 100644 index 336c3ce0f3f..00000000000 --- a/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/cache-configuration.xml +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - org.exoplatform.services.cache.CacheService - - addExoCacheConfig - addExoCacheConfig - org.exoplatform.services.cache.ExoCacheConfigPlugin - - - - - - social.IdentityCache - The Cache configuration for the IdentityCache - - social.IdentityCache - ${exo.cache.social.IdentityCache.strategy:LIRS} - ${exo.cache.social.IdentityCache.MaxNodes:1100} - ${exo.cache.social.IdentityCache.TimeToLive:86400} - ${exo.cache.social.IdentityCache.cacheMode:replication} - - - - social.IdentityIndexCache - The Cache configuration for the IdentityIndexCache - - social.IdentityIndexCache - ${exo.cache.social.IdentityIndexCache.strategy:LIRS} - ${exo.cache.social.IdentityIndexCache.MaxNodes:1100} - ${exo.cache.social.IdentityIndexCache.TimeToLive:86400} - ${exo.cache.social.IdentityIndexCache.cacheMode:replication} - - - - social.ProfileCache - The Cache configuration for the ProfileCache - - social.ProfileCache - ${exo.cache.social.ProfileCache.strategy:LIRS} - ${exo.cache.social.ProfileCache.MaxNodes:1100} - ${exo.cache.social.ProfileCache.TimeToLive:86400} - ${exo.cache.social.ProfileCache.cacheMode:replication} - - - - social.IdentitiesCountCache - The Cache configuration for the IdentitiesCountCache - - social.IdentitiesCountCache - ${exo.cache.social.IdentitiesCountCache.strategy:LIRS} - ${exo.cache.social.IdentitiesCountCache.MaxNodes:1100} - ${exo.cache.social.IdentitiesCountCache.TimeToLive:86400} - ${exo.cache.social.IdentitiesCountCache.cacheMode:replication} - - - - social.IdentitiesCache - The Cache configuration for the IdentitiesCache - - social.IdentitiesCache - ${exo.cache.social.IdentitiesCache.strategy:LIRS} - ${exo.cache.social.IdentitiesCache.MaxNodes:1100} - ${exo.cache.social.IdentitiesCache.TimeToLive:86400} - ${exo.cache.social.IdentitiesCache.cacheMode:replication} - - - - - - social.RelationshipCache - The Cache configuration for the RelationshipCache - - social.RelationshipCache - ${exo.cache.social.RelationshipCache.strategy:LIRS} - ${exo.cache.social.RelationshipCache.MaxNodes:100000} - ${exo.cache.social.RelationshipCache.TimeToLive:86400} - ${exo.cache.social.RelationshipCache.cacheMode:replication} - - - - social.RelationshipFromIdentityCache - The Cache configuration for the RelationshipFromIdentityCache - - social.RelationshipFromIdentityCache - ${exo.cache.social.RelationshipFromIdentityCache.strategy:LIRS} - ${exo.cache.social.RelationshipFromIdentityCache.MaxNodes:100000} - ${exo.cache.social.RelationshipFromIdentityCache.TimeToLive:86400} - ${exo.cache.social.RelationshipFromIdentityCache.cacheMode:replication} - - - - social.RelationshipsCountCache - The Cache configuration for the RelationshipsCountCache - - social.RelationshipsCountCache - ${exo.cache.social.RelationshipsCountCache.strategy:LIRS} - ${exo.cache.social.RelationshipsCountCache.MaxNodes:10000} - ${exo.cache.social.RelationshipsCountCache.TimeToLive:86400} - ${exo.cache.social.RelationshipsCountCache.cacheMode:replication} - - - - social.RelationshipsCache - The Cache configuration for the RelationshipsCache - - social.RelationshipsCache - ${exo.cache.social.RelationshipsCache.strategy:LIRS} - ${exo.cache.social.RelationshipsCache.MaxNodes:10000} - ${exo.cache.social.RelationshipsCache.TimeToLive:86400} - ${exo.cache.social.RelationshipsCache.cacheMode:replication} - - - - social.SuggestionsCache - The Cache configuration for the SuggestionsCache - - social.SuggestionsCache - ${exo.cache.social.SuggestionsCache.strategy:LIRS} - ${exo.cache.social.SuggestionsCache.MaxNodes:1000} - ${exo.cache.social.SuggestionsCache.TimeToLive:86400} - ${exo.cache.social.SuggestionsCache.cacheMode:replication} - - - - - - social.ActivityCache - The Cache configuration for the ActivityCache - - social.ActivityCache - ${exo.cache.social.ActivityCache.strategy:LIRS} - ${exo.cache.social.ActivityCache.MaxNodes:20000} - ${exo.cache.social.ActivityCache.TimeToLive:86400} - ${exo.cache.social.ActivityCache.cacheMode:replication} - - - - social.ActivitiesCountCache - - - ${exo.cache.social.ActivitiesCountCache.strategy:LIRS} - social.ActivitiesCountCache - ${exo.cache.social.ActivitiesCountCache.MaxNodes:20000} - ${exo.cache.social.ActivitiesCountCache.TimeToLive:86400} - ${exo.cache.social.ActivitiesCountCache.cacheMode:replication} - - - - social.ActivitiesCache - - - ${exo.cache.social.ActivitiesCache.strategy:LIRS} - social.ActivitiesCache - ${exo.cache.social.ActivitiesCache.MaxNodes:20000} - ${exo.cache.social.ActivitiesCache.TimeToLive:86400} - ${exo.cache.social.ActivitiesCache.cacheMode:replication} - - - - - - social.SpaceCache - The Cache configuration for the SpaceCache - - social.SpaceCache - ${exo.cache.social.SpaceCache.strategy:LIRS} - ${exo.cache.social.SpaceCache.MaxNodes:100} - ${exo.cache.social.SpaceCache.TimeToLive:86400} - ${exo.cache.social.SpaceCache.cacheMode:replication} - - - - social.SpaceSimpleCache - - - social.SpaceSimpleCache - ${exo.cache.social.SpaceSimpleCache.MaxNodes:500} - ${exo.cache.social.SpaceSimpleCache.TimeToLive:86400} - - - - social.SpaceRefCache - The Cache configuration for the SpaceRefCache - - social.SpaceRefCache - ${exo.cache.social.SpaceRefCache.strategy:LIRS} - ${exo.cache.social.SpaceRefCache.MaxNodes:100} - ${exo.cache.social.SpaceRefCache.TimeToLive:86400} - ${exo.cache.social.SpaceRefCache.cacheMode:replication} - - - - social.SpacesCountCache - The Cache configuration for the SpacesCountCache - - social.SpacesCountCache - ${exo.cache.social.SpacesCountCache.strategy:LIRS} - ${exo.cache.social.SpacesCountCache.MaxNodes:4000} - ${exo.cache.social.SpacesCountCache.TimeToLive:86400} - ${exo.cache.social.SpacesCountCache.cacheMode:replication} - - - - social.SpacesCache - The Cache configuration for the SpacesCache - - social.SpacesCache - ${exo.cache.social.SpacesCache.strategy:LIRS} - ${exo.cache.social.SpacesCache.MaxNodes:4000} - ${exo.cache.social.SpacesCache.TimeToLive:86400} - ${exo.cache.social.SpacesCache.cacheMode:replication} - - - - social.translation - The Cache configuration for the TranslationStorage - - social.translation - ${exo.cache.social.TranslationCache.strategy:LIRS} - ${exo.cache.social.TranslationCache.MaxNodes:5000} - ${exo.cache.social.TranslationCache.TimeToLive:86400} - ${exo.cache.social.TranslationCache.cacheMode:replication} - - - - social.linkSettings - The Cache configuration for the LinkStorage - - social.linkSettings - ${exo.cache.social.LinkSettingsCache.strategy:LIRS} - ${exo.cache.social.LinkSettingsCache.MaxNodes:5000} - ${exo.cache.social.LinkSettingsCache.TimeToLive:86400} - ${exo.cache.social.TranslationCache.cacheMode:replication} - - - - social.cmsSetting - The Cache configuration for the CMSStorage - - social.cmsSetting - ${exo.cache.social.cmsSettingCache.strategy:LIRS} - ${exo.cache.social.cmsSettingCache.MaxNodes:5000} - ${exo.cache.social.cmsSettingCache.TimeToLive:86400} - ${exo.cache.social.TranslationCache.cacheMode:replication} - - - - - social.ProfileAvatar - The Cache configuration for the ProfileAvatar - - social.ProfileAvatar - ${exo.cache.social.ProfileAvatar.strategy:LIRS} - ${exo.cache.social.ProfileAvatar.MaxNodes:300} - ${exo.cache.social.ProfileAvatar.TimeToLive:600} - ${exo.cache.social.TranslationCache.cacheMode:replication} - - - - - - -