From 5c94abbb40be6b7caac8822b1f22aa263e3fc242 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@exoplatform.com>
Date: Mon, 13 May 2024 13:34:49 +0100
Subject: [PATCH] feat: stabilize Database Initialization - MEED-6794 -
 Meeds-io/MIPs#132 Prior to this change, Portal database changelogs are
 processed late in the startup using PortalCotnainer. This change makes sure
 to initialize the database using RootContainer to make sure that the Database
 initialization is made before any other service startup.

---
 .../src/main/resources/conf/configuration.xml | 13 +++-
 .../src/main/resources/conf/configuration.xml | 59 ++++++++++++++++
 .../src/main/resources/conf/configuration.xml | 42 ++++++++++++
 .../src/main/resources/conf/configuration.xml | 43 +++++++++++-
 .../WEB-INF/conf/jdbc/configuration.xml       | 68 -------------------
 5 files changed, 153 insertions(+), 72 deletions(-)
 create mode 100644 component/identity/src/main/resources/conf/configuration.xml
 create mode 100644 component/portal/src/main/resources/conf/configuration.xml

diff --git a/component/common/src/main/resources/conf/configuration.xml b/component/common/src/main/resources/conf/configuration.xml
index 924ff7356d..20b21c4a46 100644
--- a/component/common/src/main/resources/conf/configuration.xml
+++ b/component/common/src/main/resources/conf/configuration.xml
@@ -78,6 +78,17 @@
         </values-param>
       </init-params>
     </component-plugin>
+    <component-plugin>
+      <name>SettingsChangeLogsPlugin</name>
+      <set-method>addChangeLogsPlugin</set-method>
+      <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
+      <init-params>
+        <values-param>
+          <name>changelogs</name>
+          <description>Change logs of settings</description>
+          <value>db/changelog/settings.db.changelog-1.0.0.xml</value>
+        </values-param>
+      </init-params>
+    </component-plugin>
   </external-component-plugins>
-
 </configuration>
diff --git a/component/identity/src/main/resources/conf/configuration.xml b/component/identity/src/main/resources/conf/configuration.xml
new file mode 100644
index 0000000000..791b0607ec
--- /dev/null
+++ b/component/identity/src/main/resources/conf/configuration.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 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.commons.api.persistence.DataInitializer</target-component>
+    <component-plugin>
+      <name>IDMChangeLogsPlugin</name>
+      <set-method>addChangeLogsPlugin</set-method>
+      <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
+      <init-params>
+        <values-param>
+          <name>changelogs</name>
+          <description>Change logs of idm queue</description>
+          <value>db/changelog/idm.queue.db.changelog-1.0.0.xml</value>
+        </values-param>
+      </init-params>
+    </component-plugin>
+    <component-plugin>
+      <name>IDMChangeLogsPlugin</name>
+      <set-method>addChangeLogsPlugin</set-method>
+      <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
+      <init-params>
+        <value-param>
+          <name>datasource</name>
+          <description>Change logs of IDM database</description>
+          <value>${exo.idm.datasource.name:java:/comp/env/exo-idm_portal}</value>
+        </value-param>
+        <values-param>
+          <name>changelogs</name>
+          <description>Change logs of IDM database</description>
+          <value>db/changelog/idm.db.changelog-1.0.0.xml</value>
+        </values-param>
+      </init-params>
+    </component-plugin>
+  </external-component-plugins>
+</configuration>
diff --git a/component/portal/src/main/resources/conf/configuration.xml b/component/portal/src/main/resources/conf/configuration.xml
new file mode 100644
index 0000000000..a60d4dd1a8
--- /dev/null
+++ b/component/portal/src/main/resources/conf/configuration.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 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.commons.api.persistence.DataInitializer</target-component>
+    <component-plugin>
+      <name>PortalRDBMSChangeLogsPlugin</name>
+      <set-method>addChangeLogsPlugin</set-method>
+      <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
+      <init-params>
+        <values-param>
+          <name>changelogs</name>
+          <description>Change logs of Portal RDBMS</description>
+          <value>db/changelog/portal-rdbms.db.changelog-1.0.0.xml</value>
+        </values-param>
+      </init-params>
+    </component-plugin>
+  </external-component-plugins>
+</configuration>
diff --git a/component/web/security/src/main/resources/conf/configuration.xml b/component/web/security/src/main/resources/conf/configuration.xml
index cc701cebc5..80e2e14351 100644
--- a/component/web/security/src/main/resources/conf/configuration.xml
+++ b/component/web/security/src/main/resources/conf/configuration.xml
@@ -1,7 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 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">
+  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">
 
   <!-- SecureRandomService configured at RootContainer scope to be initialized just once per JVM -->
   <component>
