From 62028bb5b8c9127f73694b1c7efabe5e109f3017 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Tue, 14 Jan 2025 14:22:46 +0000
Subject: Fix apex-pdp image generation

- policies generated with docker profile were missing the
--working-dir argument
- infinispan and hazelcast uplifted and  configurations fixed to
match the latest versions

Issue-ID: POLICY-5192
Change-Id: I4a47c3dbdbbc8e863abaa4097ba00ea31508ffa5
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 .../src/main/resources/hazelcast/hazelcast.xml     | 147 ++-------------------
 .../resources/infinispan/default-jgroups-tcp.xml   |  40 +++---
 .../src/main/resources/infinispan/infinispan.xml   |  18 +--
 3 files changed, 39 insertions(+), 166 deletions(-)

(limited to 'packages/apex-pdp-package-full/src/main')

diff --git a/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml b/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml
index b0847f295..e9cc99bf2 100644
--- a/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml
+++ b/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml
@@ -2,6 +2,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2016-2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -19,12 +20,9 @@
   ============LICENSE_END=========================================================
 -->
 <hazelcast xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <group>
-        <name>HazelcastGroup3.0EVAL</name>
-        <password>password3.0EVAL</password>
-    </group>
+    <cluster-name>HazelcastGroup3.0EVAL</cluster-name>
     <network>
-        <port auto-increment="true">5706</port>
+        <port>5706</port>
         <join>
             <multicast enabled="false">
                 <multicast-group>224.2.2.10</multicast-group>
@@ -35,8 +33,7 @@
                 <!-- members>192.168.219.141</members-->
             </tcp-ip>
         </join>
-        <interfaces enabled="false">
-            <!-- This value will allow hazelcast to run locally from the IDE -->
+        <interfaces>
             <interface>127.0.0.*</interface>
         </interfaces>
     </network>
@@ -51,171 +48,55 @@
     <executor-service>
         <pool-size>16</pool-size>
     </executor-service>
-    <queue name="default">
-        <!-- Maximum size of the queue. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>100000</max-size>
-        <!-- Maximum number of seconds for each item to stay in the queue. Items 
-            that are not consumed in <time-to-live-seconds> will automatically get evicted 
-            from the queue. Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. 
-            Default is 0. -->
-    </queue>
     <map name="default">
-        <!-- Number of backups. If 1 is set as the backup-count for example, then 
-            all entries of the map will be copied to another JVM for fail-safety. Valid 
-            numbers are 0 (no backup), 1, 2, 3. -->
         <backup-count>1</backup-count>
-        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-            (Least Frequiently Used). NONE is the default. -->
-        <eviction-policy>NONE</eviction-policy>
-        <!-- Maximum size of the map. When max size is reached, map is evicted 
-            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>0</max-size>
-        <!-- When max. size is reached, specified percentage of the map will be 
-            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-            the entries will get evicted. -->
-        <eviction-percentage>25</eviction-percentage>
+        <eviction eviction-policy="NONE"/>
     </map>
 
     <map name="CommonCache">
-
-
-        <!-- Number of async-backups. If 1 is set as the backup-count for example, 
-            then all entries of the map will be copied to another JVM for fail-safety. 
-            Valid numbers are 0 (no backup), 1, 2, 3. -->
         <async-backup-count>1</async-backup-count>
-
-        <!-- Can we read the local backup entries? Default value is false for strong 
-            consistency. Being able to read backup data will give you greater performance. -->
         <read-backup-data>true</read-backup-data>
-        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-            (Least Frequiently Used). NONE is the default. -->
-        <eviction-policy>LRU</eviction-policy>
-        <!-- Maximum size of the map. When max size is reached, map is evicted 
-            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>3000000</max-size>
-        <!-- When max. size is reached, specified percentage of the map will be 
-            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-            the entries will get evicted. -->
-        <eviction-percentage>5</eviction-percentage>
-
-        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
-            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means infinite. Default is 0. -->
+        <eviction eviction-policy="LRU" size="3000000"/>
         <time-to-live-seconds>7200</time-to-live-seconds>
-
-
     </map>
 
     <map name="CommonDataCache">
-
-
-        <!-- Number of async-backups. If 1 is set as the backup-count for example, 
-            then all entries of the map will be copied to another JVM for fail-safety. 
-            Valid numbers are 0 (no backup), 1, 2, 3. -->
         <async-backup-count>1</async-backup-count>
