From 6179426ca6da991c88271bd6c9291e802f5fe7aa Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Thu, 5 Oct 2023 14:43:44 +0200
Subject: [PATCH 1/3] ehcache configuration

---
 .../src/main/resources/ehcache.xml            | 118 ++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 apps/dnet-exporter-api/src/main/resources/ehcache.xml

diff --git a/apps/dnet-exporter-api/src/main/resources/ehcache.xml b/apps/dnet-exporter-api/src/main/resources/ehcache.xml
new file mode 100644
index 00000000..9fdfa115
--- /dev/null
+++ b/apps/dnet-exporter-api/src/main/resources/ehcache.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://www.ehcache.org/ehcache.xsd"
+         updateCheck="true"
+         monitoring="autodetect"
+         dynamicConfig="true">
+
+        <cache name="fundingpath-ids"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+        </cache>
+        <cache name="indexdsinfo-cache"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+    </cache>
+        <cache name="objectstoreid-cache"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+        </cache>
+        <cache name="context-cache"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+        </cache>
+        <cache name="context-cache-funder"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+        </cache>
+        <cache name="context-cache-community"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+        </cache>
+        <cache name="dsm-aggregationhistory-cache-v1"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+        </cache>
+        <cache name="dsm-aggregationhistory-cache-v2"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+        </cache>
+        <cache name="dsm-firstharvestdate-cache"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+    </cache>
+        <cache name="vocabularies-cache"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+        </cache>
+        <cache name="community-cache"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+        </cache>
+        <cache name="info"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+    </cache>
+
+</ehcache>
+

From 00fa25cefb8beab1265c654d30002a4c3512eb2e Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Thu, 5 Oct 2023 14:44:36 +0200
Subject: [PATCH 2/3] formatting

---
 .../src/main/resources/ehcache.xml            | 140 +++++++++---------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/apps/dnet-exporter-api/src/main/resources/ehcache.xml b/apps/dnet-exporter-api/src/main/resources/ehcache.xml
index 9fdfa115..20cc6faa 100644
--- a/apps/dnet-exporter-api/src/main/resources/ehcache.xml
+++ b/apps/dnet-exporter-api/src/main/resources/ehcache.xml
@@ -5,16 +5,7 @@
          monitoring="autodetect"
          dynamicConfig="true">
 
-        <cache name="fundingpath-ids"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-        </cache>
-        <cache name="indexdsinfo-cache"
+    <cache name="fundingpath-ids"
            maxElementsInMemory="5000"
            eternal="false"
            overflowToDisk="false"
@@ -23,61 +14,7 @@
            memoryStoreEvictionPolicy="LFU"
            transactionalMode="off">
     </cache>
-        <cache name="objectstoreid-cache"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-        </cache>
-        <cache name="context-cache"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-        </cache>
-        <cache name="context-cache-funder"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-        </cache>
-        <cache name="context-cache-community"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-        </cache>
-        <cache name="dsm-aggregationhistory-cache-v1"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-        </cache>
-        <cache name="dsm-aggregationhistory-cache-v2"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-        </cache>
-        <cache name="dsm-firstharvestdate-cache"
+    <cache name="indexdsinfo-cache"
            maxElementsInMemory="5000"
            eternal="false"
            overflowToDisk="false"
@@ -86,7 +23,7 @@
            memoryStoreEvictionPolicy="LFU"
            transactionalMode="off">
     </cache>
-        <cache name="vocabularies-cache"
+    <cache name="objectstoreid-cache"
            maxElementsInMemory="5000"
            eternal="false"
            overflowToDisk="false"
@@ -94,8 +31,8 @@
            timeToIdleSeconds="3600"
            memoryStoreEvictionPolicy="LFU"
            transactionalMode="off">
-        </cache>
-        <cache name="community-cache"
+    </cache>
+    <cache name="context-cache"
            maxElementsInMemory="5000"
            eternal="false"
            overflowToDisk="false"
@@ -103,8 +40,71 @@
            timeToIdleSeconds="3600"
            memoryStoreEvictionPolicy="LFU"
            transactionalMode="off">
-        </cache>
-        <cache name="info"
+    </cache>
+    <cache name="context-cache-funder"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+    </cache>
+    <cache name="context-cache-community"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+    </cache>
+    <cache name="dsm-aggregationhistory-cache-v1"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+    </cache>
+    <cache name="dsm-aggregationhistory-cache-v2"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+    </cache>
+    <cache name="dsm-firstharvestdate-cache"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+    </cache>
+    <cache name="vocabularies-cache"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+    </cache>
+    <cache name="community-cache"
+           maxElementsInMemory="5000"
+           eternal="false"
+           overflowToDisk="false"
+           timeToLiveSeconds="3600"
+           timeToIdleSeconds="3600"
+           memoryStoreEvictionPolicy="LFU"
+           transactionalMode="off">
+    </cache>
+    <cache name="info"
            maxElementsInMemory="5000"
            eternal="false"
            overflowToDisk="false"

From eece9b04f8570b02649d09a14f33f746959cf55b Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Thu, 5 Oct 2023 15:49:36 +0200
Subject: [PATCH 3/3] removed ehcache.xml

---
 .../src/main/resources/ehcache.xml            | 118 ------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 apps/dnet-exporter-api/src/main/resources/ehcache.xml

diff --git a/apps/dnet-exporter-api/src/main/resources/ehcache.xml b/apps/dnet-exporter-api/src/main/resources/ehcache.xml
deleted file mode 100644
index 20cc6faa..00000000
--- a/apps/dnet-exporter-api/src/main/resources/ehcache.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://www.ehcache.org/ehcache.xsd"
-         updateCheck="true"
-         monitoring="autodetect"
-         dynamicConfig="true">
-
-    <cache name="fundingpath-ids"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-    <cache name="indexdsinfo-cache"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-    <cache name="objectstoreid-cache"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-    <cache name="context-cache"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-    <cache name="context-cache-funder"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-    <cache name="context-cache-community"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-    <cache name="dsm-aggregationhistory-cache-v1"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-    <cache name="dsm-aggregationhistory-cache-v2"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-    <cache name="dsm-firstharvestdate-cache"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-    <cache name="vocabularies-cache"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-    <cache name="community-cache"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-    <cache name="info"
-           maxElementsInMemory="5000"
-           eternal="false"
-           overflowToDisk="false"
-           timeToLiveSeconds="3600"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LFU"
-           transactionalMode="off">
-    </cache>
-
-</ehcache>
-