From 9d1d6626032aa59eb169e310ed239b94c0bc5447 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Fri, 3 Jun 2022 16:02:01 +0200
Subject: chore(config): split default configuration into MS-Connector and
MS-Proxy-Servie
---
basicConfig/default_config.properties | 115 ---------
basicConfig/log4j.properties | 54 ----
basicConfig/logback_config.xml | 104 --------
basicConfig/ms-connector/default_config.properties | 115 +++++++++
basicConfig/ms-connector/logback_config.xml | 104 ++++++++
.../ms-connector/properties/messages.properties | 214 ++++++++++++++++
.../ms-connector/properties/messages_de.properties | 161 ++++++++++++
.../ms-connector/templates/countrySelection.html | 133 ++++++++++
.../templates/countrySelection_example.html | 54 ++++
.../ms-connector/templates/eidas_node_forward.html | 36 +++
.../ms-connector/templates/error_message.html | 60 +++++
.../ms-connector/templates/language_selection.html | 15 ++
.../ms-connector/templates/other_login_method.html | 153 +++++++++++
.../ms-connector/templates/pvp2_post_binding.html | 36 +++
basicConfig/ms-connector/templates/residency.html | 285 +++++++++++++++++++++
basicConfig/ms-connector/webcontent/autocommit.js | 5 +
basicConfig/ms-connector/webcontent/css/common.css | 156 +++++++++++
.../ms-connector/webcontent/css/css_country.css | 185 +++++++++++++
.../ms-connector/webcontent/css/css_error.css | 26 ++
.../ms-connector/webcontent/img/ajax-loader.gif | Bin 0 -> 673 bytes
.../ms-connector/webcontent/js/jquery-3.6.0.min.js | 2 +
.../ms-connector/webcontent/js/js_country.js | 42 +++
.../ms-proxyservice/default_config.properties | 115 +++++++++
basicConfig/ms-proxyservice/logback_config.xml | 104 ++++++++
.../ms-proxyservice/properties/messages.properties | 214 ++++++++++++++++
.../properties/messages_de.properties | 161 ++++++++++++
.../templates/eidas_node_forward.html | 36 +++
.../ms-proxyservice/templates/error_message.html | 60 +++++
.../templates/pvp2_post_binding.html | 36 +++
.../ms-proxyservice/webcontent/autocommit.js | 5 +
.../ms-proxyservice/webcontent/css/common.css | 156 +++++++++++
.../ms-proxyservice/webcontent/css/css_error.css | 26 ++
.../ms-proxyservice/webcontent/img/ajax-loader.gif | Bin 0 -> 673 bytes
basicConfig/properties/messages.properties | 214 ----------------
basicConfig/properties/messages_de.properties | 161 ------------
basicConfig/templates/countrySelection.html | 133 ----------
.../templates/countrySelection_example.html | 54 ----
basicConfig/templates/eidas_node_forward.html | 36 ---
basicConfig/templates/error_message.html | 60 -----
basicConfig/templates/language_selection.html | 15 --
basicConfig/templates/other_login_method.html | 153 -----------
basicConfig/templates/pvp2_post_binding.html | 36 ---
basicConfig/templates/residency.html | 285 ---------------------
basicConfig/webcontent/autocommit.js | 5 -
basicConfig/webcontent/css/common.css | 156 -----------
basicConfig/webcontent/css/css_country.css | 185 -------------
basicConfig/webcontent/css/css_error.css | 26 --
basicConfig/webcontent/img/ajax-loader.gif | Bin 673 -> 0 bytes
basicConfig/webcontent/js/jquery-3.6.0.min.js | 2 -
basicConfig/webcontent/js/js_country.js | 42 ---
50 files changed, 2695 insertions(+), 1836 deletions(-)
delete mode 100644 basicConfig/default_config.properties
delete mode 100644 basicConfig/log4j.properties
delete mode 100644 basicConfig/logback_config.xml
create mode 100644 basicConfig/ms-connector/default_config.properties
create mode 100644 basicConfig/ms-connector/logback_config.xml
create mode 100644 basicConfig/ms-connector/properties/messages.properties
create mode 100644 basicConfig/ms-connector/properties/messages_de.properties
create mode 100644 basicConfig/ms-connector/templates/countrySelection.html
create mode 100644 basicConfig/ms-connector/templates/countrySelection_example.html
create mode 100644 basicConfig/ms-connector/templates/eidas_node_forward.html
create mode 100644 basicConfig/ms-connector/templates/error_message.html
create mode 100644 basicConfig/ms-connector/templates/language_selection.html
create mode 100644 basicConfig/ms-connector/templates/other_login_method.html
create mode 100644 basicConfig/ms-connector/templates/pvp2_post_binding.html
create mode 100644 basicConfig/ms-connector/templates/residency.html
create mode 100644 basicConfig/ms-connector/webcontent/autocommit.js
create mode 100644 basicConfig/ms-connector/webcontent/css/common.css
create mode 100644 basicConfig/ms-connector/webcontent/css/css_country.css
create mode 100644 basicConfig/ms-connector/webcontent/css/css_error.css
create mode 100644 basicConfig/ms-connector/webcontent/img/ajax-loader.gif
create mode 100644 basicConfig/ms-connector/webcontent/js/jquery-3.6.0.min.js
create mode 100644 basicConfig/ms-connector/webcontent/js/js_country.js
create mode 100644 basicConfig/ms-proxyservice/default_config.properties
create mode 100644 basicConfig/ms-proxyservice/logback_config.xml
create mode 100644 basicConfig/ms-proxyservice/properties/messages.properties
create mode 100644 basicConfig/ms-proxyservice/properties/messages_de.properties
create mode 100644 basicConfig/ms-proxyservice/templates/eidas_node_forward.html
create mode 100644 basicConfig/ms-proxyservice/templates/error_message.html
create mode 100644 basicConfig/ms-proxyservice/templates/pvp2_post_binding.html
create mode 100644 basicConfig/ms-proxyservice/webcontent/autocommit.js
create mode 100644 basicConfig/ms-proxyservice/webcontent/css/common.css
create mode 100644 basicConfig/ms-proxyservice/webcontent/css/css_error.css
create mode 100644 basicConfig/ms-proxyservice/webcontent/img/ajax-loader.gif
delete mode 100644 basicConfig/properties/messages.properties
delete mode 100644 basicConfig/properties/messages_de.properties
delete mode 100644 basicConfig/templates/countrySelection.html
delete mode 100644 basicConfig/templates/countrySelection_example.html
delete mode 100644 basicConfig/templates/eidas_node_forward.html
delete mode 100644 basicConfig/templates/error_message.html
delete mode 100644 basicConfig/templates/language_selection.html
delete mode 100644 basicConfig/templates/other_login_method.html
delete mode 100644 basicConfig/templates/pvp2_post_binding.html
delete mode 100644 basicConfig/templates/residency.html
delete mode 100644 basicConfig/webcontent/autocommit.js
delete mode 100644 basicConfig/webcontent/css/common.css
delete mode 100644 basicConfig/webcontent/css/css_country.css
delete mode 100644 basicConfig/webcontent/css/css_error.css
delete mode 100644 basicConfig/webcontent/img/ajax-loader.gif
delete mode 100644 basicConfig/webcontent/js/jquery-3.6.0.min.js
delete mode 100644 basicConfig/webcontent/js/js_country.js
(limited to 'basicConfig')
diff --git a/basicConfig/default_config.properties b/basicConfig/default_config.properties
deleted file mode 100644
index b14c0221..00000000
--- a/basicConfig/default_config.properties
+++ /dev/null
@@ -1,115 +0,0 @@
-## Basic service configuration
-eidas.ms.context.url.prefix=
-eidas.ms.core.configRootDir=file:./
-
-
-##Monitoring
-eidas.ms.monitoring.eIDASNode.metadata.url=
-
-
-##Specific logger configuration
-eidas.ms.technicallog.write.MDS.into.techlog=true
-eidas.ms.revisionlog.write.MDS.into.revisionlog=true
-eidas.ms.revisionlog.logIPAddressOfUser=true
-
-
-## extended validation of pending-request Id's
-eidas.ms.core.pendingrequestid.digist.secret=pendingReqIdSecret
-
-
-#############################################
-#### eIDAS Ref. Implementation connector ####
-eidas.ms.auth.eIDAS.eid.testidentity.default=false
-
-## eIDAS Request configuration
-eidas.ms.auth.eIDAS.node_v2.staticProviderNameForPublicSPs=Austria
-
-eidas.ms.auth.eIDAS.node_v2.entityId=ownSpecificConnector
-eidas.ms.auth.eIDAS.node_v2.forward.endpoint=
-
-
-#############################################
-#### eIDAS identity-matching ######
-# ZMR communication
-eidas.ms.auth.eIDAS.zmrclient.endpoint=https://stportal.bmi.gv.at/at.gv.bmi.zmrsrv-a/soap/ZMRService
-eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.type=pkcs12
-eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.path=keys/....
-eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.password=
-eidas.ms.auth.eIDAS.zmrclient.ssl.key.alias=
-eidas.ms.auth.eIDAS.zmrclient.ssl.key.password=
-eidas.ms.auth.eIDAS.zmrclient.req.organisation.behoerdennr=
-
-# ERnP communication
-eidas.ms.auth.eIDAS.ernpclient.endpoint=https://stportal.bmi.gv.at/at.gv.bmi.erpsrv-a/srv/rest/
-eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.type=pkcs12
-eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.path=keys/....
-eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.password=
-eidas.ms.auth.eIDAS.ernpclient.ssl.key.alias=
-eidas.ms.auth.eIDAS.ernpclient.ssl.key.password=
-eidas.ms.auth.eIDAS.ernpclient.req.organisation.behoerdennr=
-
-# SAML2 ID Austria client for matching
-eidas.ms.modules.idaustriaclient.keystore.type=jks
-eidas.ms.modules.idaustriaclient.keystore.path=keys/...
-eidas.ms.modules.idaustriaclient.keystore.password=
-eidas.ms.modules.idaustriaclient.metadata.sign.alias=
-eidas.ms.modules.idaustriaclient.metadata.sign.password=
-eidas.ms.modules.idaustriaclient.request.sign.alias=
-eidas.ms.modules.idaustriaclient.request.sign.password=
-eidas.ms.modules.idaustriaclient.response.encryption.alias=
-eidas.ms.modules.idaustriaclient.response.encryption.password=
-
-eidas.ms.modules.idaustriaclient.truststore.type=jks
-eidas.ms.modules.idaustriaclient.truststore.path=keys/id_austria_truststore.jks
-eidas.ms.modules.idaustriaclient.truststore.password=trustIda
-
-eidas.ms.modules.idaustriaclient.idaustria.idp.entityId=https://eid2.oesterreich.gv.at/auth/idp/shibboleth
-
-
-
-#############################################
-#### SZR communication ######
-eidas.ms.auth.eIDAS.szrclient.useTestService=true
-eidas.ms.auth.eIDAS.szrclient.endpoint.prod=https://stportal.bmi.gv.at/at.gv.bmi.sz2-n-p/SZR
-eidas.ms.auth.eIDAS.szrclient.endpoint.test=https://stportal.bmi.gv.at/at.gv.bmi.sz2-n-a/SZR
-eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.type=pkcs12
-eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.path=keys/.....
-eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.password=
-eidas.ms.auth.eIDAS.szrclient.ssl.key.alias=
-eidas.ms.auth.eIDAS.szrclient.ssl.key.password=
-
-
-#############################################
-#### IDA-AuthBlock configuration ######
-eidas.ms.auth.eIDAS.authblock.keystore.type=jks
-eidas.ms.auth.eIDAS.authblock.keystore.path=keys/teststore.jks
-eidas.ms.auth.eIDAS.authblock.keystore.password=f/+saJBc3a}*/T^s
-eidas.ms.auth.eIDAS.authblock.key.alias=connectorkeypair
-eidas.ms.auth.eIDAS.authblock.key.password=f/+saJBc3a}*/T^s
-
-
-#################################################
-#### PVP2 S-Profile end-point configuration ####
-eidas.ms.pvp2.keystore.type=jks
-eidas.ms.pvp2.keystore.path=keys/.....
-eidas.ms.pvp2.keystore.password=
-eidas.ms.pvp2.key.metadata.alias=
-eidas.ms.pvp2.key.metadata.password=
-eidas.ms.pvp2.key.signing.alias=
-eidas.ms.pvp2.key.signing.password=
-eidas.ms.pvp2.metadata.validity=24
-
-eidas.ms.pvp2.metadata.organisation.name=JUnit
-eidas.ms.pvp2.metadata.organisation.friendyname=For testing with jUnit
-eidas.ms.pvp2.metadata.organisation.url=http://junit.test
-eidas.ms.pvp2.metadata.contact.givenname=Max
-eidas.ms.pvp2.metadata.contact.surname=Mustermann
-eidas.ms.pvp2.metadata.contact.email=max@junit.test
-
-
-## Service Provider configuration
-eidas.ms.sp.0.uniqueID=
-eidas.ms.sp.0.pvp2.metadata.truststore=
-eidas.ms.sp.0.pvp2.metadata.truststore.password=
-eidas.ms.sp.0.newEidMode=false
-
diff --git a/basicConfig/log4j.properties b/basicConfig/log4j.properties
deleted file mode 100644
index 4426ea7e..00000000
--- a/basicConfig/log4j.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-# commons-logging setup
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
-
-# define log4j root loggers
-log4j.rootLogger=warn,stdout, console
-
-log4j.logger.at.gv.egiz.eidas.specific=info, msnode
-log4j.logger.at.gv.egiz.eidas.specific.connector.logger.RevisionLogger=info, reversion
-log4j.logger.at.gv.egiz.eidas.specific.connector.logger.StatisticLogger=info, statistic
-log4j.logger.eu.eidas=info, EIDASNODE
-
-log4j.additivity.at.gv.egiz.eidas.specific=false
-log4j.additivity.at.gv.egiz.eidas.specific.connector.logger.RevisionLogger=false
-log4j.additivity.at.gv.egiz.eidas.specific.connector.logger.StatisticLogger=false
-log4j.additivity.eu.eidas=false
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20c | %10t | %m%n
-
-log4j.appender.stdout=org.apache.log4j.RollingFileAppender
-log4j.appender.stdout.File=${catalina.base}/logs/console.log
-log4j.appender.stdout.MaxFileSize=10000KB
-log4j.appender.stdout.MaxBackupIndex=9999
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n
-
-log4j.appender.msnode=org.apache.log4j.RollingFileAppender
-log4j.appender.msnode.File=${catalina.base}/logs/eidas-ms-reversion.log
-log4j.appender.msnode.MaxFileSize=10000KB
-log4j.appender.msnode.MaxBackupIndex=9999
-log4j.appender.msnode.layout=org.apache.log4j.PatternLayout
-log4j.appender.msnode.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n
-
-log4j.appender.reversion=org.apache.log4j.RollingFileAppender
-log4j.appender.reversion.File=${catalina.base}/logs/eidas-ms-reversion.log
-log4j.appender.reversion.MaxFileSize=10000KB
-log4j.appender.reversion.MaxBackupIndex=9999
-log4j.appender.reversion.layout=org.apache.log4j.PatternLayout
-log4j.appender.reversion.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n
-
-log4j.appender.statistic=org.apache.log4j.RollingFileAppender
-log4j.appender.statistic.File=${catalina.base}/logs/eidas-ms-statistic.log
-log4j.appender.statistic.MaxFileSize=10000KB
-log4j.appender.statistic.MaxBackupIndex=9999
-log4j.appender.statistic.layout=org.apache.log4j.PatternLayout
-log4j.appender.statistic.layout.ConversionPattern=%m%n
-
-log4j.appender.EIDASNODE=org.apache.log4j.RollingFileAppender
-log4j.appender.EIDASNODE.File=${catalina.base}/logs/eIDAS_node.log
-log4j.appender.EIDASNODE.MaxFileSize=10000KB
-log4j.appender.EIDASNODE.MaxBackupIndex=9999
-log4j.appender.EIDASNODE.layout=org.apache.log4j.PatternLayout
-log4j.appender.EIDASNODE.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n
\ No newline at end of file
diff --git a/basicConfig/logback_config.xml b/basicConfig/logback_config.xml
deleted file mode 100644
index ddb9f864..00000000
--- a/basicConfig/logback_config.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${catalina.base}/logs/ms_specific_node.log.log
-
- %5p | %d{ISO8601} | %X{transactionId} | %t | %logger{16} | %m%n
-
-
- ${catalina.base}/logs/ms_specific_node.log.%d{yyyy-MM-dd}
-
-
- 10000KB
-
-
-
-
-
- ${catalina.base}/logs/eidas-ms-reversion.log
-
- %5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n
-
-
- 9999
- ${catalina.base}/logs/eidas-ms-reversion.log.%i
-
-
- 10000KB
-
-
-
-
-
- ${catalina.base}/logs/eidas-ms-statistic.log
-
- %5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n
-
-
- 9999
- ${catalina.base}/logs/eidas-ms-statistic.log.%i
-
-
- 10000KB
-
-
-
-
-
- ${catalina.base}/logs/console.log
-
- %5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n
-
-
- ${catalina.base}/logs/eidas-ms-statistic.log.%d{yyyy-MM-dd}
-
-
-
-
-
- %5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %20c | %10t | %m%n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/basicConfig/ms-connector/default_config.properties b/basicConfig/ms-connector/default_config.properties
new file mode 100644
index 00000000..b14c0221
--- /dev/null
+++ b/basicConfig/ms-connector/default_config.properties
@@ -0,0 +1,115 @@
+## Basic service configuration
+eidas.ms.context.url.prefix=
+eidas.ms.core.configRootDir=file:./
+
+
+##Monitoring
+eidas.ms.monitoring.eIDASNode.metadata.url=
+
+
+##Specific logger configuration
+eidas.ms.technicallog.write.MDS.into.techlog=true
+eidas.ms.revisionlog.write.MDS.into.revisionlog=true
+eidas.ms.revisionlog.logIPAddressOfUser=true
+
+
+## extended validation of pending-request Id's
+eidas.ms.core.pendingrequestid.digist.secret=pendingReqIdSecret
+
+
+#############################################
+#### eIDAS Ref. Implementation connector ####
+eidas.ms.auth.eIDAS.eid.testidentity.default=false
+
+## eIDAS Request configuration
+eidas.ms.auth.eIDAS.node_v2.staticProviderNameForPublicSPs=Austria
+
+eidas.ms.auth.eIDAS.node_v2.entityId=ownSpecificConnector
+eidas.ms.auth.eIDAS.node_v2.forward.endpoint=
+
+
+#############################################
+#### eIDAS identity-matching ######
+# ZMR communication
+eidas.ms.auth.eIDAS.zmrclient.endpoint=https://stportal.bmi.gv.at/at.gv.bmi.zmrsrv-a/soap/ZMRService
+eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.type=pkcs12
+eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.path=keys/....
+eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.password=
+eidas.ms.auth.eIDAS.zmrclient.ssl.key.alias=
+eidas.ms.auth.eIDAS.zmrclient.ssl.key.password=
+eidas.ms.auth.eIDAS.zmrclient.req.organisation.behoerdennr=
+
+# ERnP communication
+eidas.ms.auth.eIDAS.ernpclient.endpoint=https://stportal.bmi.gv.at/at.gv.bmi.erpsrv-a/srv/rest/
+eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.type=pkcs12
+eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.path=keys/....
+eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.password=
+eidas.ms.auth.eIDAS.ernpclient.ssl.key.alias=
+eidas.ms.auth.eIDAS.ernpclient.ssl.key.password=
+eidas.ms.auth.eIDAS.ernpclient.req.organisation.behoerdennr=
+
+# SAML2 ID Austria client for matching
+eidas.ms.modules.idaustriaclient.keystore.type=jks
+eidas.ms.modules.idaustriaclient.keystore.path=keys/...
+eidas.ms.modules.idaustriaclient.keystore.password=
+eidas.ms.modules.idaustriaclient.metadata.sign.alias=
+eidas.ms.modules.idaustriaclient.metadata.sign.password=
+eidas.ms.modules.idaustriaclient.request.sign.alias=
+eidas.ms.modules.idaustriaclient.request.sign.password=
+eidas.ms.modules.idaustriaclient.response.encryption.alias=
+eidas.ms.modules.idaustriaclient.response.encryption.password=
+
+eidas.ms.modules.idaustriaclient.truststore.type=jks
+eidas.ms.modules.idaustriaclient.truststore.path=keys/id_austria_truststore.jks
+eidas.ms.modules.idaustriaclient.truststore.password=trustIda
+
+eidas.ms.modules.idaustriaclient.idaustria.idp.entityId=https://eid2.oesterreich.gv.at/auth/idp/shibboleth
+
+
+
+#############################################
+#### SZR communication ######
+eidas.ms.auth.eIDAS.szrclient.useTestService=true
+eidas.ms.auth.eIDAS.szrclient.endpoint.prod=https://stportal.bmi.gv.at/at.gv.bmi.sz2-n-p/SZR
+eidas.ms.auth.eIDAS.szrclient.endpoint.test=https://stportal.bmi.gv.at/at.gv.bmi.sz2-n-a/SZR
+eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.type=pkcs12
+eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.path=keys/.....
+eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.password=
+eidas.ms.auth.eIDAS.szrclient.ssl.key.alias=
+eidas.ms.auth.eIDAS.szrclient.ssl.key.password=
+
+
+#############################################
+#### IDA-AuthBlock configuration ######
+eidas.ms.auth.eIDAS.authblock.keystore.type=jks
+eidas.ms.auth.eIDAS.authblock.keystore.path=keys/teststore.jks
+eidas.ms.auth.eIDAS.authblock.keystore.password=f/+saJBc3a}*/T^s
+eidas.ms.auth.eIDAS.authblock.key.alias=connectorkeypair
+eidas.ms.auth.eIDAS.authblock.key.password=f/+saJBc3a}*/T^s
+
+
+#################################################
+#### PVP2 S-Profile end-point configuration ####
+eidas.ms.pvp2.keystore.type=jks
+eidas.ms.pvp2.keystore.path=keys/.....
+eidas.ms.pvp2.keystore.password=
+eidas.ms.pvp2.key.metadata.alias=
+eidas.ms.pvp2.key.metadata.password=
+eidas.ms.pvp2.key.signing.alias=
+eidas.ms.pvp2.key.signing.password=
+eidas.ms.pvp2.metadata.validity=24
+
+eidas.ms.pvp2.metadata.organisation.name=JUnit
+eidas.ms.pvp2.metadata.organisation.friendyname=For testing with jUnit
+eidas.ms.pvp2.metadata.organisation.url=http://junit.test
+eidas.ms.pvp2.metadata.contact.givenname=Max
+eidas.ms.pvp2.metadata.contact.surname=Mustermann
+eidas.ms.pvp2.metadata.contact.email=max@junit.test
+
+
+## Service Provider configuration
+eidas.ms.sp.0.uniqueID=
+eidas.ms.sp.0.pvp2.metadata.truststore=
+eidas.ms.sp.0.pvp2.metadata.truststore.password=
+eidas.ms.sp.0.newEidMode=false
+
diff --git a/basicConfig/ms-connector/logback_config.xml b/basicConfig/ms-connector/logback_config.xml
new file mode 100644
index 00000000..ddb9f864
--- /dev/null
+++ b/basicConfig/ms-connector/logback_config.xml
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${catalina.base}/logs/ms_specific_node.log.log
+
+ %5p | %d{ISO8601} | %X{transactionId} | %t | %logger{16} | %m%n
+
+
+ ${catalina.base}/logs/ms_specific_node.log.%d{yyyy-MM-dd}
+
+
+ 10000KB
+
+
+
+
+
+ ${catalina.base}/logs/eidas-ms-reversion.log
+
+ %5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n
+
+
+ 9999
+ ${catalina.base}/logs/eidas-ms-reversion.log.%i
+
+
+ 10000KB
+
+
+
+
+
+ ${catalina.base}/logs/eidas-ms-statistic.log
+
+ %5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n
+
+
+ 9999
+ ${catalina.base}/logs/eidas-ms-statistic.log.%i
+
+
+ 10000KB
+
+
+
+
+
+ ${catalina.base}/logs/console.log
+
+ %5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n
+
+
+ ${catalina.base}/logs/eidas-ms-statistic.log.%d{yyyy-MM-dd}
+
+
+
+
+
+ %5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %20c | %10t | %m%n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/basicConfig/ms-connector/properties/messages.properties b/basicConfig/ms-connector/properties/messages.properties
new file mode 100644
index 00000000..8d2b692c
--- /dev/null
+++ b/basicConfig/ms-connector/properties/messages.properties
@@ -0,0 +1,214 @@
+####### GUI elements ####
+gui.general.language.selection.title=Language selection
+gui.general.language.selection.de=Deutsch
+gui.general.language.selection.en=English
+
+##Errorpage template
+gui.errorpage.msg.title=Authentication error
+gui.errorpage.msg.information=The authentication stops on account of a process error:
+gui.errorpage.msg.errorcode=Error Code:
+gui.errorpage.msg.errormsg=Error Message:
+gui.errorpage.msg.stacktrace=Stacktrace:
+
+##Country-Selection page
+gui.countryselection.title=eIDAS-Login country selection
+gui.countryselection.logo.bmi.alt=Logo BMI
+gui.countryselection.link.bmi=Mainpage BMI
+gui.countryselection.header1=Federal Ministry of Internal Affairs
+gui.countryselection.header2=Austrian Central eIDAS Node
+gui.countryselection.header3=Operated by Federal Ministry of Internal Affairs
+gui.countryselection.header.selection=Select your country
+gui.countryselection.cancel=Cancel
+gui.countryselection.cancle=Cancel
+gui.countryselection.notsupportedinfo=If you cannot find your country in this list then your electronic identity (eID) is not yet supported.
+
+gui.countryselection.infos.general.header=Information on Logins with European eIDs
+gui.countryselection.infos.general.link.1=eIDAS regulation of the European Union
+gui.countryselection.infos.general.link.2=Austrian Supplementary Register for Natural Persons (ERnP)
+gui.countryselection.infos.general.part.1=This is the central eIDAS node of the Republic of Austria, operated by the
+gui.countryselection.infos.general.part.2=It enables logins at Austrian online services using an electronic identity (eID) of another EU member state. You have been redirected to this page, as you have initiated a login to an online service using the option "EU Login".
+gui.countryselection.infos.general.part.3=The central eIDAS node of the Republic of Austria allows you to login to Austrian online services using the eID of your home country. This way, compliance with the
+gui.countryselection.infos.general.part.4=, which regulates the mutual cross-border acceptance of national eIDs, is achieved. The mutual cross-border acceptance of national eIDs is implemented successively within the EU. Currently, the central eIDAS node of the Republic of Austria supports logins using the eID systems of the Member States mentioned above. More Member States will be added according to availability of their respective eID solutions.
+gui.countryselection.infos.general.part.5=After selecting your home country on this page, you are forwarded to the familiar login environment of the selected member state. There, you can login with your eID as usual. After successful completion of the login process, you are automatically forwarded and logged in to the online service, from which you have been redirected to this page. During your first login, your eID data is also registered in the
+gui.countryselection.infos.general.part.6=This ensures that you will also be successfully and uniquely identified in subsequent logins at Austrian online services.
+
+gui.matching.otherloginmethod.header=Assignment of your login information
+gui.matching.otherloginmethod.info.text=Your login information could not be clearly integrated into the Austrian eID system. Further information is required for an unique integration.
+gui.matching.otherloginmethod.ida=You have an ID Austria
+gui.matching.otherloginmethod.eidas=You can provide additional information via eIDAS
+gui.matching.otherloginmethod.residence=Have you ever lived in Austria?
+gui.matching.otherloginmethod.addmeasnew=Add me as new entity in Austrian eID system
+
+gui.matching.otherloginmethod.error.title=Matching of further information failed:
+gui.matching.otherloginmethod.error.msg=No identity match with additional information. Use another option or provide more information.
+
+
+gui.countryselection.country.be=Belgium
+gui.countryselection.country.be.logo.alt=Belgium-eID
+gui.countryselection.country.hr=Croatia
+gui.countryselection.country.hr.logo.alt=Croatia-eID
+gui.countryselection.country.cy=Cyprus
+gui.countryselection.country.cy.logo.alt=Cyprus-eID
+gui.countryselection.country.cz=Czech Republic
+gui.countryselection.country.cz.logo.alt=Czech Republic-eID
+gui.countryselection.country.ee=Estonia
+gui.countryselection.country.ee.logo.alt=Estonia-eID
+gui.countryselection.country.de=Germany
+gui.countryselection.country.de.logo.alt=German-eID
+gui.countryselection.country.is=Iceland
+gui.countryselection.country.is.logo.alt=Iceland-eID
+gui.countryselection.country.it=Italy
+gui.countryselection.country.it.logo.alt=Italy-eID
+gui.countryselection.country.lt=Lithuania
+gui.countryselection.country.lt.logo.alt=Lithuania-eID
+gui.countryselection.country.lv=Latvia
+gui.countryselection.country.lv.logo.alt=Latvia-eID
+gui.countryselection.country.nl=Netherlands
+gui.countryselection.country.nl.logo.alt=Netherlands-eID
+gui.countryselection.country.pl=Poland
+gui.countryselection.country.pl.logo.alt=Poland-eID
+gui.countryselection.country.pt=Portugal
+gui.countryselection.country.pt.logo.alt=Portugal-eID
+gui.countryselection.country.si=Slovenia
+gui.countryselection.country.si.logo.alt=Slovenia-eID
+gui.countryselection.country.es=Spain
+gui.countryselection.country.es.logo.alt=Spain-eID
+
+gui.countryselection.country.bg=Bulgaria
+gui.countryselection.country.bg.logo.alt=Bulgaria-eID
+gui.countryselection.country.dk=Denmark
+gui.countryselection.country.dk.logo.alt=Denmark-eID
+gui.countryselection.country.fi=Finland
+gui.countryselection.country.fi.logo.alt=Finland-eID
+gui.countryselection.country.fr=France
+gui.countryselection.country.fr.logo.alt=France-eID
+gui.countryselection.country.el=Greece
+gui.countryselection.country.el.logo.alt=Greece-eID
+gui.countryselection.country.hu=Hungary
+gui.countryselection.country.hu.logo.alt=Hungary-eID
+gui.countryselection.country.ie=Ireland
+gui.countryselection.country.ie.logo.alt=Ireland-eID
+gui.countryselection.country.ir=Ireland
+gui.countryselection.country.ir.logo.alt=Ireland-eID
+gui.countryselection.country.lu=Luxembourg
+gui.countryselection.country.lu.logo.alt=Luxembourg-eID
+gui.countryselection.country.mt=Malta
+gui.countryselection.country.mt.logo.alt=Malta-eID
+gui.countryselection.country.no=Norway
+gui.countryselection.country.no.logo.alt=Norway-eID
+gui.countryselection.country.ro=Romania
+gui.countryselection.country.ro.logo.alt=Romania-eID
+gui.countryselection.country.sk=Slovakia
+gui.countryselection.country.sk.logo.alt=Slovakia-eID
+gui.countryselection.country.se=Sweden
+gui.countryselection.country.se.logo.alt=Sweden-eID
+gui.countryselection.country.sw=Sweden
+gui.countryselection.country.sw.logo.alt=Sweden-eID
+gui.countryselection.country.uk=United Kingdom
+gui.countryselection.country.uk.logo.alt=United Kingdom-eID
+
+gui.countryselection.country.testcountry=TestCountry
+gui.countryselection.country.testcountry.logo.alt=Testcountry-eID
+
+gui.countryselection.mode.prod=Production
+gui.countryselection.mode.qs=QS
+gui.countryselection.mode.test=Test
+gui.countryselection.mode.dev=Development
+
+# images
+gui.countryselection.country.be.img = /img/countries/Belgium-EU_.png
+gui.countryselection.country.bg.img = /img/countries/Bulgaria-EU_.png
+gui.countryselection.country.hr.img = /img/countries/Croatia-EU_.png
+gui.countryselection.country.cy.img = /img/countries/Cyprus-EU_.png
+gui.countryselection.country.cz.img = /img/countries/CzechRepublic-EU_.png
+gui.countryselection.country.dk.img = /img/countries/Denmark-EU_.png
+gui.countryselection.country.ee.img = /img/countries/Estonia-EU_.png
+gui.countryselection.country.fi.img = /img/countries/Finland-EU_.png
+gui.countryselection.country.fr.img = /img/countries/France-EU_.png
+gui.countryselection.country.de.img = /img/countries/germany-eu_.png
+gui.countryselection.country.el.img = /img/countries/Greece-EU_.png
+gui.countryselection.country.hu.img = /img/countries/Hungary-EU_.png
+gui.countryselection.country.is.img = /img/countries/Iceland.png
+gui.countryselection.country.ie.img = /img/countries/Ireland-EU_.png
+gui.countryselection.country.it.img = /img/countries/Italy-EU_.png
+gui.countryselection.country.lv.img = /img/countries/Latvia-EU_.png
+gui.countryselection.country.lt.img = /img/countries/Lithuania-EU_.png
+gui.countryselection.country.lu.img = /img/countries/Luxembourg-EU_.png
+gui.countryselection.country.mt.img = /img/countries/Malta-EU_.png
+gui.countryselection.country.po.img = /img/countries/Poland-EU_.png
+gui.countryselection.country.pt.img = /img/countries/Portugal-EU_.png
+gui.countryselection.country.ro.img = /img/countries/Romania-EU_.png
+gui.countryselection.country.sk.img = /img/countries/Slovakia-EU_.png
+gui.countryselection.country.si.img = /img/countries/Slovenia-EU_.png
+gui.countryselection.country.es.img = /img/countries/Spain-EU_.png
+gui.countryselection.country.se.img = /img/countries/Sweden-EU_.png
+gui.countryselection.country.nl.img = /img/countries/TheNetherlands-EU_.png
+gui.countryselection.country.uk.img = /img/countries/UnitedKingdom-EU_.png
+
+
+##### Matching operations
+##Other Login Methods page
+gui.otherlogin.title=eIDAS-Login Other Login Methods
+gui.otherlogin.header.selection=Personal data not found
+
+gui.otherlogin.info.first=Your personal data from the conducted EU login could not be clearly assigned to any register entry in the registers of the Austrian administration. This may be due to a missing register entry of your personal data, or an incorrect match of your login data and your register entry stored in the registers.
+gui.otherlogin.info.second=The following describes options to achieve a correct assignment:
+gui.otherlogin.info.list.1=If you have an Austrian Mobile-Phone Signature (or ID Austria) or an alternative possibility of an EU login, please log in again using one of these options. For this purpose, please use the corresponding button for “ID Austria” or “Alternative EU-Login”.
+gui.otherlogin.info.list.2=If you do not have either of the two additional registration options mentioned above, please continue with the button “No alternative login”.
+
+gui.otherlogin.button.hs=ID Austria
+gui.otherlogin.button.eidas=Alternative EU-Login
+gui.otherlogin.button.none=No alternative login
+gui.otherlogin.button.inserternp=Create new register entry
+gui.otherlogin.cancel=Cancel
+
+gui.otherlogin.inserternp.header.selection=Re-registration
+gui.otherlogin.inserternp.first=Your personal data could not be clearly assigned to any entry in the registers of the Austrian administration.
+gui.otherlogin.inserternp.second=Allow the re-registration of your personal data in the registers of the Austrian administration to complete the registration process successfully.
+gui.otherlogin.inserternp.third.prefix=Attention: If you think you already have an entry in the registers of the Austrian administration, it is recommended not to allow your data to be entered again at this point in order to avoid double entries. In this case, please contact
+gui.otherlogin.inserternp.third.postfix=, to arrange a manual assignment of your personal data.
+
+
+module.eidasauth.matching.00=Matching failed, because find more than one ZMR entries with one eIDAS personal-identifier
+module.eidasauth.matching.01=Matching failed, because of an ZMR communication error. Reason: {0}
+module.eidasauth.matching.02=Matching failed, because ZMR response contains historic information which is not supported.
+module.eidasauth.matching.03=Matching failed in workflow step: {0} with error: {1}
+module.eidasauth.matching.04=An error occurred while loading your data from official registers. Please contact the suppot.
+module.eidasauth.matching.11=Matching failed, because of an ERnP communication error. Reason: {0}
+module.eidasauth.matching.12=Matching failed, because ERnP response contains historic information which is not supported.
+module.eidasauth.matching.21=Matching be using residence information failed by missing input information. Add all required information.
+module.eidasauth.matching.22=Can not find an unique match by using residence information. Provide more or other data, use another method for matching.
+module.eidasauth.matching.23=Matching be using ID Austria was canceled. Use another method for matching.
+module.eidasauth.matching.24=Matching be using ID Austria not possible. Use another method for matching.
+module.eidasauth.matching.25=Matching be using alternative eIDAS authentication not possible. Provide more or other data, or use another method for matching.
+module.eidasauth.matching.26=Matching be using alternative eIDAS authentication not possible, because Name or Country not matched. Provide more or other data or use another method for matching.
+module.eidasauth.matching.29=Matching be using other information failed. Provide more or other data, or use another method for matching.
+module.eidasauth.matching.99=Matching failed, because of an unexpected processing error. Reason: {0}
+
+
+##Austrian Residency page
+gui.residency.title=Austrian Residency
+gui.residency.header.selection=Search for Austrian residence
+gui.residency.header.help=You can search for the address that you have been registered at in the past. Please enter a \
+ postcode, municipality or village first to start the search.
+
+gui.residency.info.first=If you have a current or former registered residence in Austria, an assignment to your existing register entry can be made by entering the residence data. Please use the form below to enter your residence details.
+gui.residency.info.second=First, please enter a postal code, municipality or locality and subsequently start the search for your home address using the "Search" button. Afterwards, you will be interactively supported in completing the address of residence, where you just have to follow the instructions on the form. You can restart the search process at any time by clicking the button "Delete". If all residence data has been filled in completely via the search function, please continue with the button "Continue".
+gui.residency.info.third=If you do not have a current or former place of residence in Austria, please continue with the button "No residence available".
+
+gui.residency.header.inputinvalid=Be sure to enter a value for Municipality or Village
+gui.residency.cancel=Cancel
+gui.residency.back=No residence available
+gui.residency.search=Search
+gui.residency.clear=Clear
+gui.residency.proceed=Continue
+gui.residency.updated=Updated your input
+gui.residency.found=Found {0} results, click on one result to refine your search
+gui.residency.unique=Unique result found, please proceed
+gui.residency.error=Error on Backend Call
+gui.residency.input.postleitzahl=Postcode
+gui.residency.input.municipality=Municipality
+gui.residency.input.village=Village
+gui.residency.input.street=Street
+gui.residency.input.number=Number
+
diff --git a/basicConfig/ms-connector/properties/messages_de.properties b/basicConfig/ms-connector/properties/messages_de.properties
new file mode 100644
index 00000000..76624ebe
--- /dev/null
+++ b/basicConfig/ms-connector/properties/messages_de.properties
@@ -0,0 +1,161 @@
+####### GUI elements ####
+gui.general.language.selection.title=Sprachauswahl
+gui.general.language.selection.de=Deutsch
+gui.general.language.selection.en=English
+
+##Errorpage template
+gui.errorpage.msg.title=Es ist ein Fehler aufgetreten
+gui.errorpage.msg.information=Der Anmeldevorgang wurde aufgrund eines Fehlers beendet:
+gui.errorpage.msg.errorcode=Fehlercode:
+gui.errorpage.msg.errormsg=Fehlermeldung:
+gui.errorpage.msg.stacktrace=Stacktrace:
+
+##Country-Selection page
+gui.countryselection.title=eIDAS-Login Länderauswahl
+gui.countryselection.logo.bmi.alt=Logo BMI
+gui.countryselection.link.bmi=Startseite BMI
+gui.countryselection.header1=Bundesministerium für Inneres
+gui.countryselection.header2=Zentraler eIDAS Knoten der Republik Österreich
+gui.countryselection.header3=Betrieben durch das Bundesministerium für Inneres
+gui.countryselection.header.selection=Wählen Sie Ihr Land
+gui.countryselection.cancel=Abbrechen
+gui.countryselection.cancle=Abbrechen
+gui.countryselection.notsupportedinfo=Wenn Sie Ihr Land in dieser Aufzählung nicht entdecken, dann wird Ihre elektronische Identität (eID) leider noch nicht unterstützt.
+
+gui.countryselection.infos.general.header=Information zur Anmeldung über Europäische eIDs
+gui.countryselection.infos.general.link.1=eIDAS-Verordnung der Europäischen Union
+gui.countryselection.infos.general.link.2=Ergänzungsregister für natürliche Personen (ERnP)
+gui.countryselection.infos.general.part.1=Sie befinden sich am zentralen eIDAS-Knoten der Republik Österreich. Dieser wird vom Österreichischen
+gui.countryselection.infos.general.part.2=betrieben und ermöglicht eine Anmeldungen zu österreichischen Online-Anwendungen unter Verwendung einer elektronischen Identität (eID) anderer EU-Mitgliedstaaten. Sie wurden hierher weitergeleitet, da Sie in einer Online-Anwendung eine Anmeldung via EU-Login initiiert haben.
+gui.countryselection.infos.general.part.3=Der zentrale eIDAS-Knoten der Republik Österreich ermöglicht Ihnen eine Anmeldung zu österreichischen Online-Anwendungen mit der eID Ihres Herkunftsstaates. Damit werden die Vorgaben der
+gui.countryselection.infos.general.part.4=erfüllt, die eine staatenübergreifende Akzeptanz nationaler eIDs vorsieht. Die wechselseitige Anerkennung nationaler eIDs erfolgt in der EU schrittweise. Aktuell unterstützt der zentrale eIDAS-Knoten der Republik Österreich Anmeldungen mit den eID-Systemen der oben angeführten Mitgliedstaaten. Diese Liste wird laufend erweitert.
+gui.countryselection.infos.general.part.5=Nachdem Sie auf dieser Seite einen Mitgliedsstaat ausgewählt haben, werden Sie an die gewohnte Anmeldeumgebung des jeweiligen Mitgliedsstaats weitergeleitet. Dort können Sie sich mit Ihrer eID wie gewohnt anmelden. Haben Sie den Anmeldeprozess erfolgreich abgeschlossen, werden Sie automatisch an die Online-Anwendung, von der aus Sie auf diese Auswahlseite gelangt sind, weitergeleitet und dort mit den Identitätsdaten Ihrer eID angemeldet. Gleichzeitig werden Sie bei Ihrer ersten Anmeldung auf diesem Weg mit Ihren eID-Daten in das österreichische
+gui.countryselection.infos.general.part.6=eingetragen. Damit wird sichergestellt, dass Sie auch im Rahmen zukünftiger Anmeldeprozesse zu österreichischen Online-Anwendungen erfolgreich und eindeutig identifiziert werden können.
+
+
+gui.countryselection.country.be=Belgien
+gui.countryselection.country.be.logo.alt=Belgische-eID
+gui.countryselection.country.hr=Kroatien
+gui.countryselection.country.hr.logo.alt=Kroatische-eID
+gui.countryselection.country.cy=Zypern
+gui.countryselection.country.cy.logo.alt=Zypriotische-eID
+gui.countryselection.country.cz=Tschechische Republik
+gui.countryselection.country.cz.logo.alt=Tschechische Republik-eID
+gui.countryselection.country.ee=Estland
+gui.countryselection.country.ee.logo.alt=Estländische-eID
+gui.countryselection.country.de=Deutschland
+gui.countryselection.country.de.logo.alt=Deutsche-eID
+gui.countryselection.country.is=Island
+gui.countryselection.country.is.logo.alt=Isländische-eID
+gui.countryselection.country.it=Italien
+gui.countryselection.country.it.logo.alt=Italienische-eID
+gui.countryselection.country.lt=Litauen
+gui.countryselection.country.lt.logo.alt=Litauische-eID
+gui.countryselection.country.lv=Lettland
+gui.countryselection.country.lv.logo.alt=Lettische-eID
+gui.countryselection.country.nl=Niederlande
+gui.countryselection.country.nl.logo.alt=Niederländische-eID
+gui.countryselection.country.pl=Polen
+gui.countryselection.country.pl.logo.alt=Polnische-eID
+gui.countryselection.country.pt=Portugal
+gui.countryselection.country.pt.logo.alt=Portugisische-eID
+gui.countryselection.country.si=Slowenien
+gui.countryselection.country.si.logo.alt=Slowenische-eID
+gui.countryselection.country.es=Spanien
+gui.countryselection.country.es.logo.alt=Spanische-eID
+
+gui.countryselection.country.bg=Bulgarien
+gui.countryselection.country.bg.logo.alt=Bulgarische-eID
+gui.countryselection.country.dk=Dänemark
+gui.countryselection.country.dk.logo.alt=Dänische-eID
+gui.countryselection.country.fi=Finnland
+gui.countryselection.country.fi.logo.alt=Finische-eID
+gui.countryselection.country.fr=Frankreich
+gui.countryselection.country.fr.logo.alt=Französiche-eID
+gui.countryselection.country.gr=Griechenland
+gui.countryselection.country.gr.logo.alt=Griechische-eID
+gui.countryselection.country.hu=Ungarn
+gui.countryselection.country.hu.logo.alt=Ungarische-eID
+gui.countryselection.country.ir=Irland
+gui.countryselection.country.ir.logo.alt=Irische-eID
+gui.countryselection.country.lu=Luxemburg
+gui.countryselection.country.lu.logo.alt=Luxemburgische-eID
+gui.countryselection.country.mt=Malta
+gui.countryselection.country.mt.logo.alt=Malta-eID
+gui.countryselection.country.ro=Rumänien
+gui.countryselection.country.ro.logo.alt=Rumänische-eID
+gui.countryselection.country.sk=Slowakei
+gui.countryselection.country.sk.logo.alt=Slowakische-eID
+gui.countryselection.country.sw=Schweden
+gui.countryselection.country.sw.logo.alt=Schwedische-eID
+gui.countryselection.country.uk=Großbritannien
+gui.countryselection.country.uk.logo.alt=Britische-eID
+
+gui.countryselection.country.testcountry=Testland
+gui.countryselection.country.testcountry.logo.alt=Testland-eID
+
+gui.countryselection.mode.prod=Produktion
+gui.countryselection.mode.qs=Qualitätsicherung
+gui.countryselection.mode.test=Test
+gui.countryselection.mode.dev=Development
+
+
+##### Matching operations
+##Other Login Methods page
+gui.otherlogin.title=eIDAS-Login Alternative Anmeldemethoden
+gui.otherlogin.header.selection=Personendaten nicht gefunden
+gui.otherlogin.button.hs=ID Austria
+gui.otherlogin.button.eidas=Alternativer eIDAS Login
+gui.otherlogin.button.none=Keine alternative Anmeldemöglichkeit
+gui.otherlogin.button.inserternp=Eine neue österreichische Identity auf Basis meiner eIDAS Daten erzeugen
+gui.otherlogin.cancel=Abbrechen
+
+gui.otherlogin.info.first=Ihre Personendaten aus dem eben erfolgten EU-Login konnten in den Registern der österreichischen Verwaltung keinem Registereintrag eindeutig zugeordnet werden. Das kann daran liegen, dass Sie in den Registern bisher nicht eingetragen sind, oder ihre aktuellen Anmeldedaten nicht vollständig mit den in den Registern hinterlegten Daten zu Ihrer Person übereinstimmen.
+gui.otherlogin.info.second=Sie haben folgende Möglichkeiten, um eine korrekte Zuordnung zu erreichen:
+gui.otherlogin.info.list.1=Wenn Sie über eine österreichische ID Austria (oder Handy-Signatur) oder über eine alternative Möglichkeit eines EU-Logins verfügen, melden Sie sich mit diesen bitte erneut an. Verwenden Sie dazu bitte die entsprechende Schaltfläche „ID Austria“ oder „Alternativer EU-Login“.
+gui.otherlogin.info.list.2=Verfügen Sie über keine der beiden oben genannten zusätzlichen Anmeldemöglichkeiten, setzen Sie bitte über die Schaltfläche „Keine alternative Anmeldemöglichkeit“ fort
+
+gui.otherlogin.inserternp.header.selection=Neueintragung
+gui.otherlogin.inserternp.first=Ihre Personendaten konnten in den Registern der österreichischen Verwaltung keinem Eintrag eindeutig zugeordnet werden.
+gui.otherlogin.inserternp.second=Erlauben Sie die Neueintragung ihrer Personendaten in den Registern der österreichischen Verwaltung, um den Anmeldevorgang erfolgreich abzuschließen.
+gui.otherlogin.inserternp.third.prefix=Achtung: Wenn Sie der Meinung sind, in den Registern der österreichischen Verwaltung bereits einen Eintrag zu haben, wird empfohlen, an dieser Stelle keine Neueintragung Ihrer Daten zu erlauben, um doppelte Einträge zu verhindern. Kontaktieren Sie in diesem Fall bitte
+gui.otherlogin.inserternp.third.postfix=, um eine manuelle Zuordnung der Daten zu veranlassen.
+
+module.eidasauth.matching.04=Während der Kommunikation mit einem offiziellen Register ist ein Fehler aufgetreten. Bitte kontaktieren Sie den Support.
+module.eidasauth.matching.21=Das Matching auf Basis eine Wohnanschrift in Österreich schlug fehl. Es wurden nicht alle erforderlichen Parameter für eine Suche mittels Wohnanschrift eingegeben.
+module.eidasauth.matching.22=Das Matching auf Basis eine Wohnanschrift in Österreich schlug fehl. Matching auf Basis einer bestanden oder bestehenden Wohnanschrift konnte nicht durchgeführt werden.
+module.eidasauth.matching.23=Matching auf Basis eines ID Autria wurde abgebrochen. Nutzen Sie eine andere Matchingmethode.
+module.eidasauth.matching.24=Matching auf Basis eines ID Autria schlug fehl. Nutzen Sie eine andere Matchingmethode.
+module.eidasauth.matching.25=Matching auf Basis einer alternativen eIDAS Anmeldung schlug fehl. Stellen Sie weitere Informationen bereit oder nutzen Sie eine andere Matchingmethode.
+module.eidasauth.matching.26=Matching auf Basis einer alternativen eIDAS Anmeldung schlug fehl, da sich entweder der Name oder das Quelland unterscheidet. Stellen Sie weitere Informationen bereit oder nutzen Sie eine andere Matchingmethode.
+module.eidasauth.matching.99=Matching schlug Aufgrund eines internen Fehler fehl. Ursache: {0}
+
+
+##Austrian Residency page
+gui.residency.title=Österreichischer Wohnsitz
+gui.residency.header.selection=Suche nach Österreichischem Wohnsitz
+gui.residency.header.help=Hier können Sie nach einem Wohnsitze in Österreich suchen. Bitte geben Sie zuerst eine \
+ Postleitzahl, Gemeinde oder Ortschaft ein um die Suche zu starten.
+
+gui.residency.info.first=Haben Sie einen aktuellen oder ehemaligen gemeldeten Wohnsitz in Österreich, kann eine Zuordnung zu Ihrem bestehenden Registereintrag über Eingabe der Wohnsitzdaten erfolgen. Bitte benutzen Sie das untenstehende Formular, um Ihre Wohnsitzdaten einzugeben.
+gui.residency.info.second=Bitte geben Sie dazu zuerst eine Postleitzahl, Gemeinde oder Ortschaft ein und starten Sie die Suche Ihrer Wohnsitzadresse dann über die Schaltfläche „Suche“. Sie werden in weiterer Folge bei der Vervollständigung der Wohnsitzadresse interaktiv unterstützt. Folgen Sie dazu den Anweisungen im Formular. Über die Schaltfläche „Löschen“ können Sie den Suchvorgang jederzeit neu starten. Wurden alle Wohnsitzdaten über die Suchfunktion vollständig befüllt, setzen Sie bitte über die Schaltfläche „Fortfahren“ fort.
+gui.residency.info.third=Haben sie keinen aktuellen oder ehemaligen Wohnsitz in Österreich, setzen Sie bitte über die Schaltfläche „Kein Wohnsitz vorhanden“ fort.
+
+gui.residency.header.inputinvalid=Bitte geben Sie einen Wert für Gemeinde oder Ortschaft ein
+gui.residency.cancel=Abbrechen
+gui.residency.back=Kein Wohnsitz vorhanden
+gui.residency.search=Suche
+gui.residency.clear=Löschen
+gui.residency.proceed=Fortfahren
+gui.residency.updated=Eingabe aktualisiert
+gui.residency.found={0} Ergebnisse gefunden, klicken Sie auf ein Ergebnis um die Suche zu verfeinern
+gui.residency.unique=Eindeutiges Ergebnis gefunden, bitte fortfahren
+gui.residency.error=Fehler bei Addresssuche
+gui.residency.input.postleitzahl=PLZ
+gui.residency.input.municipality=Gemeinde
+gui.residency.input.village=Ortschaft
+gui.residency.input.street=Straße
+gui.residency.input.number=Nummer
+
+
+
diff --git a/basicConfig/ms-connector/templates/countrySelection.html b/basicConfig/ms-connector/templates/countrySelection.html
new file mode 100644
index 00000000..275d20f6
--- /dev/null
+++ b/basicConfig/ms-connector/templates/countrySelection.html
@@ -0,0 +1,133 @@
+
+
+