From 78c96d43515f637218f0871953dd211f7b3de68b Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 10 Apr 2019 16:44:52 +0200 Subject: [PATCH] [Fix] Fixed parsing and formatting of Locale --- .../query/enums/DefaultEnumHandler.java | 21 ++++++++++++------- .../runtime/query/enums/StrolchEnum.java | 2 +- .../runtime/query/enums/EnumHandlerTest.java | 4 ++-- .../emptytest/config/PrivilegeUsers.xml | 2 +- .../minimaltest/config/PrivilegeUsers.xml | 2 +- .../realmtest/config/PrivilegeUsers.xml | 2 +- .../transienttest/config/PrivilegeUsers.xml | 2 +- .../versioningtest/config/PrivilegeUsers.xml | 2 +- .../config/PrivilegeUsers.xml | 4 ++-- .../config/PrivilegeUsers.xml | 4 ++-- .../config/PrivilegeUsers.xml | 4 ++-- .../config/PrivilegeUsers.xml | 2 +- .../src/runtime_xml/config/PrivilegeUsers.xml | 2 +- .../config/PrivilegeUsers.xml | 2 +- .../config/PrivilegeUsers.xml | 2 +- .../cachedRuntime/config/PrivilegeUsers.xml | 2 +- .../config/PrivilegeUsers.xml | 2 +- .../realmtest/config/PrivilegeUsers.xml | 2 +- .../cachedRuntime/config/PrivilegeUsers.xml | 2 +- .../config/PrivilegeUsers.xml | 2 +- .../xml/CertificateStubsDomWriter.java | 2 +- .../xml/PrivilegeUsersDomWriter.java | 2 +- .../xml/PrivilegeUsersSaxReader.java | 4 ++-- .../li/strolch/privilege/test/XmlTest.java | 4 ++-- .../test/resources/config/PrivilegeUsers.xml | 8 +++---- .../resources/config/PrivilegeUsersMerge.xml | 4 ++-- .../config/PrivilegeUsers.xml | 8 +++---- .../executiontest/config/PrivilegeUsers.xml | 2 +- .../migrationstest/config/PrivilegeUsers.xml | 2 +- .../reporttest/config/PrivilegeUsers.xml | 2 +- .../svctest/config/PrivilegeUsers.xml | 4 ++-- .../transienttest/config/PrivilegeUsers.xml | 2 +- .../config/PrivilegeUsers.xml | 8 +++---- .../li/strolch/utils/helper/StringHelper.java | 2 ++ .../documentation-privileges.html | 2 +- .../tutorial-configuration.html | 4 ++-- .../webapp/WEB-INF/config/PrivilegeUsers.xml | 2 +- 37 files changed, 68 insertions(+), 61 deletions(-) diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java b/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java index ccc76c09b..3069277bc 100644 --- a/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java +++ b/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java @@ -16,7 +16,8 @@ package li.strolch.runtime.query.enums; import static li.strolch.model.StrolchModelConstants.TYPE_ENUMERATION; -import static li.strolch.utils.helper.StringHelper.UNDERLINE; +import static li.strolch.utils.helper.StringHelper.DASH; +import static li.strolch.utils.helper.StringHelper.isNotEmpty; import java.text.MessageFormat; import java.util.HashMap; @@ -66,15 +67,19 @@ public class DefaultEnumHandler extends StrolchComponent implements EnumHandler private ParameterBag findParameterBagByLanguage(Resource enumeration, Locale locale) { - String localeS = locale.getLanguage() + UNDERLINE + locale.getCountry() + UNDERLINE + locale.getVariant(); - if (enumeration.hasParameterBag(localeS)) - return enumeration.getParameterBag(localeS); + if (isNotEmpty(locale.getVariant())) { + String localeS = locale.getLanguage() + DASH + locale.getCountry() + DASH + locale.getVariant(); + if (enumeration.hasParameterBag(localeS)) + return enumeration.getParameterBag(localeS); + } - localeS = locale.getLanguage() + UNDERLINE + locale.getCountry(); - if (enumeration.hasParameterBag(localeS)) - return enumeration.getParameterBag(localeS); + if (isNotEmpty(locale.getCountry())) { + String localeS = locale.getLanguage() + DASH + locale.getCountry(); + if (enumeration.hasParameterBag(localeS)) + return enumeration.getParameterBag(localeS); + } - localeS = locale.getLanguage(); + String localeS = locale.getLanguage(); if (enumeration.hasParameterBag(localeS)) return enumeration.getParameterBag(localeS); diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/StrolchEnum.java b/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/StrolchEnum.java index 23aa45d6e..4cc3e1d40 100644 --- a/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/StrolchEnum.java +++ b/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/StrolchEnum.java @@ -37,7 +37,7 @@ public class StrolchEnum { public StrolchEnum(String name, Locale locale, Map values) { this.name = name; - this.locale = locale.toString(); + this.locale = locale.toLanguageTag(); this.localeL = locale; this.values = values; } diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java b/li.strolch.agent/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java index 9d76239c5..b5a0b23e7 100644 --- a/li.strolch.agent/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java +++ b/li.strolch.agent/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java @@ -51,13 +51,13 @@ public class EnumHandlerTest { StrolchEnum salutationsEnum = enumHandler.getEnum(certificate, "salutations", Locale.UK); assertEquals("salutations", salutationsEnum.getName()); - assertEquals("en_GB", salutationsEnum.getLocale()); + assertEquals("en-GB", salutationsEnum.getLocale()); assertEquals(3, salutationsEnum.size()); assertEquals("Mr", salutationsEnum.getValue("mr")); StrolchEnum religionsEnum = enumHandler.getEnum(certificate, "religions", Locale.CANADA); assertEquals("religions", religionsEnum.getName()); - assertEquals("en_CA", religionsEnum.getLocale()); + assertEquals("en-CA", religionsEnum.getLocale()); assertEquals(9, religionsEnum.size()); assertEquals("Atheist", religionsEnum.getValue("Atheist")); }); diff --git a/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeUsers.xml b/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeUsers.xml +++ b/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeUsers.xml b/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeUsers.xml +++ b/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeUsers.xml b/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeUsers.xml +++ b/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeUsers.xml b/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeUsers.xml +++ b/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeUsers.xml b/li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeUsers.xml +++ b/li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeUsers.xml b/li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeUsers.xml index b9f8c9461..54a75d7c5 100644 --- a/li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeUsers.xml +++ b/li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser @@ -22,7 +22,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeUsers.xml b/li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeUsers.xml index b9f8c9461..54a75d7c5 100644 --- a/li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeUsers.xml +++ b/li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser @@ -22,7 +22,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeUsers.xml b/li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeUsers.xml index af52f213c..939f07551 100644 --- a/li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeUsers.xml +++ b/li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser @@ -22,7 +22,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.performancetest/src/runtime_transient/config/PrivilegeUsers.xml b/li.strolch.performancetest/src/runtime_transient/config/PrivilegeUsers.xml index 2d796fddf..fd96d724f 100644 --- a/li.strolch.performancetest/src/runtime_transient/config/PrivilegeUsers.xml +++ b/li.strolch.performancetest/src/runtime_transient/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.performancetest/src/runtime_xml/config/PrivilegeUsers.xml b/li.strolch.performancetest/src/runtime_xml/config/PrivilegeUsers.xml index 94de9801e..0fe050dde 100644 --- a/li.strolch.performancetest/src/runtime_xml/config/PrivilegeUsers.xml +++ b/li.strolch.performancetest/src/runtime_xml/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeUsers.xml b/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeUsers.xml +++ b/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeUsers.xml b/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeUsers.xml +++ b/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml b/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml +++ b/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeUsers.xml b/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeUsers.xml +++ b/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeUsers.xml b/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeUsers.xml +++ b/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml b/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml +++ b/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeUsers.xml b/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeUsers.xml +++ b/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsDomWriter.java b/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsDomWriter.java index 1d05abc89..7e83cd2fe 100644 --- a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsDomWriter.java +++ b/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsDomWriter.java @@ -67,7 +67,7 @@ public class CertificateStubsDomWriter { certElement.setAttribute(XmlConstants.XML_ATTR_SOURCE, cert.getSource()); // locale; - certElement.setAttribute(XmlConstants.XML_ATTR_LOCALE, cert.getLocale().toString()); + certElement.setAttribute(XmlConstants.XML_ATTR_LOCALE, cert.getLocale().toLanguageTag()); // loginTime; certElement.setAttribute(XmlConstants.XML_ATTR_LOGIN_TIME, diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersDomWriter.java b/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersDomWriter.java index 8f6226bb5..a36dab45b 100644 --- a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersDomWriter.java +++ b/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersDomWriter.java @@ -78,7 +78,7 @@ public class PrivilegeUsersDomWriter { // add locale element Element localeElement = doc.createElement(XmlConstants.XML_LOCALE); - localeElement.setTextContent(user.getLocale().toString()); + localeElement.setTextContent(user.getLocale().toLanguageTag()); userElement.appendChild(localeElement); // add all the role elements diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersSaxReader.java b/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersSaxReader.java index c555221a0..4f60b4a5e 100644 --- a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersSaxReader.java +++ b/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersSaxReader.java @@ -89,7 +89,7 @@ public class PrivilegeUsersSaxReader extends DefaultHandler { // Application // Administrator // ENABLED -// en_GB +// en-GB // // PrivilegeAdmin // AppUser @@ -200,7 +200,7 @@ public class PrivilegeUsersSaxReader extends DefaultHandler { case XmlConstants.XML_LOCALE: - this.locale = new Locale(this.text.toString().trim()); + this.locale = Locale.forLanguageTag(this.text.toString().trim()); break; case XmlConstants.XML_ROLE: diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/XmlTest.java b/li.strolch.privilege/src/test/java/li/strolch/privilege/test/XmlTest.java index b2683679e..20d40f90a 100644 --- a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/XmlTest.java +++ b/li.strolch.privilege/src/test/java/li/strolch/privilege/test/XmlTest.java @@ -172,7 +172,7 @@ public class XmlTest { assertEquals("Application", admin.getFirstname()); assertEquals("Administrator", admin.getLastname()); assertEquals(UserState.ENABLED, admin.getUserState()); - assertEquals("en_gb", admin.getLocale().toString()); + assertEquals("en-GB", admin.getLocale().toString()); assertThat(admin.getRoles(), containsInAnyOrder("PrivilegeAdmin", "AppUser")); Map properties = admin.getProperties(); assertEquals(new HashSet<>(Arrays.asList("organization", "organizationalUnit")), properties.keySet()); @@ -188,7 +188,7 @@ public class XmlTest { assertEquals("System User", systemAdmin.getFirstname()); assertEquals("Administrator", systemAdmin.getLastname()); assertEquals(UserState.SYSTEM, systemAdmin.getUserState()); - assertEquals("en_gb", systemAdmin.getLocale().toString()); + assertEquals("en-GB", systemAdmin.getLocale().toString()); assertThat(systemAdmin.getRoles(), containsInAnyOrder("system_admin_privileges")); assertTrue(systemAdmin.getProperties().isEmpty()); } diff --git a/li.strolch.privilege/src/test/resources/config/PrivilegeUsers.xml b/li.strolch.privilege/src/test/resources/config/PrivilegeUsers.xml index e5ccc36d1..e0a38b179 100644 --- a/li.strolch.privilege/src/test/resources/config/PrivilegeUsers.xml +++ b/li.strolch.privilege/src/test/resources/config/PrivilegeUsers.xml @@ -5,7 +5,7 @@ Application Administrator ENABLED - en_GB + en-GB PrivilegeAdmin AppUser @@ -20,7 +20,7 @@ Application Administrator ENABLED - en_GB + en-GB PrivilegeAdmin AppUser @@ -35,7 +35,7 @@ System User Administrator SYSTEM - en_GB + en-GB system_admin_privileges @@ -45,7 +45,7 @@ System User Administrator SYSTEM - en_GB + en-GB system_admin_privileges diff --git a/li.strolch.privilege/src/test/resources/config/PrivilegeUsersMerge.xml b/li.strolch.privilege/src/test/resources/config/PrivilegeUsersMerge.xml index 20b327674..72f075877 100644 --- a/li.strolch.privilege/src/test/resources/config/PrivilegeUsersMerge.xml +++ b/li.strolch.privilege/src/test/resources/config/PrivilegeUsersMerge.xml @@ -5,7 +5,7 @@ System User Administrator ENABLED - en_GB + en-GB RoleA1 RoleA2 @@ -16,7 +16,7 @@ System User Administrator ENABLED - en_GB + en-GB RoleB1 RoleB2 diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml index 94b3a7b23..c051dc5e5 100644 --- a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml +++ b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser @@ -24,7 +24,7 @@ Bob Bernstein ENABLED - en_GB + en-GB AppUser @@ -34,7 +34,7 @@ Jill Johnson ENABLED - en_GB + en-GB OnlyGreetingServiceRole @@ -44,7 +44,7 @@ System User Administrator SYSTEM - en_GB + en-GB sysAdmin AppUser diff --git a/li.strolch.service/src/test/resources/executiontest/config/PrivilegeUsers.xml b/li.strolch.service/src/test/resources/executiontest/config/PrivilegeUsers.xml index 22cad3857..e51cd9951 100644 --- a/li.strolch.service/src/test/resources/executiontest/config/PrivilegeUsers.xml +++ b/li.strolch.service/src/test/resources/executiontest/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeUsers.xml b/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeUsers.xml +++ b/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.service/src/test/resources/reporttest/config/PrivilegeUsers.xml b/li.strolch.service/src/test/resources/reporttest/config/PrivilegeUsers.xml index 22cad3857..e51cd9951 100644 --- a/li.strolch.service/src/test/resources/reporttest/config/PrivilegeUsers.xml +++ b/li.strolch.service/src/test/resources/reporttest/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.service/src/test/resources/svctest/config/PrivilegeUsers.xml b/li.strolch.service/src/test/resources/svctest/config/PrivilegeUsers.xml index 35a702f14..df7c74820 100644 --- a/li.strolch.service/src/test/resources/svctest/config/PrivilegeUsers.xml +++ b/li.strolch.service/src/test/resources/svctest/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser @@ -19,7 +19,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser PrivilegeAdmin diff --git a/li.strolch.service/src/test/resources/transienttest/config/PrivilegeUsers.xml b/li.strolch.service/src/test/resources/transienttest/config/PrivilegeUsers.xml index 19a45be9f..ff7c43c7f 100644 --- a/li.strolch.service/src/test/resources/transienttest/config/PrivilegeUsers.xml +++ b/li.strolch.service/src/test/resources/transienttest/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser diff --git a/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml b/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml index 2fb263aae..570be132f 100644 --- a/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml +++ b/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml @@ -11,7 +11,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser @@ -25,7 +25,7 @@ Bob Bernstein ENABLED - en_GB + en-GB AppUser @@ -35,7 +35,7 @@ Jill Johnson ENABLED - en_GB + en-GB OnlyGreetingServiceRole @@ -45,7 +45,7 @@ System User Administrator SYSTEM - en_GB + en-GB sysAdmin AppUser diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/StringHelper.java b/li.strolch.utils/src/main/java/li/strolch/utils/helper/StringHelper.java index bb2424371..29a3b4d8a 100644 --- a/li.strolch.utils/src/main/java/li/strolch/utils/helper/StringHelper.java +++ b/li.strolch.utils/src/main/java/li/strolch/utils/helper/StringHelper.java @@ -868,4 +868,6 @@ public class StringHelper { uniqueId += 1; return uniqueId; } + + } diff --git a/li.strolch.website/www.strolch.li/documentation-privileges.html b/li.strolch.website/www.strolch.li/documentation-privileges.html index eb652432e..15b255204 100644 --- a/li.strolch.website/www.strolch.li/documentation-privileges.html +++ b/li.strolch.website/www.strolch.li/documentation-privileges.html @@ -70,7 +70,7 @@ <Firstname>Jill</Firstname> <Lastname>Someone</Lastname> <State>ENABLED</State> - <Locale>en_GB</Locale> + <Locale>en-GB</Locale> <Roles> <Role>AppUser</Role> </Roles> diff --git a/li.strolch.website/www.strolch.li/tutorial-configuration.html b/li.strolch.website/www.strolch.li/tutorial-configuration.html index a6405c547..bd1bb7da0 100644 --- a/li.strolch.website/www.strolch.li/tutorial-configuration.html +++ b/li.strolch.website/www.strolch.li/tutorial-configuration.html @@ -576,7 +576,7 @@ <Firstname>Jill</Firstname> <Lastname>Someone</Lastname> <State>ENABLED</State> - <Locale>en_GB</Locale> + <Locale>en-GB</Locale> <Roles> <Role>User</Role> <Role>UserPrivileges</Role> @@ -590,7 +590,7 @@ <Firstname>Jill</Firstname> <Lastname>Someone</Lastname> <State>ENABLED</State> - <Locale>en_GB</Locale> + <Locale>en-GB</Locale> <Roles> <Role>StrolchAdmin</Role> <Role>UserPrivileges</Role> diff --git a/strolch_minimal_rest/src/main/webapp/WEB-INF/config/PrivilegeUsers.xml b/strolch_minimal_rest/src/main/webapp/WEB-INF/config/PrivilegeUsers.xml index 3d239635b..7cb012a71 100644 --- a/strolch_minimal_rest/src/main/webapp/WEB-INF/config/PrivilegeUsers.xml +++ b/strolch_minimal_rest/src/main/webapp/WEB-INF/config/PrivilegeUsers.xml @@ -10,7 +10,7 @@ Application Administrator ENABLED - en_GB + en-GB AppUser