diff options
| author | Thomas <> | 2022-03-09 13:49:51 +0100 |
|---|---|---|
| committer | Thomas <> | 2022-03-09 13:49:51 +0100 |
| commit | 6fa8a9968e44fb5d56fc8d9c3ddd536a8997f7a9 (patch) | |
| tree | ac8400d3c8b8c0051fde9f792a5af59253e4ad76 /connector/src/main/resources/applicationContext.xml | |
| parent | 552497957fe6509087fc9a1a33fae5812a615094 (diff) | |
| download | National_eIDAS_Gateway-6fa8a9968e44fb5d56fc8d9c3ddd536a8997f7a9.tar.gz National_eIDAS_Gateway-6fa8a9968e44fb5d56fc8d9c3ddd536a8997f7a9.tar.bz2 National_eIDAS_Gateway-6fa8a9968e44fb5d56fc8d9c3ddd536a8997f7a9.zip | |
refactor(core): split 'ms-connector' WebApp into 'core' and 'ms-connector' to reuse some code for 'ms-proxy' WebApp
# Conflicts:
# connector/src/main/resources/specific_eIDAS_connector.beans.xml
# connector/src/test/resources/spring/SpringTest_connector.beans.xml
# core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/builder/AuthenticationDataBuilder.java
# core_common_webapp/src/test/java/at/asitplus/eidas/specific/core/test/utils/AuthenticationDataBuilderTest.java
# eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/IdAustriaAuthConstants.java
# eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
# eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/RequestIdAustriaSystemTask.java
# eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/controller/IdAustriaAuthMetadataControllerFirstTest.java
# eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/task/ReceiveAuthnResponseTaskTest.java
# eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/task/RequestIdAustriaSystemTaskTest.java
# eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/utils/IdAustriaAuthCredentialProviderTest.java
# eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/utils/IdAustriaAuthMetadataProviderFirstTest.java
# eidas_modules/authmodule_id-austria/src/test/resources/spring/SpringTest-context_basic_mapConfig.xml
# eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/MsProxyServiceConstants.java
# eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
# eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
# eidas_modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/EidasProxyServiceControllerTest.java
# eidas_modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
# eidas_modules/eidas_proxy-sevice/src/test/resources/spring/SpringTest-context_basic_mapConfig.xml
Diffstat (limited to 'connector/src/main/resources/applicationContext.xml')
| -rw-r--r-- | connector/src/main/resources/applicationContext.xml | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/connector/src/main/resources/applicationContext.xml b/connector/src/main/resources/applicationContext.xml index 15ce0a55..ec8e79f4 100644 --- a/connector/src/main/resources/applicationContext.xml +++ b/connector/src/main/resources/applicationContext.xml @@ -15,16 +15,10 @@ <context:annotation-config /> <context:component-scan base-package="at.gv.egiz.eaaf.utils.springboot.ajp"/> - -<!-- - <context:annotation-config /> - <mvc:annotation-driven /> - <mvc:default-servlet-handler /> ---> <mvc:interceptors> <bean - class="at.asitplus.eidas.specific.connector.interceptor.WebFrontEndSecurityInterceptor" /> + class="at.asitplus.eidas.specific.core.interceptor.WebFrontEndSecurityInterceptor" /> <bean class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor"> <property name="paramName" value="lang" /> @@ -32,22 +26,17 @@ </mvc:interceptors> <bean id="springContextClosingHandler" - class="at.asitplus.eidas.specific.connector.SpringContextCloseHandler" /> - -<!-- - <context:property-placeholder - location="${eidas.ms.configuration}" /> - --> + class="at.asitplus.eidas.specific.core.SpringContextCloseHandler" /> <beans profile="deprecatedConfig"> <bean id="BasicMSSpecificNodeConfig" - class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider"> + 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.connector.config.SpringBootBasicConfigurationProvider" /> + class="at.asitplus.eidas.specific.core.config.SpringBootBasicConfigurationProvider" /> </beans> |