-
-        <!-- Can we read the local backup entries? Default value is false for strong 
-            consistency. Being able to read backup data will give you greater performance. -->
         <read-backup-data>true</read-backup-data>
-        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-            (Least Frequiently Used). NONE is the default. -->
-        <eviction-policy>LRU</eviction-policy>
-        <!-- Maximum size of the map. When max size is reached, map is evicted 
-            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>3000000</max-size>
-        <!-- When max. size is reached, specified percentage of the map will be 
-            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-            the entries will get evicted. -->
-        <eviction-percentage>5</eviction-percentage>
-
-        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
-            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means infinite. Default is 0. -->
+        <eviction eviction-policy="LRU" size="3000000"/>
         <time-to-live-seconds>7200</time-to-live-seconds>
-
     </map>
 
 
     <queue name="raw-distributer-queue">
-        <!-- Maximum size of the queue. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>100000</max-size>
     </queue>
-    <map name="queue-map">
 
-        <!-- Number of backups. If 1 is set as the backup-count for example, then 
-            all entries of the map will be copied to another JVM for fail-safety. Valid 
-            numbers are 0 (no backup), 1, 2, 3. -->
+    <map name="queue-map">
         <backup-count>0</backup-count>
-
     </map>
 
     <map name="TOPIC-TASK-MAP">
-
         <async-backup-count>3</async-backup-count>
-
         <read-backup-data>true</read-backup-data>
-        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-            (Least Frequiently Used). NONE is the default. -->
-        <eviction-policy>NONE</eviction-policy>
-        <!-- Maximum size of the map. When max size is reached, map is evicted 
-            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>1000</max-size>
-        <!-- When max. size is reached, specified percentage of the map will be 
-            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-            the entries will get evicted. -->
-        <eviction-percentage>0</eviction-percentage>
-
-
-
-        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
-            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means infinite. Default is 0. -->
+        <eviction eviction-policy="NONE" size="1000"/>
         <time-to-live-seconds>0</time-to-live-seconds>
     </map>
-    <map name="TOPIC-REGISTRY">
 
+    <map name="TOPIC-REGISTRY">
         <async-backup-count>3</async-backup-count>
-
         <read-backup-data>true</read-backup-data>
-        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-            (Least Frequiently Used). NONE is the default. -->
-        <eviction-policy>NONE</eviction-policy>
-        <!-- Maximum size of the map. When max size is reached, map is evicted 
-            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>1000</max-size>
-        <!-- When max. size is reached, specified percentage of the map will be 
-            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-            the entries will get evicted. -->
-        <eviction-percentage>0</eviction-percentage>
-
-        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
-            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means infinite. Default is 0. -->
+        <eviction eviction-policy="NONE" size="1000"/>
         <time-to-live-seconds>0</time-to-live-seconds>
     </map>
+
     <queue name="Pooled-Topic-Request-Queue">
-        <!-- Maximum size of the queue.Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>100000</max-size>
     </queue>
-    <map name="Pooled-Topic-Request-Queue-Backup-map">
 
-        <!-- Number of backups. If 1 is set as the backup-count for example, then 
-            all entries of the map will be copied to another JVM for fail-safety. Valid 
-            numbers are 0 (no backup), 1, 2, 3. -->
+    <map name="Pooled-Topic-Request-Queue-Backup-map">
         <backup-count>1</backup-count>
-        <eviction-policy>NONE</eviction-policy>
+        <eviction eviction-policy="NONE"/>
         <time-to-live-seconds>0</time-to-live-seconds>
     </map>
 
diff --git a/packages/apex-pdp-package-full/src/main/resources/infinispan/default-jgroups-tcp.xml b/packages/apex-pdp-package-full/src/main/resources/infinispan/default-jgroups-tcp.xml
index 028cf1df6..11658990a 100644
--- a/packages/apex-pdp-package-full/src/main/resources/infinispan/default-jgroups-tcp.xml
+++ b/packages/apex-pdp-package-full/src/main/resources/infinispan/default-jgroups-tcp.xml
@@ -2,6 +2,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2016-2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -21,7 +22,8 @@
 
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.0.xsd">
+        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.3.xsd">
+
    <TCP bind_addr="${jgroups.tcp.address:127.0.0.1}"
         bind_port="${jgroups.tcp.port:7800}"
         enable_diagnostics="false"
