diff options
| author | Thomas <> | 2022-05-13 08:59:16 +0200 |
|---|---|---|
| committer | Thomas <> | 2022-05-13 08:59:16 +0200 |
| commit | a11517f4d25f31e352a9665392ad000dff4a44c5 (patch) | |
| tree | d9bbd0b09c68b0d86bd43ae5ccb5b277fd9c3fd3 /connector/src/main/resources/specific_eIDAS_connector.beans.xml | |
| parent | 9e3b78d931d220e1ed5ecbaadcb13df7cbe96e22 (diff) | |
| parent | e412bda31b304821c08d8f8c7b2473d67246dba0 (diff) | |
| download | National_eIDAS_Gateway-a11517f4d25f31e352a9665392ad000dff4a44c5.tar.gz National_eIDAS_Gateway-a11517f4d25f31e352a9665392ad000dff4a44c5.tar.bz2 National_eIDAS_Gateway-a11517f4d25f31e352a9665392ad000dff4a44c5.zip | |
Merge branch 'nightlybuild' into feature/ms_proxy_before_refactoring
# Conflicts:
# basicConfig/templates/error_message.html
# connector/src/main/resources/specific_eIDAS_connector.beans.xml
# connector/src/test/resources/config/junit_config_1_springboot.properties
# connector/src/test/resources/config/junit_config_2_springboot.properties
# connector/src/test/resources/config/templates/countrySelection.html
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
# pom.xml
Diffstat (limited to 'connector/src/main/resources/specific_eIDAS_connector.beans.xml')
| -rw-r--r-- | connector/src/main/resources/specific_eIDAS_connector.beans.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml index 46cf1f5b..9861a7c6 100644 --- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml +++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml @@ -11,8 +11,12 @@ 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" /> @@ -34,7 +38,6 @@ class="at.asitplus.eidas.specific.connector.controller.Pvp2SProfileEndpoint"> <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" /> <property name="metadataProvider" ref="PVPMetadataProvider" /> - </bean> <bean id="AuthnRequestValidator" @@ -60,7 +63,6 @@ <bean id="PVPSubjectNameGenerator" class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" /> - <!-- Tasks --> <bean id="GenerateCountrySelectionFrameTask" class="at.asitplus.eidas.specific.connector.processes.tasks.GenerateCountrySelectionFrameTask" |