From 1ae77e971928a44dd278eaa473392c35855c4227 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 26 Jan 2021 07:40:01 +0100
Subject: update SAML2 IDP elements of MS-specific Connector to current
 snapshot version (1.1.12-SNAPSHOT) of eaaf_module_pvp2_idp

---
 .../resources/specific_eIDAS_connector.beans.xml   | 81 ++++++++++------------
 .../spring/SpringTest_connector.beans.xml          | 21 ++----
 2 files changed, 42 insertions(+), 60 deletions(-)

(limited to 'connector')

diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index 8ff4e565..ecf6d348 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -14,71 +14,60 @@
   <import resource="common_gui.beans.xml"/>
 
   <bean id="WebResourceConfiguration"
-    class="at.asitplus.eidas.specific.connector.config.StaticResourceConfiguration" />
+        class="at.asitplus.eidas.specific.connector.config.StaticResourceConfiguration" />
 
   <bean id="processEngineSignalController"
-    class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" />
+        class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" />
 
   <bean id="saml2MetadataGeneration"
         class="at.asitplus.eidas.specific.connector.health.Saml2MetadataHealthIndicator">
-    <property name="pvpIdpCredentials">
-      <ref bean="PVPEndPointCredentialProvider" />
-    </property>
+    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
   </bean>
 
   <bean id="eidasNodeMetadata"
         class="at.asitplus.eidas.specific.connector.health.EidasNodeMetadataHealthIndicator" />
 
   <bean id="AuthenticationManager"
-    class="at.asitplus.eidas.specific.connector.auth.AuthenticationManager" />
+        class="at.asitplus.eidas.specific.connector.auth.AuthenticationManager" />
 
   <bean id="AuthenticationDataBuilder"
-    class="at.asitplus.eidas.specific.connector.builder.AuthenticationDataBuilder" />
+        class="at.asitplus.eidas.specific.connector.builder.AuthenticationDataBuilder" />
 
   <bean id="PVPEndPointConfiguration"
-    class="at.asitplus.eidas.specific.connector.config.PvpEndPointConfiguration" />
+        class="at.asitplus.eidas.specific.connector.config.PvpEndPointConfiguration" />
 
   <bean id="PVPEndPointCredentialProvider"
-    class="at.asitplus.eidas.specific.connector.provider.PvpEndPointCredentialProvider" />
+        class="at.asitplus.eidas.specific.connector.provider.PvpEndPointCredentialProvider" />
 
   <bean id="PVPMetadataConfigurationFactory"
-    class="at.asitplus.eidas.specific.connector.provider.PvpMetadataConfigurationFactory" />
+        class="at.asitplus.eidas.specific.connector.provider.PvpMetadataConfigurationFactory" />
 
   <bean id="pvp2SProfileEndpoint"
-    class="at.asitplus.eidas.specific.connector.controller.Pvp2SProfileEndpoint">
-    <property name="pvpIdpCredentials">
-      <ref bean="PVPEndPointCredentialProvider" />
-    </property>
-    <property name="metadataProvider">
-      <ref bean="PVPMetadataProvider" />
-    </property>   
+        class="at.asitplus.eidas.specific.connector.controller.Pvp2SProfileEndpoint">
+    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
+    <property name="metadataProvider" ref="PVPMetadataProvider" />
+
   </bean>
 
   <bean id="AuthnRequestValidator"
-    class="at.asitplus.eidas.specific.connector.verification.AuthnRequestValidator" />
+        class="at.asitplus.eidas.specific.connector.verification.AuthnRequestValidator" />
 
-  <bean id="SAMLVerificationEngine"
-    class="at.gv.egiz.eaaf.modules.pvp2.impl.verification.SamlVerificationEngine" />
+  <!-- bean id="SAMLVerificationEngine"
+        class="at.gv.egiz.eaaf.modules.pvp2.impl.verification.SamlVerificationEngine" /-->
 
   <bean id="pvpMetadataService"
-    class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.MetadataAction">
-    <property name="pvpIdpCredentials">
-      <ref bean="PVPEndPointCredentialProvider" />
-    </property>
+        class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.MetadataAction">
+    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
   </bean>
 
   <bean id="PVPAuthenticationRequestAction"
-    class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.AuthenticationAction">
-    <property name="pvpIdpCredentials">
-      <ref bean="PVPEndPointCredentialProvider" />
-    </property>
-    <property name="metadataProvider">
-      <ref bean="PVPMetadataProvider" />
-    </property>     
+        class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.AuthenticationAction">
+    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
+    <property name="metadataProvider" ref="PVPMetadataProvider" />
   </bean>
 
   <bean id="eaafProtocolAuthenticationService"
-    class="at.gv.egiz.eaaf.core.impl.idp.auth.services.ProtocolAuthenticationService">
+        class="at.gv.egiz.eaaf.core.impl.idp.auth.services.ProtocolAuthenticationService">
     <property name="guiBuilder" ref="mvcGUIBuilderImpl" />
   </bean>
 
@@ -86,43 +75,43 @@
         class="at.gv.egiz.eaaf.core.impl.idp.auth.services.DefaultErrorService"/>
 
   <bean id="securePendingRequestIdGeneration"
