diff options
Diffstat (limited to 'connector')
| -rw-r--r-- | connector/pom.xml | 4 | ||||
| -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 |
3 files changed, 9 insertions, 3 deletions
diff --git a/connector/pom.xml b/connector/pom.xml index c2e7534b..abd008e2 100644 --- a/connector/pom.xml +++ b/connector/pom.xml @@ -59,7 +59,7 @@ <dependency> <groupId>at.asitplus.eidas.ms_specific.modules</groupId> <artifactId>authmodule-eIDAS-v2</artifactId> - </dependency> + </dependency> <dependency> <groupId>at.asitplus.eidas.ms_specific.modules</groupId> <artifactId>eidas_proxy-sevice</artifactId> @@ -158,7 +158,7 @@ <artifactId>eaaf-core</artifactId> <scope>test</scope> <type>test-jar</type> - </dependency> + </dependency> <dependency> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_module_pvp2_sp</artifactId> 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" |