From 270d608345b93fce4b7de443e18929c727cad998 Mon Sep 17 00:00:00 2001
From: Radoslav Husar <radosoft@gmail.com>
Date: Thu, 6 Jun 2024 16:45:49 +0200
Subject: [PATCH 1/4] Language fixes in clustering module.yaml.

---
 .../galleon/cloud-galleon-pack/layers/clustering/module.yaml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/module.yaml b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/module.yaml
index a93534d7..5c670677 100644
--- a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/module.yaml
+++ b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/module.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 name: jboss.container.wildfly.galleon.cloud-galleon-pack.layers.clustering
 version: '1.0'
-description: Adjustement for Galleon layers that depends on infinispan and groups.
+description: Adjustment for Galleon layers that depend on Infinispan and JGroups.
 
 execute:
 - script: configure.sh

From b0277a41cad32c3c7122ce91f2cb188dff8a8bf7 Mon Sep 17 00:00:00 2001
From: Radoslav Husar <radosoft@gmail.com>
Date: Thu, 6 Jun 2024 16:47:19 +0200
Subject: [PATCH 2/4] CLOUD-4211 Cloud clustering profiles should configure a
 distributed cache instead of a replicated one - introduce 'sessions' cache to
 contain HTTP session data.

---
 .../feature_groups/os-infinispan-dist-web.xml |  2 +-
 .../os-infinispan-web-repl-cache.xml          | 24 -------------------
 .../os-infinispan-web-sessions-cache.xml      | 15 ++++++++++++
 .../standalone/web-clustering/layer-spec.xml  |  2 +-
 .../feature_groups/os-infinispan-dist-web.xml |  2 +-
 .../os-infinispan-web-dist-cache.xml          | 15 ++++++++++++
 .../os-infinispan-web-repl-cache.xml          | 24 -------------------
 .../standalone/web-clustering/layer-spec.xml  |  2 +-
 8 files changed, 34 insertions(+), 52 deletions(-)
 delete mode 100644 jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
 create mode 100644 jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-sessions-cache.xml
 create mode 100644 jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml
 delete mode 100644 jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml

diff --git a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
index 8f792b09..79b5cffe 100644
--- a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
+++ b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature-group-spec name="os-infinispan-dist-web" xmlns="urn:jboss:galleon:feature-group:1.0">
     <feature-group name="infinispan-dist-web"/>
-    <feature-group name="os-infinispan-web-repl-cache"/>
+    <feature-group name="os-infinispan-web-sessions-cache"/>
 </feature-group-spec>
diff --git a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
deleted file mode 100644
index 049c884e..00000000
--- a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature-group-spec name="os-infinispan-web-repl-cache" xmlns="urn:jboss:galleon:feature-group:1.0">
-    <feature spec="subsystem.infinispan">
-        <feature spec="subsystem.infinispan.cache-container">
-            <param name="cache-container" value="web"/>
-            <param name="default-cache" value="repl"/>
-            <feature spec="subsystem.infinispan.cache-container.replicated-cache">
-                <param name="replicated-cache" value="repl"/>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.locking">
-                    <param name="isolation" value="REPEATABLE_READ"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.transaction">
-                    <param name="mode" value="BATCH"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.expiration">
-                    <param name="interval" value="0"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.store.file">
-                    <unset param="relative-to"/>
-                </feature>
-            </feature>
-        </feature>
-    </feature>
-</feature-group-spec>
diff --git a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-sessions-cache.xml b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-sessions-cache.xml
new file mode 100644
index 00000000..80083a03
--- /dev/null
+++ b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan-web-sessions-cache.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature-group-spec name="os-infinispan-web-sessions-cache" xmlns="urn:jboss:galleon:feature-group:1.0">
+    <feature spec="subsystem.infinispan">
+        <feature spec="subsystem.infinispan.cache-container">
+            <param name="cache-container" value="web"/>
+            <param name="default-cache" value="sessions"/>
+            <feature spec="subsystem.infinispan.cache-container.distributed-cache">
+                <param name="distributed-cache" value="sessions"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
+            </feature>
+        </feature>
+    </feature>
+</feature-group-spec>
diff --git a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
index af4e8fe5..f0c122bb 100644
--- a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
+++ b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
@@ -13,5 +13,5 @@
     <exclude feature-id="subsystem.jgroups.stack.protocol:stack=udp,protocol=PING"/>
     <exclude feature-id="subsystem.jgroups.stack.protocol.MPING:stack=tcp"/>
 