-    class="at.gv.egiz.eaaf.core.impl.utils.SecurePendingRequestIdGenerationStrategy" />
+        class="at.gv.egiz.eaaf.core.impl.utils.SecurePendingRequestIdGenerationStrategy" />
 
   <bean id="PVPMetadataProvider"
-    class="at.asitplus.eidas.specific.connector.provider.PvpMetadataProvider" />
+        class="at.asitplus.eidas.specific.connector.provider.PvpMetadataProvider" />
 
   <bean id="PVPSubjectNameGenerator"
-    class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" />
+        class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" />
 
   <bean id="LoALevelMapper"
-    class="at.asitplus.eidas.specific.connector.mapper.LoALevelMapper" />
+        class="at.asitplus.eidas.specific.connector.mapper.LoALevelMapper" />
 
   <bean id="GUIBuilderConfigurationFactory"
-    class="at.asitplus.eidas.specific.connector.gui.GuiBuilderConfigurationFactory" />
+        class="at.asitplus.eidas.specific.connector.gui.GuiBuilderConfigurationFactory" />
 
   <bean id="velocityGUIBuilderImpl"
-    class="at.asitplus.eidas.specific.connector.gui.DefaultVelocityGuiBuilderImpl" />
+        class="at.asitplus.eidas.specific.connector.gui.DefaultVelocityGuiBuilderImpl" />
 
   <bean id="mvcGUIBuilderImpl"
-    class="at.gv.egiz.eaaf.core.impl.gui.builder.SpringMvcGuiFormBuilderImpl" />
+        class="at.gv.egiz.eaaf.core.impl.gui.builder.SpringMvcGuiFormBuilderImpl" />
 
   <bean id="StatusMessageProvider"
-    class="at.asitplus.eidas.specific.connector.provider.StatusMessageProvider" />
+        class="at.asitplus.eidas.specific.connector.provider.StatusMessageProvider" />
 
   <bean id="eidasRevisionLogger"
-    class="at.asitplus.eidas.specific.connector.logger.RevisionLogger" />
+        class="at.asitplus.eidas.specific.connector.logger.RevisionLogger" />
 
   <bean id="eidasStatisticLogger"
-    class="at.asitplus.eidas.specific.connector.logger.StatisticLogger" />
+        class="at.asitplus.eidas.specific.connector.logger.StatisticLogger" />
 
 
   <!-- Tasks -->
   <bean id="GenerateCountrySelectionFrameTask"
-    class="at.asitplus.eidas.specific.connector.processes.tasks.GenerateCountrySelectionFrameTask"
-    scope="prototype" />
+        class="at.asitplus.eidas.specific.connector.processes.tasks.GenerateCountrySelectionFrameTask"
+        scope="prototype" />
 
   <bean id="EvaluateCountrySelectionTask"
-    class="at.asitplus.eidas.specific.connector.processes.tasks.EvaluateCountrySelectionTask"
-    scope="prototype" />
+        class="at.asitplus.eidas.specific.connector.processes.tasks.EvaluateCountrySelectionTask"
+        scope="prototype" />
 
 </beans>
\ No newline at end of file
diff --git a/connector/src/test/resources/spring/SpringTest_connector.beans.xml b/connector/src/test/resources/spring/SpringTest_connector.beans.xml
index 8f3d25ad..6fec6000 100644
--- a/connector/src/test/resources/spring/SpringTest_connector.beans.xml
+++ b/connector/src/test/resources/spring/SpringTest_connector.beans.xml
@@ -38,19 +38,16 @@
 
   <bean id="PVP2XProtocol"
     class="at.asitplus.eidas.specific.connector.controller.Pvp2SProfileEndpoint">
-    <property name="pvpIdpCredentials">
-      <ref bean="PVPEndPointCredentialProvider" />
-    </property>
-    <property name="metadataProvider">
-      <ref bean="PVPMetadataProvider" />
-    </property>       
+    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
+    <property name="metadataProvider" ref="PVPMetadataProvider" />
   </bean>
 
   <bean id="AuthnRequestValidator"
     class="at.asitplus.eidas.specific.connector.verification.AuthnRequestValidator" />
 
-  <bean id="SAMLVerificationEngine"
-    class="at.gv.egiz.eaaf.modules.pvp2.impl.verification.SamlVerificationEngine" />
+  <!-- bean id="SAMLVerificationEngine"
+        class="at.gv.egiz.eaaf.modules.pvp2.impl.verification.SamlVerificationEngine" /-->
+
 
   <bean id="pvpMetadataService"
     class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.MetadataAction">
@@ -61,12 +58,8 @@
 
   <bean id="PVPAuthenticationRequestAction"
     class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.AuthenticationAction">
-    <property name="pvpIdpCredentials">
-      <ref bean="PVPEndPointCredentialProvider" />
-    </property>
-    <property name="metadataProvider">
-      <ref bean="PVPMetadataProvider" />
-    </property>     
+    <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" />
+    <property name="metadataProvider" ref="PVPMetadataProvider" />
   </bean>
 
   <bean id="eaafProtocolAuthenticationService"
-- 
cgit v1.2.3