refactor(connector): move MS-Connector from new directory 'connector' to 'ms_specific_connector'

20 files changed, 0 insertions, 1634 deletions

diff --git a/connector/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider b/connector/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider
deleted file mode 100644
index 4c2aef74..00000000
--- a/connector/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider
+++ /dev/null
@@ -1 +0,0 @@
-at.asitplus.eidas.specific.connector.MsSpecificEidasNodeSpringResourceProvider
\ No newline at end of file
diff --git a/connector/src/main/resources/META-INF/services/at.gv.egiz.eaaf.core.api.idp.IAttributeBuilder b/connector/src/main/resources/META-INF/services/at.gv.egiz.eaaf.core.api.idp.IAttributeBuilder
deleted file mode 100644
index 8508cc4b..00000000
--- a/connector/src/main/resources/META-INF/services/at.gv.egiz.eaaf.core.api.idp.IAttributeBuilder
+++ /dev/null
@@ -1,2 +0,0 @@
-at.asitplus.eidas.specific.connector.attributes.AuthBlockAttributeBuilder
-at.asitplus.eidas.specific.connector.attributes.EidasBindAttributeBuilder
diff --git a/connector/src/main/resources/META-INF/services/at.gv.egiz.eaaf.core.api.idp.auth.modules.AuthModule b/connector/src/main/resources/META-INF/services/at.gv.egiz.eaaf.core.api.idp.auth.modules.AuthModule
deleted file mode 100644
index 146191c0..00000000
--- a/connector/src/main/resources/META-INF/services/at.gv.egiz.eaaf.core.api.idp.auth.modules.AuthModule
+++ /dev/null
@@ -1 +0,0 @@
-at.asitplus.eidas.specific.connector.processes.CountrySelectionProcessImpl
\ No newline at end of file
diff --git a/connector/src/main/resources/application.properties b/connector/src/main/resources/application.properties
deleted file mode 100644
index 700f4d74..00000000
--- a/connector/src/main/resources/application.properties
+++ /dev/null
@@ -1,288 +0,0 @@
-## Set Spring-Boot profile-configuration to 2.3 style
-spring.config.use-legacy-processing=true
-
-## ApplicationServer configuration 
-server.servlet.contextPath=/ms_connector
-#server.port=7080
-
-app.build.artifactId=ms_connector
-
-
-
-#############################################################################
-## SpringBoot Admin client
-spring.boot.admin.client.enabled=false
-
-#############################################################################
-## SpringBoot Actuator
-management.endpoints.web.exposure.include=health,info
-
-#############################################################################
-## Common parts of MS-speccific eIDAS application configuration
-
-#eidas.ms.context.url.prefix=
-eidas.ms.context.url.request.validation=false
-#eidas.ms.configRootDir=file:/.../config/
-eidas.ms.context.use.clustermode=true
-eidas.ms.core.logging.level.info.errorcodes=auth.21
-
-##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
-
-
-##Directory for static Web content
-eidas.ms.webcontent.static.directory=webcontent/
-eidas.ms.webcontent.templates=templates/
-eidas.ms.webcontent.properties=properties/messages
-eidas.ms.webcontent.templates.countryselection=countrySelection.html
-
-
-## extended validation of pending-request Id's
-eidas.ms.core.pendingrequestid.maxlifetime=300
-eidas.ms.core.pendingrequestid.digist.algorithm=HmacSHA256
-#eidas.ms.core.pendingrequestid.digist.secret=pendingReqIdSecret
-
-
-## HTTP-client defaults
-eidas.ms.client.http.connection.timeout.socket=15
-eidas.ms.client.http.connection.timeout.connection=15
-eidas.ms.client.http.connection.timeout.request=15
-
-
-## Common PVP2 S-Profile (SAML2) configuration
-#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
-
-##only for advanced config
-eidas.ms.configuration.pvp.scheme.validation=true
-eidas.ms.configuration.pvp.enable.entitycategories=false
-
-
-
-#############################################################################
-## MS-speccific eIDAS-Connector configuration
-
-## eIDAS Ref. Implementation connector ###
-eidas.ms.auth.eIDAS.node_v2.entityId=ownSpecificConnector
-eidas.ms.auth.eIDAS.eid.testidentity.default=false
-
-#eidas.ms.auth.eIDAS.node_v2.forward.endpoint=
-eidas.ms.auth.eIDAS.node_v2.forward.method=POST
-eidas.ms.auth.eIDAS.node_v2.countrycode=AT
-eidas.ms.auth.eIDAS.node_v2.publicSectorTargets=urn:publicid:gv.at:cdid\+.*
-
-## use SAML2 requestId as transactionIdentifier to mitigate problems with SAML2 relaystate
-eidas.ms.auth.eIDAS.node_v2.workarounds.useRequestIdAsTransactionIdentifier=true
-
-## use hashed version of unique SP-Identifier as requesterId
-eidas.ms.auth.eIDAS.node_v2.requesterId.useHashedForm=true
-
-## user static requesterId for all SP's in case of LU
-eidas.ms.auth.eIDAS.node_v2.requesterId.lu.useStaticRequesterForAll=true
-
- 
-## set provider name for all public SPs
-eidas.ms.auth.eIDAS.node_v2.workarounds.addAlwaysProviderName=false
-
-## set NameIdPolicy to 'unspecified' as work-around for DE Middleware v1.2.x
-eidas.ms.auth.eIDAS.node_v2.requested.nameIdFormat=urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
-
-eidas.ms.auth.eIDAS.node_v2.loa.requested.minimum=http://eidas.europa.eu/LoA/high
-
-#eidas.ms.auth.eIDAS.szrclient.useTestService=true
-#eidas.ms.auth.eIDAS.szrclient.endpoint.prod=
-#eidas.ms.auth.eIDAS.szrclient.endpoint.test=http://localhost:1234/demoszr
-#eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.type=jks
-#eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.path=keys/junit.jks
-#eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.password=password
-#eidas.ms.auth.eIDAS.szrclient.ssl.key.alias=
-#eidas.ms.auth.eIDAS.szrclient.ssl.key.password=
-
-#eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.type=
-#eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.path=
-#eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.password=
-eidas.ms.auth.eIDAS.szrclient.timeout.connection=15
-eidas.ms.auth.eIDAS.szrclient.timeout.response=30
-eidas.ms.auth.eIDAS.szrclient.params.vkz=
-
-eidas.ms.auth.eIDAS.szrclient.params.useSZRForbPKCalculation=false
-eidas.ms.auth.eIDAS.szrclient.eidasbind.mds.inject=false
-
-
-# tech. AuthBlock signing for E-ID process
-#eidas.ms.auth.eIDAS.authblock.keystore.password=f/+saJBc3a}*/T^s
-#eidas.ms.auth.eIDAS.authblock.keystore.friendlyName=connectorkeypair
-#eidas.ms.auth.eIDAS.authblock.keystore.path=keys/teststore.jks
-#eidas.ms.auth.eIDAS.authblock.keystore.type=jks
-#eidas.ms.auth.eIDAS.authblock.key.alias=connectorkeypair
-#eidas.ms.auth.eIDAS.authblock.key.password=f/+saJBc3a}*/T^s
-
-
-
-#### matching######
-# ZMR communication
-#eidas.ms.auth.eIDAS.zmrclient.endpoint=http://localhost:1234/demozmr
-#eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.type=jks
-#eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.path=keys/junit.jks
-#eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.password=password
-#eidas.ms.auth.eIDAS.zmrclient.ssl.key.alias=
-#eidas.ms.auth.eIDAS.zmrclient.ssl.key.password=
-
-#eidas.ms.auth.eIDAS.zmrclient.ssl.trustStore.type=
-#eidas.ms.auth.eIDAS.zmrclient.ssl.trustStore.path=
-#eidas.ms.auth.eIDAS.zmrclient.ssl.trustStore.password=
-
-eidas.ms.auth.eIDAS.zmrclient.timeout.connection=15
-eidas.ms.auth.eIDAS.zmrclient.timeout.response=30
-
-#eidas.ms.auth.eIDAS.zmrclient.req.organisation.behoerdennr=jUnit123456
-eidas.ms.auth.eIDAS.zmrclient.req.update.reason.code=PERS_AENDERN
-eidas.ms.auth.eIDAS.zmrclient.req.update.reason.text=KITT for eIDAS Matching
-eidas.ms.auth.eIDAS.zmrclient.debug.logfullmessages=false
-
-
-# ERnP communication
-#eidas.ms.auth.eIDAS.ernpclient.endpoint=http://localhost:1718/demoernp
-#eidas.ms.auth.eIDAS.ernpclient.req.organisation.behoerdennr=jUnit123456
-#eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.type=jks
-#eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.path=../keystore/junit_test.jks
-#eidas.ms.auth.eIDAS.ernpclient.ssl.keyStore.password=password
-#eidas.ms.auth.eIDAS.ernpclient.ssl.key.alias=meta
-#eidas.ms.auth.eIDAS.ernpclient.ssl.key.password=password
-
-# SAML2 ID Austria client for matching
-#eidas.ms.modules.idaustriaclient.keystore.type=jks
-#eidas.ms.modules.idaustriaclient.keystore.path=
-#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=
-#eidas.ms.modules.idaustriaclient.truststore.password=
-
-#eidas.ms.modules.idaustriaclient.idaustria.idp.entityId=
-#eidas.ms.modules.idaustriaclient.idaustria.idp.metadataUrl=
-
-
-
-
-
-#Raw eIDAS Id data storage
-eidas.ms.auth.eIDAS.szrclient.workarounds.eidmapping.revisionlog.active=true
-eidas.ms.auth.eIDAS.szrclient.workarounds.use.getidentitylink.for.ida=true
-
-eidas.ms.auth.eIDAS.szrclient.params.setPlaceOfBirthIfAvailable=true
-eidas.ms.auth.eIDAS.szrclient.params.setBirthNameIfAvailable=true
-
-eidas.ms.auth.eIDAS.szrclient.debug.logfullmessages=false
-eidas.ms.auth.eIDAS.szrclient.debug.useDummySolution=false
-
-
-##without mandates
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.0=PersonIdentifier,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.1=FamilyName,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.2=FirstName,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.onlynatural.3=DateOfBirth,true
-
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.4=PlaceOfBirth,false
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.5=BirthName,false
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.6=Gender,false
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.de.onlynatural.7=CurrentAddress,false
-
-##with mandates ---- NOT FULLY SUPPORTED AT THE MOMENT -----
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.0=PersonIdentifier,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.1=FamilyName,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.2=FirstName,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.3=DateOfBirth,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.4=LegalPerson,true
-eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.5=LegalName,true
-
-
-## PVP2 S-Profile end-point configuration
-#eidas.ms.pvp2.keystore.type=jks
-#eidas.ms.pvp2.keystore.path=keys/junit.jks
-#eidas.ms.pvp2.keystore.password=password
-#eidas.ms.pvp2.key.metadata.alias=meta
-#eidas.ms.pvp2.key.metadata.password=password
-#eidas.ms.pvp2.key.signing.alias=sig
-#eidas.ms.pvp2.key.signing.password=password
-eidas.ms.pvp2.metadata.validity=24
-
-
-## Service Provider configuration
-#eidas.ms.sp.0.uniqueID=https://demo.egiz.gv.at/demoportal_moaid-2.0/sp/eidas/metadata
-#eidas.ms.sp.0.pvp2.metadata.truststore=keys/junit.jks
-#eidas.ms.sp.0.pvp2.metadata.truststore.password=password
-#eidas.ms.sp.0.friendlyName=jUnit test
-#eidas.ms.sp.0.pvp2.metadata.url=
-#eidas.ms.sp.0.policy.allowed.requested.targets=.*
-#eidas.ms.sp.0.policy.hasBaseIdTransferRestriction=false
-
-
-##only for advanced config
-eidas.ms.configuration.sp.disableRegistrationRequirement=false
-
-
-
-#############################################################################
-## MS-speccific eIDAS-Proxy-Service configuration
-
-#### eIDAS ms-specific Proxy-Service configuration
-eidas.ms.auth.eIDAS.node_v2.proxy.entityId=ownSpecificProxy
-#eidas.ms.auth.eIDAS.node_v2.proxy.forward.endpoint=
-
-# Mandate configuration
-eidas.ms.auth.eIDAS.proxy.mandates.enabled=false
-#eidas.ms.auth.eIDAS.proxy.mandates.profiles.natural.default=
-#eidas.ms.auth.eIDAS.proxy.mandates.profiles.legal.default=
-
-
-## special foreign eIDAS-Connector configuration
-#eidas.ms.connector.0.uniqueID=https://demo.egiz.gv.at/demoportal_moaid-2.0/sp/eidas/metadata
-#eidas.ms.connector.0.countryCode=CC
-#eidas.ms.connector.0.mandates.enabled=false
-#eidas.ms.connector.0.mandates.natural=
-#eidas.ms.connector.0.mandates.legal=
-#eidas.ms.connector.0.auth.idaustria.entityId=
-
-
-## PVP2 S-Profile communication with ID Austria System 
-# EntityId and optional metadata of ID Austria System
-#eidas.ms.modules.idaustriaauth.idp.entityId=
-#eidas.ms.modules.idaustriaauth.idp.metadataUrl=
-
-# SAML2 client configuration
-eidas.ms.modules.idaustriaauth.keystore.type=jks
-#eidas.ms.modules.idaustriaauth.keystore.name=
-#eidas.ms.modules.idaustriaauth.keystore.path=
-#eidas.ms.modules.idaustriaauth.keystore.password=
-#eidas.ms.modules.idaustriaauth.metadata.sign.alias=
-#eidas.ms.modules.idaustriaauth.metadata.sign.password=
-#eidas.ms.modules.idaustriaauth.request.sign.alias=
-#eidas.ms.modules.idaustriaauth.request.sign.password=
-#eidas.ms.modules.idaustriaauth.response.encryption.alias=
-#eidas.ms.modules.idaustriaauth.response.encryption.password=
-
-# TrustStore to validate SAML2 metadata from ID Austria 
-#eidas.ms.modules.idaustriaauth.truststore.type=jks
-#eidas.ms.modules.idaustriaauth.truststore.name=
-#eidas.ms.modules.idaustriaauth.truststore.path=
-#eidas.ms.modules.idaustriaauth.truststore.password=
-
-
-
diff --git a/connector/src/main/resources/applicationContext.xml b/connector/src/main/resources/applicationContext.xml
deleted file mode 100644
index 5c5e245c..00000000
--- a/connector/src/main/resources/applicationContext.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xmlns:mvc="http://www.springframework.org/schema/mvc"
-  xsi:schemaLocation="
-    http://www.springframework.org/schema/beans 
-    http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://www.springframework.org/schema/context 
-    http://www.springframework.org/schema/context/spring-context.xsd
-    http://www.springframework.org/schema/mvc
-    http://www.springframework.org/schema/mvc/spring-mvc.xsd
-    http://www.springframework.org/schema/tx
-    http://www.springframework.org/schema/tx/spring-tx.xsd">
-
-  <context:annotation-config />
-  <context:component-scan base-package="at.gv.egiz.eaaf.utils.springboot.ajp"/>
-    
-  <mvc:interceptors>
-    <bean
-      class="at.asitplus.eidas.specific.core.interceptor.WebFrontEndSecurityInterceptor" />
-    <bean
-      class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor">
-      <property name="paramName" value="lang" />
-    </bean>
-  </mvc:interceptors>
-
-  <bean id="springContextClosingHandler"
-        class="at.asitplus.eidas.specific.core.SpringContextCloseHandler" />
-
-  <bean class="at.asitplus.eidas.specific.core.controller.DataBinderControllerAdvice" />
-
-  <beans profile="deprecatedConfig">
-  <bean id="BasicMSSpecificNodeConfig"
-    class="at.asitplus.eidas.specific.core.config.BasicConfigurationProvider">
-    <constructor-arg value="#{systemProperties['eidas.ms.configuration']}" />
-  </bean>
-  </beans>
-  <beans profile="!deprecatedConfig">
-    <bean id="springBootMsSpecificNodeConfig"
-          class="at.asitplus.eidas.specific.core.config.SpringBootBasicConfigurationProvider" />
-          
-  </beans>
-
-</beans>
diff --git a/connector/src/main/resources/logback.xml b/connector/src/main/resources/logback.xml
deleted file mode 100644
index 9679d9e4..00000000
--- a/connector/src/main/resources/logback.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user -->
-<!-- -->
-<!-- For professional support please see -->
-<!-- http://www.qos.ch/shop/products/professionalSupport -->
-<!-- -->
-<configuration>
-  <appender name="console"
-    class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %20c | %10t | %m%n</pattern>
-    </encoder>
-  </appender>
-  <logger name="at.gv.egiz.eaaf" level="info">
-    <appender-ref ref="console" />
-  </logger>
-  <logger name="eu.eidas" additivity="false" level="info">
-    <appender-ref ref="console" />
-  </logger>
-  <logger name="at.gv.egiz.eidas.specific" additivity="false"
-    level="info">
-    <appender-ref ref="console" />
-  </logger>
-  <root level="info">
-    <appender-ref ref="console" />
-  </root>
-</configuration>
diff --git a/connector/src/main/resources/processes/CountrySelection.process.xml b/connector/src/main/resources/processes/CountrySelection.process.xml
deleted file mode 100644
index 9c76e9a9..00000000
--- a/connector/src/main/resources/processes/CountrySelection.process.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pd:ProcessDefinition id="CountrySelectionProcess"
-  xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1">
-
-  <pd:Task  id="initializeCountrySelection"
-            class="GenerateCountrySelectionFrameTask" />
-  <pd:Task  id="parseCountrySelection"
-            class="EvaluateCountrySelectionTask" async="true" />
-  <pd:Task  id="restartAuthProzessManagement"
-            class="RestartAuthProzessManagement" />
-
-  <pd:StartEvent id="start" />
-  
-  <pd:Transition  from="start"
-                  to="initializeCountrySelection" />
-  <pd:Transition  from="initializeCountrySelection"
-                  to="parseCountrySelection" />
-
-  <pd:Transition  from="parseCountrySelection"
-                  to="initializeCountrySelection"
-                  conditionExpression="ctx['changeLanguage']" />
-  <pd:Transition  from="parseCountrySelection"
-                  to="restartAuthProzessManagement" />
-  <pd:Transition  from="restartAuthProzessManagement"
-                  to="end" />
-  
-  <pd:EndEvent id="end" />
-
-</pd:ProcessDefinition>
diff --git a/connector/src/main/resources/properties/external_statuscodes_map.properties b/connector/src/main/resources/properties/external_statuscodes_map.properties
deleted file mode 100644
index a0951dfb..00000000
--- a/connector/src/main/resources/properties/external_statuscodes_map.properties
+++ /dev/null
@@ -1,76 +0,0 @@
-eidas.00=1302 
-eidas.01=1302 
-eidas.02=1301
-eidas.03=1300
-eidas.04=1100
-eidas.05=1302
-eidas.06=1302
-eidas.07=1302
-
-config.01=9099
-config.03=9099
-config.18=9099
-config.24=9099
-
-
-ernb.00=4601
-ernb.01=4601
-ernb.02=4600
-ernb.03=4602
-
-auth.00=1100     
-
-auth.21=1005
-auth.26=1100
-auth.28=1100  
-
-auth.37=1101
-auth.38=1101
-auth.39=1099
-
-process.01=9105
-process.02=9104
-process.03=9104
-process.04=9105
-
-builder.00=9102
-builder.11=1099
-
-parser.01=1101
-
-gui.00=9103
-
-pvp2.01=6100
-pvp2.02=6100
-pvp2.05=6105
-pvp2.07=6104
-pvp2.09=6199
-pvp2.10=6100
-pvp2.11=6105
-pvp2.12=6105 
-pvp2.13=6199
-pvp2.14=6199
-pvp2.15=6103
-pvp2.16=6101
-pvp2.17=6102   
-pvp2.20=6103
-pvp2.21=6104
-pvp2.22=6105
-pvp2.23=6105
-pvp2.24=6105
-pvp2.26=6103
-pvp2.27=6199
-pvp2.28=6105
-
-
-internal.00=9105 
-internal.01=9199
-internal.02=9101
-internal.03=9199
-internal.04=9101
-internal.05=9106
-internal.06=9106
-
-config.08=9008
-config.27=9008
-config.30=9008 
\ No newline at end of file
diff --git a/connector/src/main/resources/properties/messages.properties b/connector/src/main/resources/properties/messages.properties
deleted file mode 100644
index a2aaf95d..00000000
--- a/connector/src/main/resources/properties/messages.properties
+++ /dev/null
@@ -1,131 +0,0 @@
-####### 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 arise
-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 Countryselection
-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.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.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
-<<<<<<< HEAD
-gui.countryselection.country.li=Lichtenstein
-gui.countryselection.country.li.logo.alt=Lichtensteinische-eID
-=======
->>>>>>> 1ad67c91820de1c7f2b2541f8e39752baac197d2
-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=SSpain
-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.gr=Greece
-gui.countryselection.country.gr.logo.alt=Greece-eID
-gui.countryselection.country.hu=Hungary
-gui.countryselection.country.hu.logo.alt=Hungary-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.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.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
-
-##Other Login Methods page
-gui.otherlogin.title=eIDAS-Login Other Login Methods
-gui.otherlogin.header.selection=Select an alternative login method
-gui.otherlogin.hs=Mobile Signature ("Handy-Signatur")
-gui.otherlogin.eidas=Alternative eIDAS ID
-gui.otherlogin.none=No alternative login methods
-gui.otherlogin.cancel=Cancel
-
-##Austrian Residency page
-gui.residency.title=Austrian Residency
-gui.residency.header.selection=Search for your Austrian Residency
-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.header.inputinvalid=Be sure to enter a value for Municipality or Village
-gui.residency.cancel=Cancel
-gui.residency.search=Search
-gui.residency.clear=Clear
-gui.residency.proceed=Proceed
-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
\ No newline at end of file
diff --git a/connector/src/main/resources/properties/messages_de.properties b/connector/src/main/resources/properties/messages_de.properties
deleted file mode 100644
index 187b7b37..00000000
--- a/connector/src/main/resources/properties/messages_de.properties
+++ /dev/null
@@ -1,132 +0,0 @@
-####### 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.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
-<<<<<<< HEAD
-gui.countryselection.country.li=Lichtenstein
-gui.countryselection.country.li.logo.alt=Lichtensteinische-eID
-=======
->>>>>>> 1ad67c91820de1c7f2b2541f8e39752baac197d2
-gui.countryselection.country.lt=Litauen
-gui.countryselection.country.lt.logo.alt=Litauische-eID
-gui.countryselection.country.lv=Lettland
-gui.countryselection.country.lv.logo.alt=Lettländische-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=Slovenien
-gui.countryselection.country.si.logo.alt=Slovenische-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=Grichenland
-gui.countryselection.country.gr.logo.alt=Grichische-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=Luxenburg
-gui.countryselection.country.lu.logo.alt=Luxenburgische-eID
-gui.countryselection.country.mt=Malta
-gui.countryselection.country.mt.logo.alt=Malta-eID
-gui.countryselection.country.ro=Romänien
-gui.countryselection.country.ro.logo.alt=Romänische-eID
-gui.countryselection.country.sk=Slovakei
-gui.countryselection.country.sk.logo.alt=Slovakische-eID
-gui.countryselection.country.se=Schweden
-gui.countryselection.country.se.logo.alt=Schwedische-eID
-gui.countryselection.country.uk=Großbritanien
-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
-
-##Other Login Methods page
-gui.otherlogin.title=eIDAS-Login Alternative Anmeldemethoden
-gui.otherlogin.header.selection=Wählen Sie eine alternative Anmeldemethode
-gui.otherlogin.hs=Handy-Signatur
-gui.otherlogin.eidas=Alternativer eIDAS Login
-gui.otherlogin.none=Keine
-gui.otherlogin.cancel=Abbrechen
-
-##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.header.inputinvalid=Bitte geben Sie einen Wert für Gemeinde oder Ortschaft ein
-gui.residency.cancel=Abbrechen
-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
\ No newline at end of file
diff --git a/connector/src/main/resources/properties/status_messages_en.properties b/connector/src/main/resources/properties/status_messages_en.properties
deleted file mode 100644
index f07a8705..00000000
--- a/connector/src/main/resources/properties/status_messages_en.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-eidas.00=eIDAS Attribute {0} not found. Can not finish authentication process 
-eidas.01=NO eIDAS response-message found. Can not finish authentication process 
-eidas.02=eIDAS response-message contains an error. ErrorCode: {0}, ErrorMsg: {1}
-eidas.03=No CitizenCountry available. Can not start eIDAS authentication process
-eidas.04=Request contains no sessionToken. Authentication process stops
-eidas.05=Received eIDAS response-message is not valid. Reason: {0}
-eidas.06=LoA from eIDAS response-message {0} does not match to requested LoA
-eidas.07=eIDAS Response attribute-validation FAILED. Attribute:{0} Reason: {1}.
-
-
-config.01=No configuration-file parameter found. Maybe Java SystemD parameter is missing
-config.03=Can not load configuration from path {0} (See logs for more details)
-config.18=Configuration file {0} is not available on filesystem
-config.24=Configuration file {1} does not start with {0} prefix.
-
-
-ernb.00=Receive no identity-link from SZR
-ernb.01=Receive no bPK from SZR
-ernb.02=SZR response contains an error. ErrorMsg: {0}
-ernb.03=Post-processing of eIDAS attributes failed. Reason: {0}
-
-auth.00=Service provider: {0} is unknown   
-auth.21=The authentication process was stopped by user
-auth.26=No transaction identifier
-auth.28=Found no active transaction with Id: {0}. Maybe, the transaction was removed after timeout  
-auth.37=Requested bPK-Target: {0} does not match allowed targets for service provider: {1}
-auth.38=Passive authentication was requested but user as no active session
-auth.39=Error: '{0}' in post-processing of authentication data. Can not finish authentication process
-
-process.01=Can not execute authentication process
-process.02=Find no applicable authentication process for transaction with Id: {0}
-process.03=Can not resume the authentication process. Reason: {0}
-process.04=Can not execute authentication process. Problem with an internal state
-
-builder.00=Can not generate data structure "{0}": {1}
-builder.11=Error: '{0}' in post-processing of authentication data. Can not finish authentication process
-
-parser.01=Error during eID-data processing. Reason: {0}
-
-gui.00=Can not build GUI component. Reason: {0}
-
-pvp2.01=General error during SAML2 response encoding
-pvp2.02=SAML2 attribute contains an wrong encoded value
-pvp2.05=LoA from SAML2 Authn. request: {0} is not supported
-pvp2.07=SAML2 Authn. request contains is not signed
-pvp2.09=SAML2 request contains an unsupported operation. (OperationId: {0})
-pvp2.10=SAML2 Attribute: {0} is not available
-pvp2.11=SAML2 Binding: {0} is not supported
-pvp2.12=SAML2 NameID Format {0} is not supported 
-pvp2.13=Internal server error during SAML2 processing
-pvp2.14=SAML2 authentication not available
-pvp2.15=No SAML2 metadata available or metadata processing failed
-pvp2.16=Encryption of SAML2 assertion failed
-pvp2.17=LoA from SAML2 Authn. request: {1} does not match to authenticated LoA: {0} by using matching-mode: {2}   
-pvp2.20=SAML2 Authn. request contains an unknown or empty EntityID.
-pvp2.21=Signature validation of SAML2 Authn. request failed. Reason: {0}
-pvp2.22=Validation of SAML2 Authn. request failed. Reason: {0}
-pvp2.23=Validation of SAML2 Authn. request failed. Reason: AssertionConsumerServiceURL {0} is not valid.
-pvp2.24=General error during SAML2 Auth. request pre-processing. Reason: {0}
-pvp2.26=SAML2 metadata validation failed. Reason: {0}
-pvp2.27=General error during SAML2 metadata generation
-pvp2.28=Validation of SAML2 Authn. request failed. Reason: AssertionConsumerServiceIndex {0} is not valid.
-
-
-internal.00=The authentication process stops by reason of an internal problem 
-internal.01=The LogOut process stops by reason of an internal problem
-internal.02=Internal error. Can not access data cache.
-internal.03=Internal error. Can not initialize a cryptographic method.
-internal.04=Internal error. Can not access data cache (Reason: {0}).
-internal.05=Internal error. Can not access SQLite database for identity-data storage (Reason: {0}) 
-internal.06=Internal error. Can not query SQLite database for identity-data storage (Reason: {0})
-
-config.08=Configuration value: {0} is missing. 
-config.27=Configuration parameter processing failed. Reason: {0}
-config.30=External configuration not found. File: {0} 
diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
deleted file mode 100644
index 9861a7c6..00000000
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xmlns:tx="http://www.springframework.org/schema/tx"
-  xmlns:aop="http://www.springframework.org/schema/aop"
-  xmlns:mvc="http://www.springframework.org/schema/mvc"
-  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
-    http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-
-  <import resource="specific_eIDAS_core.beans.xml"/>
-
-  <bean id="msConnectorMessageSource"
-        class="at.asitplus.eidas.specific.connector.config.MsConnectorMessageSource" />
-
-  <bean id="processEngineSignalController"
-        class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" />
-
-  <bean id="saml2MetadataGeneration"
-        class="at.asitplus.eidas.specific.connector.health.Saml2MetadataHealthIndicator">
-    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
-  </bean>
-
-  <bean id="PVPEndPointConfiguration"
-        class="at.asitplus.eidas.specific.connector.config.PvpEndPointConfiguration" />
-
-  <bean id="PVPEndPointCredentialProvider"
-        class="at.asitplus.eidas.specific.connector.provider.PvpEndPointCredentialProvider" />
-
-  <bean id="PVPMetadataConfigurationFactory"
-        class="at.asitplus.eidas.specific.connector.provider.PvpMetadataConfigurationFactory" />
-
-  <bean id="pvp2SProfileEndpoint"
-        class="at.asitplus.eidas.specific.connector.controller.Pvp2SProfileEndpoint">
-    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
-    <property name="metadataProvider" ref="PVPMetadataProvider" />
-  </bean>
-
-  <bean id="AuthnRequestValidator"
-        class="at.asitplus.eidas.specific.connector.verification.AuthnRequestValidator" />
-
-  <!-- bean id="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" ref="PVPEndPointCredentialProvider" />
-  </bean>
-
-  <bean id="PVPAuthenticationRequestAction"
-        class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.AuthenticationAction">
-    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
-    <property name="metadataProvider" ref="PVPMetadataProvider" />
-  </bean>
-
-  <bean id="PVPMetadataProvider"
-        class="at.asitplus.eidas.specific.connector.provider.PvpMetadataProvider" />
-
-  <bean id="PVPSubjectNameGenerator"
-        class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" />
-
-  <!-- Tasks -->
-  <bean id="GenerateCountrySelectionFrameTask"
-        class="at.asitplus.eidas.specific.connector.processes.tasks.GenerateCountrySelectionFrameTask"
-        scope="prototype" />
-
-  <bean id="EvaluateCountrySelectionTask"
-        class="at.asitplus.eidas.specific.connector.processes.tasks.EvaluateCountrySelectionTask"
-        scope="prototype" />
-
-</beans>
\ No newline at end of file
diff --git a/connector/src/main/resources/templates/countrySelection.html b/connector/src/main/resources/templates/countrySelection.html
deleted file mode 100644
index 14457210..00000000
--- a/connector/src/main/resources/templates/countrySelection.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="fragments/base"
-      th:with="lang=${#locale.language}" th:lang="${lang}">
-<head>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="../../webapp/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
-    <script type="text/javascript" src="../../webapp/js/js_country.js"
-            th:attr="src=@{/static/js/js_country.js}"></script>
-    <title th:text="#{gui.countryselection.title}">eIDAS-Login Länderauswahl</title>
-</head>
-<body>
-<div class="header container">
-    <div class="titlebar">
-        <div>
-            <a href="https://www.bmi.gv.at/" target="_blank" title="Home">
-                <img class="toplogo img-responsive" src="/static/BMI.png" alt="Logo BMI"
-                     th:attr="alt=#{gui.countryselection.logo.bmi.alt}">
-                <h1 class="hidden" th:text="#{gui.countryselection.header1}"> Bundesministerium für Inneres </h1>
-            </a>
-        </div>
-        <ul class="nav_oben">
-            <li>
-                <div class="languageselection" th:include="language_selection :: selectlanguage">
-                    LanguageSelectionBlock
-                </div>
-            </li>
-            &nbsp; &nbsp;
-            <li><a href="https://www.bmi.gv.at/" target="_blank" th:text="#{gui.countryselection.link.bmi}"> Startseite
-                BMI </a></li>
-        </ul>
-    </div>
-</div>
-<div class="content">
-    <div class="subtitle">
-        <h1 th:text="#{gui.countryselection.header2}"> Zentraler eIDAS Knoten der Republik Österreich </h1>
-        <h2 th:text="#{gui.countryselection.header3}"> Betrieben durch das Bundesministerium für Inneres </h2>
-    </div>
-
-    <h1 th:text="#{gui.countryselection.header.selection}"> Wählen Sie Ihr Land / Select your country </h1>
-
-    <div id="country">
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="../../webapp/img/countries/germany-eu_.png" alt="Germany-eID"
-                    th:attr="src=@{/img/countries/germany-eu_.png},alt=#{gui.countryselection.country.de.logo.alt}"/></a>
-            <input type="submit" role="button" value="Deutschland / Germany"
-                   th:attr="value=#{gui.countryselection.country.de}"/>
-            <input type="hidden" name="selectedCountry" value="DE">
-            <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
-            <select id="testEnvironment" name="selectedEnvironment">
-                <option value="prod" th:text="#{gui.countryselection.mode.prod}">Production</option>
-                <option value="qs" th:text="#{gui.countryselection.mode.qs}">QS</option>
-                <option value="test" th:text="#{gui.countryselection.mode.test}">Testing</option>
-                <option value="dev" th:text="#{gui.countryselection.mode.dev}">Development</option>
-            </select>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="../../webapp/img/countries/Belgium-EU_gray.png" alt="Belgium-eID"
-                    th:attr="src=@{img/countries/Belgium-EU_gray.png},alt=#{gui.countryselection.country.be.logo.alt}"/></a>
-            <input type="submit" value="Belgium" th:attr="value=#{gui.countryselection.country.be}">
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Bulgaria-EU_gray.png"
-                    alt="Bulgaria-eID"
-                    th:attr="src=@{/img/countries/Bulgaria-EU_gray.png},alt=#{gui.countryselection.country.bg.logo.alt}"/></a>
-            <input type="submit" value="Bulgaria" th:attr="value=#{gui.countryselection.country.bg}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="../../webapp/img/countries/Croatia-EU_gray.png" alt="Croatia-eID"
-                    th:attr="src=@{/img/countries/Croatia-EU_gray.png},alt=#{gui.countryselection.country.hr.logo.alt}"/></a>
-            <input type="submit" value="Croatia" th:attr="value=#{gui.countryselection.country.hr}">
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Cyprus-EU_gray.png" alt="Cyprus-eID"
-                    th:attr="src=@{/img/countries/Cyprus-EU_gray.png},alt=#{gui.countryselection.country.cy.logo.alt}"/></a>
-            <input type="submit" value="Cyprus" th:attr="value=#{gui.countryselection.country.cy}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="../../webapp/img/countries/CzechRepublic-EU_gray.png"
-                    alt="CzechRepublic-eID"
-                    th:attr="src=@{/img/countries/CzechRepublic-EU_gray.png},alt=#{gui.countryselection.country.cz.logo.alt}"/></a>
-            <input type="submit" value="CzechRepublic" th:attr="value=#{gui.countryselection.country.cz}">
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Denmark-EU_gray.png" alt="Denmark-eID"
-                    th:attr="src=@{/img/countries/Denmark-EU_gray.png},alt=#{gui.countryselection.country.dk.logo.alt}"/></a>
-            <input type="submit" value="Denmark" th:attr="value=#{gui.countryselection.country.dk}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="../../webapp/img/countries/Estonia-EU_gray.png" alt="Estonia-eID"
-                    th:attr="src=@{/img/countries/Estonia-EU_gray.png},alt=#{gui.countryselection.country.ee.logo.alt}"/></a>
-            <input type="submit" value="Estonia" th:attr="value=#{gui.countryselection.country.ee}">
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Finland-EU_gray.png" alt="Finland-eID"
-                    th:attr="src=@{/img/countries/Finland-EU_gray.png},alt=#{gui.countryselection.country.fi.logo.alt}"/></a>
-            <input type="submit" value="Finland" th:attr="value=#{gui.countryselection.country.fi}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/France-EU_gray.png" alt="France-eID"
-                    th:attr="src=@{/img/countries/France-EU_gray.png},alt=#{gui.countryselection.country.fr.logo.alt}"/></a>
-            <input type="submit" value="France" th:attr="value=#{gui.countryselection.country.fr}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Greece-EU_gray.png" alt="Greece-eID"
-                    th:attr="src=@{/img/countries/Greece-EU_gray.png},alt=#{gui.countryselection.country.gr.logo.alt}"/></a>
-            <input type="submit" value="Greece" th:attr="value=#{gui.countryselection.country.gr}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Hungary-EU_gray.png" alt="Hungary-eID"
-                    th:attr="src=@{/img/countries/Hungary-EU_gray.png},alt=#{gui.countryselection.country.hu.logo.alt}"/></a>
-            <input type="submit" value="Hungary" th:attr="value=#{gui.countryselection.country.hu}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Ireland-EU_gray.png" alt="Ireland-eID"
-                    th:attr="src=@{/img/countries/Ireland-EU_gray.png},alt=#{gui.countryselection.country.ir.logo.alt}"/></a>
-            <input type="submit" value="Ireland" th:attr="value=#{gui.countryselection.country.ir}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="../../webapp/img/countries/Italy-EU_gray.png" alt="Italy-eID"
-                    th:attr="src=@{/img/countries/Italy-EU_gray.png},alt=#{gui.countryselection.country.it.logo.alt}"/></a>
-            <input type="submit" value="Italy" th:attr="value=#{gui.countryselection.country.it}">
-            <select id="testEnvironment" name="selectedEnvironment">
-                <option value="prod" th:text="#{gui.countryselection.mode.prod}">Production</option>
-                <option value="qs" th:text="#{gui.countryselection.mode.qs}">QS</option>
-                <option value="test" th:text="#{gui.countryselection.mode.test}">Testing</option>
-                <option value="dev" th:text="#{gui.countryselection.mode.dev}">Development</option>
-            </select>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Latvia-EU_gray.png" alt="Latvia-eID"
-                    th:attr="src=@{/img/countries/Latvia-EU_gray.png},alt=#{gui.countryselection.country.lv.logo.alt}"/></a>
-            <input type="submit" value="Latvia" th:attr="value=#{gui.countryselection.country.lv}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Luxembourg-EU_gray.png"
-                    alt="Luxembourg-eID"
-                    th:attr="src=@{/img/countries/Luxembourg-EU_gray.png},alt=#{gui.countryselection.country.lu.logo.alt}"/></a>
-            <input type="submit" value="Luxembourg" th:attr="value=#{gui.countryselection.country.lu}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Malta-EU_gray.png" alt="Malta-eID"
-                    th:attr="src=@{/img/countries/Malta-EU_gray.png},alt=#{gui.countryselection.country.mt.logo.alt}"/></a>
-            <input type="submit" value="Malta" th:attr="value=#{gui.countryselection.country.mt}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="../../webapp/img/countries/Poland-EU_gray.png" alt="Poland-eID"
-                    th:attr="src=@{/img/countries/Poland-EU_gray.png},alt=#{gui.countryselection.country.pl.logo.alt}"/></a>
-            <input type="submit" value="Poland" th:attr="value=#{gui.countryselection.country.pl}">
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="../../webapp/img/countries/Portugal-EU_gray.png" alt="Portugal-eID"
-                    th:attr="src=@{/img/countries/Portugal-EU_gray.png},alt=#{gui.countryselection.country.pt.logo.alt}"/></a>
-            <input type="submit" value="Portugal" th:attr="value=#{gui.countryselection.country.pt}">
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Romania-EU_gray.png" alt="Romania-eID"
-                    th:attr="src=@{/img/countries/Romania-EU_gray.png},alt=#{gui.countryselection.country.ro.logo.alt}"/></a>
-            <input type="submit" value="Romania" th:attr="value=#{gui.countryselection.country.ro}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Slovakia-EU_gray.png"
-                    alt="Slovakia-eID"
-                    th:attr="src=@{/img/countries/Slovakia-EU_gray.png},alt=#{gui.countryselection.country.sk.logo.alt}"/></a>
-            <input type="submit" value="Slovakia" th:attr="value=#{gui.countryselection.country.sk}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="../../webapp/img/countries/Slovenia-EU_gray.png" alt="Slovenia-eID"
-                    th:attr="src=@{/img/countries/Slovenia-EU_gray.png},alt=#{gui.countryselection.country.si.logo.alt}"/></a>
-            <input type="submit" value="Slovenia" th:attr="value=#{gui.countryselection.country.si}">
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="../../webapp/img/countries/Spain-EU_gray.png" alt="Spain-eID"
-                    th:attr="src=@{/img/countries/Spain-EU_gray.png},alt=#{gui.countryselection.country.es.logo.alt}"/></a>
-            <input type="submit" value="Spain" th:attr="value=#{gui.countryselection.country.es}">
-            <select id="testEnvironment" name="selectedEnvironment">
-                <option value="prod" th:text="#{gui.countryselection.mode.prod}">Production</option>
-                <option value="qs" th:text="#{gui.countryselection.mode.qs}">QS</option>
-                <option value="test" th:text="#{gui.countryselection.mode.test}">Testing</option>
-                <option value="dev" th:text="#{gui.countryselection.mode.dev}">Development</option>
-            </select>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/Sweden-EU_gray.png" alt="Sweden-eID"
-                    th:attr="src=@{/img/countries/Sweden-EU_gray.png},alt=#{gui.countryselection.country.se.logo.alt}"/></a>
-            <input type="submit" value="Sweden" th:attr="value=#{gui.countryselection.country.se}" disabled>
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="../../webapp/img/countries/TheNetherlands-EU_gray.jpg"
-                    alt="TheNetherlands-eID"
-                    th:attr="src=@{/img/countries/TheNetherlands-EU_gray.jpg},alt=#{gui.countryselection.country.nl.logo.alt}"/></a>
-            <input type="submit" value="Netherlands" th:attr="value=#{gui.countryselection.country.nl}">
-        </form>
-
-        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="../../webapp/img/countries/UnitedKingdom-EU_gray.png"
-                    alt="UnitedKingdom-eID"
-                    th:attr="src=@{/img/countries/UnitedKingdom-EU_gray.png},alt=#{gui.countryselection.country.uk.logo.alt}"/></a>
-            <input type="submit" value="United Kingdom" th:attr="value=#{gui.countryselection.country.uk}" disabled>
-        </form>
-
-    </div>
-
-    <!-- Abbrechen Button -->
-    <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-        <input type="submit" class="btn btn-outline-primary btn-block" value="Abbrechen/Cancel"
-               th:attr="value=#{gui.countryselection.cancel}">
-        <input type="hidden" name="stopAuthProcess" value="true">
-        <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
-    </form>
-
-    <p th:text="#{gui.countryselection.notsupportedinfo}">Wenn Sie Ihr Land in dieser Aufzählung nicht entdecken
-        ... </p>
-
-    <h2 th:text="#{gui.countryselection.infos.general.header}"> Information zur Anmeldung über Europäische eIDs </h2>
-    <p>
-        <span th:text="#{gui.countryselection.infos.general.part.1}"> first part </span>
-        <a href="https://www.bmi.gv.at/" target="_blank" th:text="#{gui.countryselection.header1}"> Bundesministerium
-            für Inneres </a>
-        <span th:text="#{gui.countryselection.infos.general.part.2}"> second part </span>
-    </p>
-
-    <p>
-        <span th:text="#{gui.countryselection.infos.general.part.3}"> third part </span>
-        <a href="https://eur-lex.europa.eu/legal-content/DE/TXT/HTML/?uri=CELEX:32014R0910&from=DE" target="_blank"
-           th:text="#{gui.countryselection.infos.general.link.1}"> eIDAS-Verordnung der Europäischen Union </a>
-        <span th:text="#{gui.countryselection.infos.general.part.4}"> fourth part </span>
-    </p>
-
-    <p>
-    	<span th:text="#{gui.countryselection.infos.general.part.5}"> fived part </span>
-    	<a 	href="https://www.dsb.gv.at/-/das-erganzungsregister-fur-naturliche-personen-ernp-" target="_blank"
-       		th:text="#{gui.countryselection.infos.general.link.2}"></a>
-    	<span th:text="#{gui.countryselection.infos.general.part.6}"> sixed part </span>
-    </p>
-
-</div>
-<footer>
-    <div class="copyright">&copy; BUNDESMINISTERIUM FÜR INNERES</div>
-    <div></div>
-</footer>
-</body>
-</html>
diff --git a/connector/src/main/resources/templates/eidas_node_forward.html b/connector/src/main/resources/templates/eidas_node_forward.html
deleted file mode 100644
index 3cd30d36..00000000
--- a/connector/src/main/resources/templates/eidas_node_forward.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="fragments/base"
-      th:with="lang=${#locale.language}" th:lang="${lang}">
-<head>
-  <script src="../../webapp/autocommit.js"
-          th:attr="src=@{/autocommit.js}"></script>
-</head>
-<body>
-	<noscript>
-		<p>
-			<strong>Note:</strong> Since your browser does not support
-			JavaScript, you must press the Continue button once to proceed.
-		</p>
-	</noscript>
-
-	<div id="alert">Your login is being processed. Thank you for
-		waiting.</div>
-
-	<form 	action="${endPoint}" method="post" target="_parent"
-			th:attr="action=@{${endPoint}}">
-		<div>
-			<input type="hidden" name="${tokenName}" value="${tokenValue}"
-			 	   th:attr="value=${tokenValue},name=${tokenName}" />
-		</div>
-		<noscript>
-			<div>
-				<p>Your browser does not support JavaScript. Click the button to continuing the process .</p>
-				<input type="submit" value="Continue" />
-			</div>
-		</noscript>
-	</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/connector/src/main/resources/templates/error_message.html b/connector/src/main/resources/templates/error_message.html
deleted file mode 100644
index c5f1ebb3..00000000
--- a/connector/src/main/resources/templates/error_message.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<html xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="fragments/base"
-      th:with="lang=${#locale.language}" th:lang="${lang}">
-
-  <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-  <link rel="stylesheet" href="../../webapp/css/css_error.css"  th:href="@{/css/css_error.css}" />
-
-  <title th:text="#{gui.errorpage.msg.title}">An error arise ...  </title>
-</head>
-
-<body>
-  <div id="page">
-		<div id="page1" class="case selected-case" role="main">
-			<h2 class="OA_header" role="heading">Authentication error arise</h2>
-
-	        <div class="hell" role="application" >
-            <h2 class="OA_header" role="heading" th:text="#{gui.errorpage.msg.title}">Error Header</h2>
-
-              <div id="alert_area" class="hell" role="application" >
-                <p th:text="#{gui.errorpage.msg.information}">Error Information</p>
-                  <br/>
-		              <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${errorCode}"></span></p>
-                  <p><b th:text="#{gui.errorpage.msg.errormsg}">Msg   :</b > <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p>
-	            </div>
-                                                                                                      <!-- errorMsg -->
-	        </div>
-
-	        <div th:if="${stacktrace}">
-            <p><b th:text="#{gui.errorpage.msg.stacktrace}">fullError</b> <span th:text="${stacktrace}"></span></p>
-	        </div>
-
-		</div>
-	</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/connector/src/main/resources/templates/language_selection.html b/connector/src/main/resources/templates/language_selection.html
deleted file mode 100644
index a268eb17..00000000
--- a/connector/src/main/resources/templates/language_selection.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-4.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org">
-
-  <body>
-  
-    <div th:fragment="selectlanguage">
-        <a th:href="@{|${submitEndpoint}?pendingid=${pendingid}|(lang='de')}" th:text="#{gui.general.language.selection.de}">Spache1</a>
-        <span>&nbsp; &nbsp; </span>
-        <a th:href="@{|${submitEndpoint}?pendingid=${pendingid}|(lang='en')}" th:text="#{gui.general.language.selection.en}">Spache2</a>
-    </div>
-  
-  </body>
-  
-</html>
\ No newline at end of file
diff --git a/connector/src/main/resources/templates/other_login_method.html b/connector/src/main/resources/templates/other_login_method.html
deleted file mode 100644
index e5f03712..00000000
--- a/connector/src/main/resources/templates/other_login_method.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="fragments/base"
-      th:with="lang=${#locale.language}" th:lang="${lang}">
-<head>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="../../webapp/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
-    <title th:text="#{gui.otherlogin.title}">eIDAS-Login Other Login Methods</title>
-    <style>
-        .block {
-            width: 100%;
-        }
-        button {
-            padding: 0.5em;
-            margin: 0.5em;
-            width: 20em;
-        }
-    </style>
-</head>
-<body>
-<div class="header container">
-    <div class="titlebar">
-        <div>
-            <a href="https://www.bmi.gv.at/" target="_blank" title="Home">
-                <img class="toplogo img-responsive" src="/static/BMI.png" alt="Logo BMI"
-                     th:attr="alt=#{gui.countryselection.logo.bmi.alt}">
-                <h1 class="hidden" th:text="#{gui.countryselection.header1}"> Bundesministerium für Inneres </h1>
-            </a>
-        </div>
-        <ul class="nav_oben">
-            <li>
-                <div class="languageselection" th:include="language_selection :: selectlanguage">
-                    LanguageSelectionBlock
-                </div>
-            </li>
-            &nbsp; &nbsp;
-            <li>
-                <a href="https://www.bmi.gv.at/" target="_blank" th:text="#{gui.countryselection.link.bmi}">Startseite
-                    BMI </a>
-            </li>
-        </ul>
-    </div>
-</div>
-<div class="content">
-    <div class="subtitle">
-        <h1 th:text="#{gui.countryselection.header2}"> Zentraler eIDAS Knoten der Republik Österreich </h1>
-        <h2 th:text="#{gui.countryselection.header3}"> Betrieben durch das Bundesministerium für Inneres </h2>
-    </div>
-
-    <h1 th:text="#{gui.otherlogin.header.selection}"> Select an alternative login method </h1>
-
-    <div id="otherlogin" class="block">
-        <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <button type="submit" role="button" value="Handy-Signatur / Mobile Signature"
-                    th:text="#{gui.otherlogin.hs}">A
-            </button>
-            <input type="hidden" name="loginSelection" value="MOBILE_PHONE_SIGNATURE_LOGIN">
-            <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
-        </form>
-        <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <button type="submit" role="button" value="Andere eIDAS ID" th:text="#{gui.otherlogin.eidas}">B
-            </button>
-            <input type="hidden" name="loginSelection" value="EIDAS_LOGIN">
-            <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
-        </form>
-        <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <button type="submit" role="button" value="Keine weitere HS / eIDAS"
-                    th:text="#{gui.otherlogin.none}">C
-            </button>
-            <input type="hidden" name="loginSelection" value="NO_OTHER_LOGIN">
-            <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
-        </form>
-    </div>
-
-    <!-- Abbrechen Button -->
-    <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-        <button type="submit" value="Abbrechen/Cancel" th:text="#{gui.otherlogin.cancel}"></button>
-        <input type="hidden" name="stopAuthProcess" value="true">
-        <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
-    </form>
-
-</div>
-<footer>
-    <div class="copyright">&copy; BUNDESMINISTERIUM FÜR INNERES</div>
-    <div></div>
-</footer>
-</body>
-</html>
diff --git a/connector/src/main/resources/templates/pvp2_post_binding.html b/connector/src/main/resources/templates/pvp2_post_binding.html
deleted file mode 100644
index 06b9b494..00000000
--- a/connector/src/main/resources/templates/pvp2_post_binding.html
+++ /dev/null
@@ -1,36 +0,0 @@
-## ## Velocity Template for SAML 2 HTTP-POST binding ## ## Velocity
-##context may contain the following properties ## action - String - the
-##action URL for the form ## RelayState - String - the relay state for the
-##message ## SAMLRequest - String - the Base64 encoded SAML Request ##
-##SAMLResponse - String - the Base64 encoded SAML Response
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-  <script src="/autocommit.js"></script>
-</head>
-<body>
-	<noscript>
-		<p>
-			<strong>Note:</strong> Since your browser does not support
-			JavaScript, you must press the Continue button once to proceed.
-		</p>
-	</noscript>
-
-	<div id="alert">Your login is being processed. Thank you for
-		waiting.</div>
-
-	<form action="${action}" method="post" target="_parent">
-		<div>
-			#if($RelayState)   <input type="hidden" name="RelayState" value="${RelayState}"/>     #end
-			#if($SAMLRequest)  <input type="hidden" name="SAMLRequest" value="${SAMLRequest}" />  #end
-			#if($SAMLResponse) <input type="hidden" name="SAMLResponse" value="${SAMLResponse}" /> #end
-		</div>
-		<noscript>
-			<div>
-				<input type="submit" value="Continue" />
-			</div>
-		</noscript>
-	</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/connector/src/main/resources/templates/residency.html b/connector/src/main/resources/templates/residency.html
deleted file mode 100644
index 6e266449..00000000
--- a/connector/src/main/resources/templates/residency.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="fragments/base"
-      th:with="lang=${#locale.language}" th:lang="${lang}">
-<head>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="../../webapp/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
-    <script type="text/javascript" src="../../webapp/js/jquery-3.6.0.js"
-            th:attr="src=@{/static/js/jquery-3.6.0.min.js}"></script>
-    <title th:text="#{gui.residency.title}">Österreichischer Wohnsitz</title>
-    <script type="text/javascript" th:inline="javascript">
-        $(document).ready(function () {
-            $("#textResult").hide();
-            $("#tableResult").hide();
-            $("#loading").hide();
-            $.ajaxSetup({
-                beforeSend: function () {
-                    $("#loading").show();
-                },
-                complete: function () {
-                    $("#loading").hide();
-                }
-            });
-            $("#inputForm input[type='text']").keyup(function (event) {
-                if (event.keyCode === 13) {
-                    $("#buttonSearch").click();
-                }
-            });
-        });
-
-        function search() {
-            let updatedText = /*[[#{gui.residency.updated}]]*/ 'Updated text';
-            let errorText = /*[[#{gui.residency.error}]]*/ 'Error';
-            let foundText = /*[[#{gui.residency.found}]]*/ 'Found {0}';
-            let uniqueText = /*[[#{gui.residency.unique}]]*/ 'Unique';
-            let invalidInputText = /*[[#{gui.residency.header.inputinvalid}]]*/ 'Invalid';
-            if (!$("#inputForm #inputMunicipality").val().trim() && !$("#inputForm #inputPostleitzahl").val().trim() &&
-                !$("#inputForm #inputVillage").val().trim()) {
-                $("#textResult").show().text(invalidInputText);
-                return;
-            }
-            $.ajax({
-                type: "POST",
-                url: "http://localhost:8080/ms_connector/residency/search",
-                data: $("#inputForm").serialize()
-            }).done(function (data, textStatus, jqXHR) {
-                if (data["resultCount"] === 1) {
-                    $("#textResult").show().text(uniqueText);
-                    $("#tableResult tbody").empty();
-                    $("#tableResult").hide();
-                    $("#inputForm #inputPostleitzahl").val(data["results"][0]["postleitzahl"]);
-                    $("#inputForm #inputMunicipality").val(data["results"][0]["municipality"]);
-                    $("#inputForm #inputVillage").val(data["results"][0]["village"]);
-                    $("#inputForm #inputStreet").val(data["results"][0]["street"]);
-                    $("#inputForm #inputNumber").val(data["results"][0]["number"]);
-                    return;
-                }
-                $("#textResult").show().text(foundText.replace("{0}", data["resultCount"]));
-                $("#tableResult").show();
-                $("#tableResult tbody").empty();
-                $.each(data.results, function (i, output) {
-                    $("#tableResult tbody")
-                        .append($("<tr>")
-                            .append($("<td>").text(output["postleitzahl"] !== null ? output["postleitzahl"] : "").css("text-align", "right"))
-                            .append($("<td>").text(output["municipality"] !== null ? output["municipality"] : ""))
-                            .append($("<td>").text(output["village"] !== null ? output["village"] : ""))
-                            .append($("<td>").text(output["street"] !== null ? output["street"] : ""))
-                            .append($("<td>").text(output["number"] !== null ? output["number"] : "").css("text-align", "right"))
-                            .css("cursor", "pointer").click(function () {
-                                $("#inputForm #inputPostleitzahl").val($(this).children("td:nth-child(1)").text());
-                                $("#inputForm #inputMunicipality").val($(this).children("td:nth-child(2)").text());
-                                $("#inputForm #inputVillage").val($(this).children("td:nth-child(3)").text());
-                                $("#inputForm #inputStreet").val($(this).children("td:nth-child(4)").text());
-                                $("#inputForm #inputNumber").val($(this).children("td:nth-child(5)").text());
-                                $("#textResult").show().text(updatedText);
-                                search();
-                            })
-                        );
-                })
-                if (data.results.length === 0) {
-                    $("#tableResult").hide();
-                }
-            }).fail(function (jqXHR, textStatus, errorThrown) {
-                $("#textResult").show().text(errorText);
-            })
-        }
-
-        function clearInput() {
-            $("#inputForm #inputMunicipality").val("");
-            $("#inputForm #inputVillage").val("");
-            $("#inputForm #inputStreet").val("");
-            $("#inputForm #inputNumber").val("");
-            $("#textResult").hide();
-            $("#tableResult").hide();
-        }
-    </script>
-    <style>
-        #residency label {
-            width: 10em;
-            display: inline-block;
-            margin-bottom: 0.5em;
-        }
-
-        #residency input {
-            width: 15em;
-            display: inline-block;
-            margin-bottom: 0.5em;
-        }
-
-        #result {
-            margin-bottom: 4em;
-        }
-
-        button {
-            padding: 0.5em;
-            margin: 0.5em;
-            width: 8em;
-        }
-
-        .block {
-            width: 100%;
-        }
-
-        #tableResult td, #tableResult th {
-            padding: 1em 0.5em;
-        }
-
-        #tableResult a {
-            text-decoration: underline;
-        }
-
-        #tableResult {
-            border-collapse: collapse;
-        }
-
-        #tableResult tr {
-            border-bottom: 1px solid black;
-        }
-    </style>
-</head>
-
-<body>
-<div class="header container">
-    <div class="titlebar">
-        <div>
-            <a href="https://www.bmi.gv.at/" target="_blank" title="Home">
-                <img class="toplogo img-responsive" src="/static/BMI.png" alt="Logo BMI"
-                     th:attr="alt=#{gui.countryselection.logo.bmi.alt}">
-                <h1 class="hidden" th:text="#{gui.countryselection.header1}"> Bundesministerium für Inneres </h1>
-            </a>
-        </div>
-        <ul class="nav_oben">
-            <li>
-                <div class="languageselection" th:include="language_selection :: selectlanguage">
-                    LanguageSelectionBlock
-                </div>
-            </li>
-            &nbsp; &nbsp;
-            <li>
-                <a href="https://www.bmi.gv.at/" target="_blank" th:text="#{gui.countryselection.link.bmi}">Startseite
-                    BMI </a>
-            </li>
-        </ul>
-    </div>
-</div>
-<div class="content">
-    <div class="subtitle">
-        <h1 th:text="#{gui.countryselection.header2}"> Zentraler eIDAS Knoten der Republik Österreich </h1>
-        <h2 th:text="#{gui.countryselection.header3}"> Betrieben durch das Bundesministerium für Inneres </h2>
-    </div>
-
-    <h1 th:text="#{gui.residency.header.selection}">Search your Austrian Residency</h1>
-
-    <div id="residency">
-        <form id="inputForm" method="post" action="$contextPath$submitEndpoint"
-              th:attr="action=@{${submitEndpoint}}">
-            <div><p th:text="#{gui.residency.header.help}">Please enter a postcode, municipality or village first</p>
-            </div>
-            <div>
-                <label for="inputPostleitzahl" th:text="#{gui.residency.input.postleitzahl}">Postleitzahl</label>
-                <input type="text" id="inputPostleitzahl" name="postleitzahl" value=""/>
-            </div>
-            <div>
-                <label for="inputMunicipality" th:text="#{gui.residency.input.municipality}">Municipality</label>
-                <input type="text" id="inputMunicipality" name="municipality" value=""/>
-            </div>
-            <div>
-                <label for="inputVillage" th:text="#{gui.residency.input.village}">Village</label>
-                <input type="text" id="inputVillage" name="village" value=""/>
-            </div>
-            <div>
-                <label for="inputStreet" th:text="#{gui.residency.input.street}">Street</label>
-                <input type="text" id="inputStreet" name="street" value=""/>
-            </div>
-            <div>
-                <label for="inputNumber" th:text="#{gui.residency.input.number}">Number</label>
-                <input type="text" id="inputNumber" name="number" value=""/>
-            </div>
-            <div class="block">
-                <button type="button" id="buttonSearch" onclick="search()" th:text="#{gui.residency.search}">
-                    Search
-                </button>
-                <button type="button" id="buttonClear" onclick="clearInput()" th:text="#{gui.residency.clear}">
-                    Clear
-                </button>
-                <button type="button" id="buttonProceed" th:text="#{gui.residency.proceed}">Proceed</button>
-            </div>
-            <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
-        </form>
-    </div>
-
-    <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-        <button type="submit" value="Abbrechen/Cancel" th:text="#{gui.residency.cancel}">Cancel</button>
-        <input type="hidden" name="stopAuthProcess" value="true">
-        <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
-    </form>
-
-    <div>
-        <img id="loading" src="../../webapp/img/ajax-loader.gif"
-             th:attr="src=@{/static/img/ajax-loader.gif}" style="display: none"/>
-    </div>
-
-    <div id="result">
-        <div>
-            <p><span id="textResult" style="display: none"></span></p>
-        </div>
-        <table id="tableResult" style="display: none">
-            <thead>
-            <tr>
-                <th th:text="#{gui.residency.input.postleitzahl}" style="text-align: right">Postcode</th>
-                <th th:text="#{gui.residency.input.municipality}">Municipality</th>
-                <th th:text="#{gui.residency.input.village}">Village</th>
-                <th th:text="#{gui.residency.input.street}">Street</th>
-                <th th:text="#{gui.residency.input.number}" style="text-align: right">Number</th>
-            </tr>
-            </thead>
-            <tbody>
-
-            </tbody>
-        </table>
-    </div>
-
-</div>
-<footer>
-    <div class="copyright">&copy; BUNDESMINISTERIUM FÜR INNERES</div>
-    <div></div>
-</footer>
-</body>
-</html>
diff --git a/connector/src/main/resources/tomcat.properties b/connector/src/main/resources/tomcat.properties
deleted file mode 100644
index 38ab5a64..00000000
--- a/connector/src/main/resources/tomcat.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-tomcat.ajp.enabled=true
-#tomcat.ajp.port=41009
-#tomcat.ajp.additionalAttributes.secretrequired=true
-#tomcat.ajp.additionalAttributes.secret=
-
-server.tomcat.accesslog.buffered=false
-server.tomcat.accesslog.prefix=tomcat-access_log
-server.tomcat.accesslog.directory=logs/
-server.tomcat.accesslog.enabled=true
-server.tomcat.accesslog.file-date-format=.yyyy-MM-dd
-server.tomcat.accesslog.pattern=common
-server.tomcat.accesslog.rename-on-rotate=false
-server.tomcat.accesslog.request-attributes-enabled=true
-server.tomcat.accesslog.rotate=true
-server.tomcat.accesslog.suffix=.log
\ No newline at end of file