refactoring to new EGIZ code requirements

2 files changed, 92 insertions, 81 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
index 79256673..1f198e20 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
@@ -1,36 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-
-	<context:annotation-config />
-
-	<bean id="SZRClientForeIDAS"
-		class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.szr.SZRClient" />
- 
-<!--  	<bean id="eIDASDataStore"
- 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASDataStore" /> -->
- 
- 	<bean id="EIDPostProcessingService"
- 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.CCSpecificEIDProcessingService" />
-
-	<bean id="DE-PostProcessor" 	
- 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.handler.DEeIDProcessor">
- 		<property name="priority" value="1" />
- 	</bean>
- 			
- 	<bean id="Default-PostProcessor"
- 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.handler.GenericeIDProcessor">
- 		<property name="priority" value="0" />
- 	</bean>
- 
- 	<bean id="BasicMSSpecificNodeConfig" 
- 			class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider">
-		<constructor-arg value="#{systemProperties['eidas.ms.configuration'] != null ? systemProperties['eidas.ms.configuration'] : 'file:/F:/Projekte/configs/ms_connector/default_config.properties' }"/>
-	</bean>	
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+  <context:annotation-config />
+
+  <bean id="SZRClientForeIDAS"
+    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.szr.SzrClient" />
+
+  <!-- <bean id="eIDASDataStore" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.eIDASDataStore" 
+    /> -->
+
+  <bean id="EIDPostProcessingService"
+    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.CcSpecificEidProcessingService" />
+
+  <bean id="DE-PostProcessor"
+    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.DeEidProcessor">
+    <property name="priority" value="1" />
+  </bean>
+
+  <bean id="Default-PostProcessor"
+    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.GenericEidProcessor">
+    <property name="priority" value="0" />
+  </bean>
+
+  <bean id="BasicMSSpecificNodeConfig"
+    class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider">
+    <constructor-arg
+      value="#{systemProperties['eidas.ms.configuration'] != null ? systemProperties['eidas.ms.configuration'] : 'file:/F:/Projekte/configs/ms_connector/default_config.properties' }" />
+  </bean>
 
 </beans>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
index dafdcf94..dd116bd3 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
@@ -1,53 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-		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">
-
-	<context:annotation-config />
-	<mvc:annotation-driven />	
-	<mvc:default-servlet-handler/> 
-
-
-	<import resource="SpringTest-context_authManager.xml"/>
-	<import resource="SpringTest-context_basic_test.xml"/>
-			
-	<bean 	id="mvcGUIBuilderImpl" 
-			class="at.asitplus.eidas.specific.connector.gui.SpringMvcGuiFormBuilderImpl"/>
-
-	<bean 	id="springManagedSpecificConnectorCommunicationService"
-			class="at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2.dummy.DummySpecificCommunicationService" />
-
-    <bean id="specificConnectorAttributesFileWithPath" class="java.lang.String">
-        <constructor-arg value="src/test/resources/config/eidas-attributes.xml"/>
-    </bean>
-
-    <bean id="specificConnectorAdditionalAttributesFileWithPath" class="java.lang.String">
-        <constructor-arg value="src/test/resources/config/additional-attributes.xml"/>
-    </bean>
-
-	<bean 	id="attributeRegistry"
-			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASAttributeRegistry">
-		<property name="eidasAttributesFile" ref="specificConnectorAttributesFileWithPath"/>
-        <property name="additionalAttributesFile" ref="specificConnectorAdditionalAttributesFileWithPath"/>		
-	</bean>
-
-	<!-- Authentication Process Tasks -->
-	<bean 	id="ConnecteIDASNodeTask"
-			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.GenerateAuthnRequestTask"
-			scope="prototype" />
-
-	<bean 	id="ReceiveResponseFromeIDASNodeTask"
-			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.ReceiveAuthnResponseTask"
-			scope="prototype" />
-
-	<bean 	id="CreateIdentityLinkTask"
-			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.CreateIdentityLinkTask"
-			scope="prototype" />
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xmlns:mvc="http://www.springframework.org/schema/mvc"
+  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+    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">
+
+  <context:annotation-config />
+  <mvc:annotation-driven />
+  <mvc:default-servlet-handler />
+
+
+  <import resource="SpringTest-context_authManager.xml" />
+  <import resource="SpringTest-context_basic_test.xml" />
+
+  <bean id="mvcGUIBuilderImpl"
+    class="at.asitplus.eidas.specific.connector.gui.SpringMvcGuiFormBuilderImpl" />
+
+  <bean id="springManagedSpecificConnectorCommunicationService"
+    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy.DummySpecificCommunicationService" />
+
+  <bean id="specificConnectorAttributesFileWithPath"
+    class="java.lang.String">
+    <constructor-arg
+      value="src/test/resources/config/eidas-attributes.xml" />
+  </bean>
+
+  <bean id="specificConnectorAdditionalAttributesFileWithPath"
+    class="java.lang.String">
+    <constructor-arg
+      value="src/test/resources/config/additional-attributes.xml" />
+  </bean>
+
+  <bean id="attributeRegistry"
+    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry">
+    <property name="eidasAttributesFile"
+      ref="specificConnectorAttributesFileWithPath" />
+    <property name="additionalAttributesFile"
+      ref="specificConnectorAdditionalAttributesFileWithPath" />
+  </bean>
+
+  <!-- Authentication Process Tasks -->
+  <bean id="ConnecteIDASNodeTask"
+    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateAuthnRequestTask"
+    scope="prototype" />
+
+  <bean id="ReceiveResponseFromeIDASNodeTask"
+    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAuthnResponseTask"
+    scope="prototype" />
+
+  <bean id="CreateIdentityLinkTask"
+    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateIdentityLinkTask"
+    scope="prototype" />
 
 </beans>
\ No newline at end of file