From 34a5497276c18aec895ead368020f775052976ed Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <bkhanfir@exoplatform.com>
Date: Fri, 8 Nov 2024 11:48:00 +0100
Subject: [PATCH] feat: Centralize Cache configuration in Meeds package -
 MEED-7742 - Meeds-io/meeds#2537 (#1195)

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/WEB-INF/conf/configuration.xml     |  1 -
 .../WEB-INF/conf/wiki/cache-configuration.xml | 59 -------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 notes-webapp/src/main/webapp/WEB-INF/conf/wiki/cache-configuration.xml

diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
index 96871af6cd..1d6256a8a3 100644
--- a/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
+++ b/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
@@ -23,7 +23,6 @@
    xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
    xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
 
-  <import>war:/conf/wiki/cache-configuration.xml</import>
   <import>war:/conf/wiki/webui-configuration.xml</import>
   <import>war:/conf/wiki/wiki-configuration.xml</import>
   <import>war:/conf/wiki/resource-bundle-configuration.xml</import>
diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/cache-configuration.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/cache-configuration.xml
deleted file mode 100644
index b73c064198..0000000000
--- a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/cache-configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  This file is part of the Meeds project (https://meeds.io/).
-
-  Copyright (C) 2022 Meeds Association contact@meeds.io
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
--->
-<configuration
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
-    xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
-
-  <external-component-plugins>
-    <target-component>org.exoplatform.services.cache.CacheService</target-component>
-    <component-plugin>
-      <name>addExoCacheConfig</name>
-      <set-method>addExoCacheConfig</set-method>
-      <type>org.exoplatform.services.cache.ExoCacheConfigPlugin</type>
-      <description>add Exo Cache Config</description>
-      <init-params>
-        <object-param>
-          <name>wiki.PageRenderingCache</name>
-          <description>The wiki markup cache configuration</description>
-          <object type="org.exoplatform.services.cache.impl.infinispan.generic.GenericExoCacheConfig">
-            <field name="name"><string>wiki.PageRenderingCache</string></field>
-            <field name="strategy" profiles="cluster"><string>${exo.cache.wiki.PageRenderingCache.strategy:LIRS}</string></field>
-            <field name="maxSize"><int>${exo.cache.wiki.PageRenderingCache.MaxNodes:1000}</int></field>
-            <field name="liveTime"><long>${exo.cache.wiki.PageRenderingCache.TimeToLive:86400}</long></field>
-            <field name="cacheMode" profiles="cluster"><string>${exo.cache.wiki.PageRenderingCache.cacheMode:replication}</string></field>
-          </object>
-        </object-param>
-        <object-param>
-          <name>wiki.PageAttachmentCache</name>
-          <description>The Cache configuration for wiki page attachment count</description>
-          <object type="org.exoplatform.services.cache.impl.infinispan.generic.GenericExoCacheConfig">
-            <field name="name"><string>wiki.PageAttachmentCache</string></field>
-            <field name="strategy" profiles="cluster"><string>${exo.cache.wiki.PageAttachmentCache.strategy:LIRS}</string></field>
-            <field name="maxSize"><int>${exo.cache.wiki.PageAttachmentCache.MaxNodes:1000}</int></field>
-            <field name="liveTime"><long>${exo.cache.wiki.PageAttachmentCache.TimeToLive:86400}</long></field>
-            <field name="cacheMode" profiles="cluster"><string>${exo.cache.wiki.PageAttachmentCache.cacheMode:replication}</string></field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-</configuration>