diff options
Diffstat (limited to 'connector/src')
| -rw-r--r-- | connector/src/main/resources/specific_eIDAS_connector.beans.xml | 7 | ||||
| -rw-r--r-- | connector/src/test/resources/spring/SpringTest_connector.beans.xml | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml index 7ac6236c..7ce668ff 100644 --- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml +++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml @@ -12,7 +12,10 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> <import resource="specific_eIDAS_core.beans.xml"/> +<<<<<<< HEAD +======= +>>>>>>> 7bf7c3c03fd3a1efeaf3f8e3dd75922e2f5f9921 <bean id="processEngineSignalController" class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" /> @@ -59,8 +62,12 @@ class="at.asitplus.eidas.specific.connector.provider.PvpMetadataProvider" /> <bean id="PVPSubjectNameGenerator" +<<<<<<< HEAD + class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" /> +======= class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" /> +>>>>>>> 7bf7c3c03fd3a1efeaf3f8e3dd75922e2f5f9921 <!-- Tasks --> <bean id="GenerateCountrySelectionFrameTask" diff --git a/connector/src/test/resources/spring/SpringTest_connector.beans.xml b/connector/src/test/resources/spring/SpringTest_connector.beans.xml index 9c66ca0f..d93276ce 100644 --- a/connector/src/test/resources/spring/SpringTest_connector.beans.xml +++ b/connector/src/test/resources/spring/SpringTest_connector.beans.xml @@ -53,7 +53,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" |