@@ -29,48 +31,36 @@
         send_buf_size="640k"
         sock_conn_timeout="300"
         bundler_type="no-bundler"
-
         thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
         thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
-        thread_pool.keep_alive_time="60000"
-   />
+        thread_pool.keep_alive_time="60000" />
+
    <MPING bind_addr="${jgroups.tcp.address:127.0.0.1}"
           mcast_addr="${jgroups.mping.mcast_addr:228.2.4.6}"
           mcast_port="${jgroups.mping.mcast_port:43366}"
-          ip_ttl="${jgroups.udp.ip_ttl:2}" 
-   />
-   <MERGE3 min_interval="10000" 
-           max_interval="30000" 
-   />
+          ip_ttl="${jgroups.udp.ip_ttl:2}" />
+
+   <MERGE3 min_interval="10000" max_interval="30000" />
    <FD_SOCK />
-   <FD_ALL timeout="60000" 
-           interval="15000" 
-           timeout_check_interval="5000" 
-   />
+   <FD_ALL timeout="60000" interval="15000" timeout_check_interval="5000" />
    <VERIFY_SUSPECT timeout="5000" />
    <pbcast.NAKACK2 use_mcast_xmit="false"
                    xmit_interval="100"
                    xmit_table_num_rows="50"
                    xmit_table_msgs_per_row="1024"
                    xmit_table_max_compaction_time="30000"
-                   resend_last_seqno="true"
-   />
+                   resend_last_seqno="true" />
    <UNICAST3 xmit_interval="100"
              xmit_table_num_rows="50"
              xmit_table_msgs_per_row="1024"
              xmit_table_max_compaction_time="30000"
-             conn_expiry_timeout="0"
-   />
+             conn_expiry_timeout="0" />
    <pbcast.STABLE stability_delay="500"
                   desired_avg_gossip="5000"
-                  max_bytes="1M"
-   />
+                  max_bytes="1M" />
    <pbcast.GMS print_local_addr="false"
                install_view_locally_first="true"
-               join_timeout="${jgroups.join_timeout:5000}"
-   />
-   <MFC max_credits="2m" 
-        min_threshold="0.40"
-   />
-   <FRAG3/>
+               join_timeout="${jgroups.join_timeout:5000}" />
+   <MFC max_credits="2m" min_threshold="0.40" />
+   <FRAG3 />
 </config>
diff --git a/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml b/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml
index 5b416f50d..da85f787e 100644
--- a/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml
+++ b/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml
@@ -2,6 +2,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2016-2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -19,23 +20,24 @@
   ============LICENSE_END=========================================================
 -->
 
-<infinispan xmlns="urn:infinispan:config:8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="urn:infinispan:config:8.0 http://infinispan.org/schemas/infinispan-config-8.0.xsd">
+<infinispan xmlns="urn:infinispan:config:14.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:infinispan:config:14.0 https://infinispan.org/schemas/infinispan-config-14.0.xsd">
+
     <jgroups>
-        <stack-file name="external-file" path="infinispan/default-jgroups-tcp.xml" />
+        <stack-file name="external-file" path="infinispan/default-jgroups-tcp.xml"/>
     </jgroups>
 
     <cache-container name="ApexCacheContainer" default-cache="TestContext_0.0.1">
-        <transport cluster="apexCluster" stack="external-file" />
-        <jmx />
+        <transport cluster="apexCluster" stack="external-file"/>
+        <jmx enabled="true"/>
         <replicated-cache name="LargeContextMap_0.0.1" mode="SYNC" statistics="true">
-            <state-transfer enabled="true" />
+            <state-transfer enabled="true"/>
         </replicated-cache>
         <replicated-cache name="LongSameTypeContextMap_0.0.1" mode="SYNC" statistics="true">
-            <state-transfer enabled="true" />
+            <state-transfer enabled="true"/>
         </replicated-cache>
         <replicated-cache name="TestContext_0.0.1" mode="SYNC">
-            <state-transfer enabled="true" />
+            <state-transfer enabled="true"/>
         </replicated-cache>
     </cache-container>
 </infinispan>
-- 
cgit 1.2.3-korg