Skip to content

Commit

Permalink
feat: stabilize Database Initialization - MEED-6794 - Meeds-io/MIPs#132
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
boubaker committed May 13, 2024
1 parent e0459d6 commit 6dea843
Show file tree
Hide file tree
Showing 5 changed files with 153 additions and 72 deletions.
13 changes: 12 additions & 1 deletion component/common/src/main/resources/conf/configuration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
59 changes: 59 additions & 0 deletions component/identity/src/main/resources/conf/configuration.xml
Original file line number Diff line number Diff line change
@@ -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 [email protected]
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>
42 changes: 42 additions & 0 deletions component/portal/src/main/resources/conf/configuration.xml
Original file line number Diff line number Diff line change
@@ -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 [email protected]
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>
43 changes: 40 additions & 3 deletions component/web/security/src/main/resources/conf/configuration.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This file is part of the Meeds project (https://meeds.io/).
Copyright (C) 2020 - 2024 Meeds Association [email protected]
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>
<key>org.exoplatform.web.security.security.SecureRandomService</key>
<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>
68 changes: 0 additions & 68 deletions web/portal/src/main/webapp/WEB-INF/conf/jdbc/configuration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 6dea843

Please sign in to comment.