Merge branch 'nightlybuild' into feature/ms_proxy_before_refactoring

# Conflicts:
#	basicConfig/templates/error_message.html
#	connector/src/main/resources/specific_eIDAS_connector.beans.xml
#	connector/src/test/resources/config/junit_config_1_springboot.properties
#	connector/src/test/resources/config/junit_config_2_springboot.properties
#	connector/src/test/resources/config/templates/countrySelection.html
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
#	pom.xml

3 files changed, 28 insertions, 6 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/MsConnectorMessageSource.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/MsConnectorMessageSource.java
new file mode 100644
index 00000000..59df6375
--- /dev/null
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/MsConnectorMessageSource.java
@@ -0,0 +1,21 @@
+package at.asitplus.eidas.specific.connector.config;
+
+import java.util.Arrays;
+import java.util.List;
+
+import at.gv.egiz.eaaf.core.api.logging.IMessageSourceLocation;
+
+/**
+ * Inject eIDAS Connector specific messages into Spring based message-source.
+ * 
+ * @author tlenz
+ *
+ */
+public class MsConnectorMessageSource implements IMessageSourceLocation {
+
+  @Override
+  public List<String> getMessageSourceLocation() {
+    return Arrays.asList("classpath:/properties/messages");
+  }
+
+}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java
index e649fd3a..f360185b 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java
@@ -46,7 +46,9 @@ import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractProcessEngineSignalContr
 public class ProcessEngineSignalController extends AbstractProcessEngineSignalController {
 
   @RequestMapping(value = { 
-      MsEidasNodeConstants.ENDPOINT_COUNTRYSELECTION
+          MsEidasNodeConstants.ENDPOINT_COUNTRYSELECTION,
+          MsEidasNodeConstants.ENDPOINT_OTHER_LOGIN_METHOD_SELECTION,
+          MsEidasNodeConstants.ENDPOINT_RESIDENCY_INPUT
       },
       method = { RequestMethod.POST, RequestMethod.GET })
   public void performGenericAuthenticationProcess(HttpServletRequest req, HttpServletResponse resp)
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
index e87979fb..57a4c19a 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
@@ -38,7 +38,7 @@ import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
+import at.gv.egiz.eaaf.core.impl.idp.controller.tasks.AbstractLocaleAuthServletTask;
 
 /**
  * Create country-selection page.
@@ -47,7 +47,7 @@ import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
  *
  */
 @Component("GenerateCountrySelectionFrameTask")
-public class GenerateCountrySelectionFrameTask extends AbstractAuthServletTask {
+public class GenerateCountrySelectionFrameTask extends AbstractLocaleAuthServletTask {
 
   @Autowired
   ISpringMvcGuiFormBuilder guiBuilder;
@@ -56,9 +56,8 @@ public class GenerateCountrySelectionFrameTask extends AbstractAuthServletTask {
 
 
   @Override
-  public void execute(ExecutionContext executionContext, HttpServletRequest request,
-      HttpServletResponse response)
-      throws TaskExecutionException {
+  public void executeWithLocale(ExecutionContext executionContext, HttpServletRequest request,
+      HttpServletResponse response) throws TaskExecutionException {
     try {
       revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.STARTING_COUNTRY_SELECTION);