@@ -9,4 +31,19 @@
     <type>org.exoplatform.web.security.security.SecureRandomService</type>
   </component>
 
+  <external-component-plugins>
+    <target-component>org.exoplatform.commons.api.persistence.DataInitializer</target-component>
+    <component-plugin>
+      <name>PortalRDBMSChangeLogsPlugin</name>
+      <set-method>addChangeLogsPlugin</set-method>
+      <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
+      <init-params>
+        <values-param>
+          <name>changelogs</name>
+          <description>Change logs of Portal RDBMS</description>
+          <value>db/changelog/gatein-token.db.changelog-1.0.0.xml</value>
+        </values-param>
+      </init-params>
+    </component-plugin>
+  </external-component-plugins>
 </configuration>
diff --git a/web/portal/src/main/webapp/WEB-INF/conf/jdbc/configuration.xml b/web/portal/src/main/webapp/WEB-INF/conf/jdbc/configuration.xml
index 9341b112b3..c2dc6672e7 100644
--- a/web/portal/src/main/webapp/WEB-INF/conf/jdbc/configuration.xml
+++ b/web/portal/src/main/webapp/WEB-INF/conf/jdbc/configuration.xml
@@ -149,74 +149,6 @@
     <key>org.exoplatform.portal.mop.service.DescriptionService</key>
     <type>org.exoplatform.portal.mop.service.DescriptionServiceImpl</type>
   </component>
-   <external-component-plugins>
-    <target-component>org.exoplatform.commons.api.persistence.DataInitializer</target-component>
-    <component-plugin>
-      <name>PortalRDBMSChangeLogsPlugin</name>
-      <set-method>addChangeLogsPlugin</set-method>
-      <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
-      <init-params>
-        <values-param>
-          <name>changelogs</name>
-          <description>Change logs of Portal RDBMS</description>
-          <value>db/changelog/portal-rdbms.db.changelog-1.0.0.xml</value>
-        </values-param>
-      </init-params>
-    </component-plugin>
-    <component-plugin>
-      <name>IDMQueueChangeLogsPlugin</name>
-      <set-method>addChangeLogsPlugin</set-method>
-      <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
-      <init-params>
-        <values-param>
-          <name>changelogs</name>
-          <description>Change logs of idm queue</description>
-          <value>db/changelog/idm.queue.db.changelog-1.0.0.xml</value>
-        </values-param>
-      </init-params>
-    </component-plugin>
-    <component-plugin>
-      <name>IDMChangeLogsPlugin</name>
-      <set-method>addChangeLogsPlugin</set-method>
-      <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
-      <init-params>
-        <value-param>
-          <name>datasource</name>
-          <description>Change logs of IDM database</description>
-          <value>${exo.idm.datasource.name:java:/comp/env/exo-idm_portal}</value>
-        </value-param>
-        <values-param>
-          <name>changelogs</name>
-          <description>Change logs of idm queue</description>
-          <value>db/changelog/idm.db.changelog-1.0.0.xml</value>
-        </values-param>
-      </init-params>
-    </component-plugin>
-    <component-plugin>
-      <name>PortalRDBMSChangeLogsPlugin</name>
-      <set-method>addChangeLogsPlugin</set-method>
-      <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
-      <init-params>
-        <values-param>
-          <name>changelogs</name>
-          <description>Change logs of Portal RDBMS</description>
-          <value>db/changelog/gatein-token.db.changelog-1.0.0.xml</value>
-        </values-param>
-      </init-params>
-    </component-plugin>
-    <component-plugin>
-      <name>SettingsChangeLogsPlugin</name>
-      <set-method>addChangeLogsPlugin</set-method>
-      <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
-      <init-params>
-        <values-param>
-          <name>changelogs</name>
-          <description>Change logs of settings</description>
-          <value>db/changelog/settings.db.changelog-1.0.0.xml</value>
-        </values-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
 
   <external-component-plugins>
     <target-component>org.exoplatform.services.listener.ListenerService</target-component>