-    <feature-group name="os-infinispan-web-repl-cache"/>
+    <feature-group name="os-infinispan-web-sessions-cache"/>
 </layer-spec>
\ No newline at end of file
diff --git a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
index 8f792b09..79b5cffe 100644
--- a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
+++ b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-dist-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature-group-spec name="os-infinispan-dist-web" xmlns="urn:jboss:galleon:feature-group:1.0">
     <feature-group name="infinispan-dist-web"/>
-    <feature-group name="os-infinispan-web-repl-cache"/>
+    <feature-group name="os-infinispan-web-sessions-cache"/>
 </feature-group-spec>
diff --git a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml
new file mode 100644
index 00000000..80083a03
--- /dev/null
+++ b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-dist-cache.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature-group-spec name="os-infinispan-web-sessions-cache" xmlns="urn:jboss:galleon:feature-group:1.0">
+    <feature spec="subsystem.infinispan">
+        <feature spec="subsystem.infinispan.cache-container">
+            <param name="cache-container" value="web"/>
+            <param name="default-cache" value="sessions"/>
+            <feature spec="subsystem.infinispan.cache-container.distributed-cache">
+                <param name="distributed-cache" value="sessions"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.expiration">
+                    <param name="interval" value="0"/>
+                </feature>
+            </feature>
+        </feature>
+    </feature>
+</feature-group-spec>
diff --git a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
deleted file mode 100644
index 049c884e..00000000
--- a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan-web-repl-cache.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature-group-spec name="os-infinispan-web-repl-cache" xmlns="urn:jboss:galleon:feature-group:1.0">
-    <feature spec="subsystem.infinispan">
-        <feature spec="subsystem.infinispan.cache-container">
-            <param name="cache-container" value="web"/>
-            <param name="default-cache" value="repl"/>
-            <feature spec="subsystem.infinispan.cache-container.replicated-cache">
-                <param name="replicated-cache" value="repl"/>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.locking">
-                    <param name="isolation" value="REPEATABLE_READ"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.transaction">
-                    <param name="mode" value="BATCH"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.expiration">
-                    <param name="interval" value="0"/>
-                </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.store.file">
-                    <unset param="relative-to"/>
-                </feature>
-            </feature>
-        </feature>
-    </feature>
-</feature-group-spec>
diff --git a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
index fda54dd4..ded0404f 100644
--- a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
+++ b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/layers/standalone/web-clustering/layer-spec.xml
@@ -21,5 +21,5 @@
     <exclude feature-id="socket-binding-group.socket-binding:socket-binding-group=standard-sockets,socket-binding=jgroups-udp-fd"/>
     <exclude feature-id="socket-binding-group.socket-binding:socket-binding-group=standard-sockets,socket-binding=jgroups-tcp-fd"/>
 
-    <feature-group name="os-infinispan-web-repl-cache"/>
+    <feature-group name="os-infinispan-web-sessions-cache"/>
 </layer-spec>
\ No newline at end of file

From bda286c3b338db44fd48af1777a08e267adb1a26 Mon Sep 17 00:00:00 2001
From: Radoslav Husar <radosoft@gmail.com>
Date: Thu, 6 Jun 2024 16:58:35 +0200
Subject: [PATCH 3/4] CLOUD-4211 Cloud clustering profiles should configure a
 distributed cache instead of a replicated one - introduce 'beans' cache to
 contain SFSB session data.

---
 .../feature_groups/os-infinispan.xml          | 19 ++++++++++---------
 .../feature_groups/os-infinispan.xml          | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan.xml b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan.xml
