add BM.I specific example of country-selection template

add new i18n content
add jUnit tests

3 files changed, 17 insertions, 16 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
index 81ab02ce..e3931afe 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
@@ -123,6 +123,7 @@ public class StaticResourceConfiguration implements WebMvcConfigurer {
         final String absPath = FileUtils.makeAbsoluteUrl(staticResources, basicConfig
             .getConfigurationRootDirectory());
         messageSource.setBasename(absPath);
+        messageSource.setFallbackToSystemLocale(false);
 
       } else {
         log.debug("No Ressourcefolder for dynamic Web content templates");
diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index e7a46657..5cf0d5b8 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -23,7 +23,7 @@
 
   <bean id="MonitoringController"
     class="at.asitplus.eidas.specific.connector.controller.MonitoringController">
-    <property name="pvpIDPCredentials">
+    <property name="pvpIdpCredentials">
       <ref bean="PVPEndPointCredentialProvider" />
     </property>
   </bean>
@@ -35,17 +35,17 @@
     class="at.asitplus.eidas.specific.connector.builder.AuthenticationDataBuilder" />
 
   <bean id="PVPEndPointConfiguration"
-    class="at.asitplus.eidas.specific.connector.config.PVPEndPointConfiguration" />
+    class="at.asitplus.eidas.specific.connector.config.PvpEndPointConfiguration" />
 
   <bean id="PVPEndPointCredentialProvider"
-    class="at.asitplus.eidas.specific.connector.provider.PVPEndPointCredentialProvider" />
+    class="at.asitplus.eidas.specific.connector.provider.PvpEndPointCredentialProvider" />
 
   <bean id="PVPMetadataConfigurationFactory"
-    class="at.asitplus.eidas.specific.connector.provider.PVPMetadataConfigurationFactory" />
+    class="at.asitplus.eidas.specific.connector.provider.PvpMetadataConfigurationFactory" />
 
   <bean id="PVP2XProtocol"
-    class="at.asitplus.eidas.specific.connector.controller.PVP2SProfileEndpoint">
-    <property name="pvpIDPCredentials">
+    class="at.asitplus.eidas.specific.connector.controller.Pvp2SProfileEndpoint">
+    <property name="pvpIdpCredentials">
       <ref bean="PVPEndPointCredentialProvider" />
     </property>
   </bean>
@@ -54,18 +54,18 @@
     class="at.asitplus.eidas.specific.connector.verification.AuthnRequestValidator" />
 
   <bean id="SAMLVerificationEngine"
-    class="at.gv.egiz.eaaf.modules.pvp2.impl.verification.SAMLVerificationEngine" />
+    class="at.gv.egiz.eaaf.modules.pvp2.impl.verification.SamlVerificationEngine" />
 
   <bean id="pvpMetadataService"
     class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.MetadataAction">
-    <property name="pvpIDPCredentials">
+    <property name="pvpIdpCredentials">
       <ref bean="PVPEndPointCredentialProvider" />
     </property>
   </bean>
 
   <bean id="PVPAuthenticationRequestAction"
     class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.AuthenticationAction">
-    <property name="pvpIDPCredentials">
+    <property name="pvpIdpCredentials">
       <ref bean="PVPEndPointCredentialProvider" />
     </property>
   </bean>
@@ -79,22 +79,22 @@
     class="at.gv.egiz.eaaf.core.impl.utils.SecurePendingRequestIdGenerationStrategy" />
 
   <bean id="PVPMetadataProvider"
-    class="at.asitplus.eidas.specific.connector.provider.PVPMetadataProvider" />
+    class="at.asitplus.eidas.specific.connector.provider.PvpMetadataProvider" />
 
   <bean id="PVPSubjectNameGenerator"
-    class="at.asitplus.eidas.specific.connector.builder.PVPSubjectNameGenerator" />
+    class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" />
 
   <bean id="LoALevelMapper"
     class="at.asitplus.eidas.specific.connector.mapper.LoALevelMapper" />
 
   <bean id="GUIBuilderConfigurationFactory"
-    class="at.asitplus.eidas.specific.connector.gui.GUIBuilderConfigurationFactory" />
+    class="at.asitplus.eidas.specific.connector.gui.GuiBuilderConfigurationFactory" />
 
   <bean id="velocityGUIBuilderImpl"
-    class="at.asitplus.eidas.specific.connector.gui.DefaultVelocityGUIBuilderImpl" />
+    class="at.asitplus.eidas.specific.connector.gui.DefaultVelocityGuiBuilderImpl" />
 
   <bean id="mvcGUIBuilderImpl"
-    class="at.asitplus.eidas.specific.connector.gui.SpringMVCGUIFormBuilderImpl" />
+    class="at.asitplus.eidas.specific.connector.gui.SpringMvcGuiFormBuilderImpl" />
 
   <bean id="templateEngine"
     class="org.thymeleaf.spring5.SpringTemplateEngine">
diff --git a/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml
index 9ee5cf88..08c7b672 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml
@@ -18,10 +18,10 @@
     /> -->
 
   <bean id="eIDASCacheTransactionStoreDecorator"
-    class="at.asitplus.eidas.specific.connector.storage.eIDASCacheTransactionStoreDecorator" />
+    class="at.asitplus.eidas.specific.connector.storage.EidasCacheTransactionStoreDecorator" />
 
   <bean id="CacheWitheIDASBackend"
-    class="at.asitplus.eidas.specific.connector.storage.CacheWitheIDASBackend">
+    class="at.asitplus.eidas.specific.connector.storage.CacheWithEidasBackend">
     <constructor-arg ref="msNodeCacheImpl" />
   </bean>