From 3b2f11fb28d7f3de6f27d1c3ab59d5f6a16303b4 Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Tue, 24 Sep 2024 14:14:46 +0200
Subject: [PATCH] [EDELIVERY-13818] fix locale configuration for docker to be
inside smo folder for dockers
---
.../images/domismp-springboot-mysql/entrypoint.sh | 3 ++-
.../images/domismp-tomcat-mysql/entrypoint.sh | 4 ++--
.../properties/init/smp.config.properties | 1 +
.../properties/init/smp.config.properties | 1 +
smp-angular/src/assets/i18n/en.json | 2 +-
smp-webapp/src/main/smp-setup/smp.config.properties | 9 ++++++---
6 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/domismp-tests/domismp-docker/images/domismp-springboot-mysql/entrypoint.sh b/domismp-tests/domismp-docker/images/domismp-springboot-mysql/entrypoint.sh
index 12d419efb..e76c5fad5 100755
--- a/domismp-tests/domismp-docker/images/domismp-springboot-mysql/entrypoint.sh
+++ b/domismp-tests/domismp-docker/images/domismp-springboot-mysql/entrypoint.sh
@@ -108,6 +108,7 @@ init_smp() {
# set smp data/security folder
mkdir -p "${SMP_HOME}/smp/"
mkdir -p "${SMP_HOME}/smp-libs"
+ mkdir -p ${DATA_DIR}/smp/locales
# copy smp keystore with sml authorized sml certificates
cp /tmp/artefacts/shared-artefacts/smp-logback.xml "${SMP_HOME}/logback.xml"
cp "/tmp/artefacts/shared-artefacts/smp-keystore-docker-demo.p12" "${SMP_HOME}/smp/smp-keystore-docker-demo.p12"
@@ -127,7 +128,7 @@ init_smp_properties() {
echo "# SMP init parameters"
echo "smp.security.folder=${SMP_HOME}/smp/"
echo "smp.libraries.folder=${SMP_HOME}/smp-libs"
- echo "smp.locale.folder=${SMP_HOME}/locales"
+ echo "smp.locale.folder=${SMP_HOME}/smp/locales"
echo "smp.automation.authentication.external.tls.clientCert.enabled=true"
echo "bdmsl.integration.enabled=false"
echo "bdmsl.participant.multidomain.enabled=false"
diff --git a/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/entrypoint.sh b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/entrypoint.sh
index 6f845c82d..871eb8793 100755
--- a/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/entrypoint.sh
+++ b/domismp-tests/domismp-docker/images/domismp-tomcat-mysql/entrypoint.sh
@@ -85,7 +85,7 @@ init_tomcat() {
rm -rf ${TOMCAT_HOME}/classes
ln -sf ${TOMCAT_DIR}/classes ${TOMCAT_HOME}/
# set smp data/security folder
- mkdir ${DATA_DIR}/smp/
+ mkdir -p ${DATA_DIR}/smp/locales
# sleep a little to avoid mv issues
sleep 5s
@@ -243,7 +243,7 @@ init_smp_properties() {
echo "# SMP init parameters"
echo "smp.security.folder=${DATA_DIR}/smp/"
echo "smp.libraries.folder=$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp-libs"
- echo "smp.locale.folder=$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/locales"
+ echo "smp.locale.folder=$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp/locales"
echo "bdmsl.integration.logical.address=${SMP_LOGICAL_ADDRESS:-http://localhost:8080/smp/}"
echo "smp.automation.authentication.external.tls.clientCert.enabled=true"
echo "bdmsl.integration.enabled=true"
diff --git a/domismp-tests/domismp-docker/images/domismp-weblogic122/properties/init/smp.config.properties b/domismp-tests/domismp-docker/images/domismp-weblogic122/properties/init/smp.config.properties
index beec0400e..364a4ae89 100644
--- a/domismp-tests/domismp-docker/images/domismp-weblogic122/properties/init/smp.config.properties
+++ b/domismp-tests/domismp-docker/images/domismp-weblogic122/properties/init/smp.config.properties
@@ -1,5 +1,6 @@
smp.security.folder=/data/smp/security
+smp.locale.folder=/data/smp/locales
smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
smp.datasource.jndi=jdbc/eDeliverySmpDs
smp.automation.authentication.external.tls.clientCert.enabled=true
diff --git a/domismp-tests/domismp-docker/images/domismp-weblogic141/properties/init/smp.config.properties b/domismp-tests/domismp-docker/images/domismp-weblogic141/properties/init/smp.config.properties
index 78599b119..00f93a596 100644
--- a/domismp-tests/domismp-docker/images/domismp-weblogic141/properties/init/smp.config.properties
+++ b/domismp-tests/domismp-docker/images/domismp-weblogic141/properties/init/smp.config.properties
@@ -1,5 +1,6 @@
smp.security.folder=/data/smp/security
+smp.locale.folder=/data/smp/locales
smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
smp.datasource.jndi=jdbc/eDeliverySmpDs
smp.automation.authentication.external.tls.clientCert.enabled=true
diff --git a/smp-angular/src/assets/i18n/en.json b/smp-angular/src/assets/i18n/en.json
index 024510500..9a3820ccc 100644
--- a/smp-angular/src/assets/i18n/en.json
+++ b/smp-angular/src/assets/i18n/en.json
@@ -93,7 +93,7 @@
"session.expiration.dialog.button.logout": "Logout",
"session.expiration.dialog.title": "Extend session",
"session.expiration.dialog.label.session.about.to.expire": "Your session is about to expire in <b>{{timeLeft}}</b> seconds!<br />Would you like to logout now or extend it<br /> for another <b>{{timeoutMinutes}}</b> minute(s) and <b>{{timeoutSeconds}}</b> second(s)?",
- "session.alert.message.logout.expired": "Your session has expired, and you have been logged out",
+ "session.alert.message.logout.expired": "Your session has expired, and you have been logged out.",
"alert.panel.title": "Alerts",
"alert.panel.user.title": "{{value}} (Email: '{{mailTo}}')",
"certificate.panel.title": "Selected certificate data",
diff --git a/smp-webapp/src/main/smp-setup/smp.config.properties b/smp-webapp/src/main/smp-setup/smp.config.properties
index 356e5937b..29e87fa26 100644
--- a/smp-webapp/src/main/smp-setup/smp.config.properties
+++ b/smp-webapp/src/main/smp-setup/smp.config.properties
@@ -62,8 +62,11 @@ smp.jdbc.password=secret123
# Extension folder
# *********************************
# path where SMP extensions are located. The Folder is loaded by the SMP classloader at startup.
-# smp.libraries.folder=/cef/test/smp/apache-tomcat-8.5.73/smp/ext-lib
-
-
+# smp.libraries.folder=/data/smp/ext-lib
+# *********************************
+# Locale folder
+# *********************************
+# The locale folder contains the translations for the SMP web application.
+# smp.libraries.folder=/data/smp/locales
--
GitLab