index 2c375c55..872bcb9a 100644
--- a/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan.xml
+++ b/jboss/container/wildfly/galleon/cloud-galleon-pack/layers/clustering/added/src/main/resources/feature_groups/os-infinispan.xml
@@ -5,23 +5,24 @@
 
     <feature-group name="infinispan-dist-ejb">
         <include feature-id="subsystem.infinispan.cache-container:cache-container=ejb">
-            <param name="default-cache" value="repl"/>
-            <feature spec="subsystem.infinispan.cache-container.replicated-cache">
-                <param name="replicated-cache" value="repl"/>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.memory.heap">
+            <param name="default-cache" value="beans"/>
+            <feature spec="subsystem.infinispan.cache-container.distributed-cache">
+                <param name="distributed-cache" value="beans"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.memory.heap">
                     <param name="size" value="10000"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.locking">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.locking">
                     <param name="isolation" value="REPEATABLE_READ"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.transaction">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.transaction">
                     <param name="mode" value="BATCH"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.expiration">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.expiration">
                     <param name="interval" value="0"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.store.file">
-                    <unset param="relative-to"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.store.file">
+                    <param name="passivation" value="true"/>
+                    <param name="purge" value="true"/>
                 </feature>
             </feature>
         </include>
diff --git a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan.xml b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan.xml
index 2c375c55..872bcb9a 100644
--- a/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan.xml
+++ b/jboss/container/wildfly/galleon/fp-content/config/added/src/main/resources/feature_groups/os-infinispan.xml
@@ -5,23 +5,24 @@
 
     <feature-group name="infinispan-dist-ejb">
         <include feature-id="subsystem.infinispan.cache-container:cache-container=ejb">
-            <param name="default-cache" value="repl"/>
-            <feature spec="subsystem.infinispan.cache-container.replicated-cache">
-                <param name="replicated-cache" value="repl"/>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.memory.heap">
+            <param name="default-cache" value="beans"/>
+            <feature spec="subsystem.infinispan.cache-container.distributed-cache">
+                <param name="distributed-cache" value="beans"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.memory.heap">
                     <param name="size" value="10000"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.locking">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.locking">
                     <param name="isolation" value="REPEATABLE_READ"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.transaction">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.transaction">
                     <param name="mode" value="BATCH"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.component.expiration">
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.component.expiration">
                     <param name="interval" value="0"/>
                 </feature>
-                <feature spec="subsystem.infinispan.cache-container.replicated-cache.store.file">
-                    <unset param="relative-to"/>
+                <feature spec="subsystem.infinispan.cache-container.distributed-cache.store.file">
+                    <param name="passivation" value="true"/>
+                    <param name="purge" value="true"/>
                 </feature>
             </feature>
         </include>

From fb86b5f625fb380f3516c479b27edef0d05b78e6 Mon Sep 17 00:00:00 2001
From: Radoslav Husar <radosoft@gmail.com>
Date: Mon, 10 Jun 2024 11:33:24 +0200
Subject: [PATCH 4/4] CI: add correct Maven options for automated runs to make
 logs readable.

---
 .github/workflows/test-wildfly-cloud-fp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-wildfly-cloud-fp.yml b/.github/workflows/test-wildfly-cloud-fp.yml
index 531ed198..2a9cd573 100644
--- a/.github/workflows/test-wildfly-cloud-fp.yml
+++ b/.github/workflows/test-wildfly-cloud-fp.yml
@@ -63,7 +63,7 @@ jobs:
         if: env.IMPACT_CLOUD_FP == 'true'
         run: |
           echo Using "${FORK_REPO%%/*}" and "${GITHUB_HEAD_REF##*/}" to build cloud feature-pack
-          mvn clean install -DskipTests -Dwildfly.cekit.modules.fork="${FORK_REPO%%/*}" -Dwildfly.cekit.modules.tag="${GITHUB_HEAD_REF##*/}"
+          mvn clean install --batch-mode --no-transfer-progress -DskipTests -Dwildfly.cekit.modules.fork="${FORK_REPO%%/*}" -Dwildfly.cekit.modules.tag="${GITHUB_HEAD_REF##*/}"
           cloudVersion=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo "CLOUD_FP_VERSION=${cloudVersion}" >> $GITHUB_ENV
           mkdir -p custom-cloud-image