diff options
author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2021-01-11 15:42:26 +0100 |
---|---|---|
committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2021-01-11 15:42:26 +0100 |
commit | c77fcb3e75da79647f099216c3478ecdf219a120 (patch) | |
tree | 38444e5b15cfb1705f87b150aec200976bc22ee5 /connector/src/main/resources/applicationContext.xml | |
parent | c9de974247b23c2ac0a997ef25f70b9a75cd1aaf (diff) | |
parent | a5d2e6d6fa2c75ae8211c818537524e8c54c3129 (diff) | |
download | National_eIDAS_Gateway-c77fcb3e75da79647f099216c3478ecdf219a120.tar.gz National_eIDAS_Gateway-c77fcb3e75da79647f099216c3478ecdf219a120.tar.bz2 National_eIDAS_Gateway-c77fcb3e75da79647f099216c3478ecdf219a120.zip |
Merge branch 'feature/springboot' into 'nightlybuild'
Feature/springboot
See merge request egiz/eidas_at_proxy!7
Diffstat (limited to 'connector/src/main/resources/applicationContext.xml')
-rw-r--r-- | connector/src/main/resources/applicationContext.xml | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/connector/src/main/resources/applicationContext.xml b/connector/src/main/resources/applicationContext.xml index 76682a2e..15ce0a55 100644 --- a/connector/src/main/resources/applicationContext.xml +++ b/connector/src/main/resources/applicationContext.xml @@ -14,10 +14,14 @@ http://www.springframework.org/schema/tx/spring-tx.xsd"> <context:annotation-config /> - <mvc:annotation-driven /> + <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" /> @@ -27,13 +31,24 @@ </bean> </mvc:interceptors> + <bean id="springContextClosingHandler" + class="at.asitplus.eidas.specific.connector.SpringContextCloseHandler" /> + +<!-- <context:property-placeholder location="${eidas.ms.configuration}" /> + --> + <beans profile="deprecatedConfig"> <bean id="BasicMSSpecificNodeConfig" class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider"> - <constructor-arg - value="#{systemProperties['eidas.ms.configuration']}" /> + <constructor-arg value="#{systemProperties['eidas.ms.configuration']}" /> </bean> + </beans> + <beans profile="!deprecatedConfig"> + <bean id="springBootMsSpecificNodeConfig" + class="at.asitplus.eidas.specific.connector.config.SpringBootBasicConfigurationProvider" /> + + </beans> </beans> |