From ac531e30d13d6714e2ac61f7329e6adc130aa288 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 24 May 2019 12:23:41 +0200
Subject: untested switch to EAAF-components 1.0.7

---
 .../main/resources/moaid.authentication.beans.xml  | 29 +++-------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

(limited to 'id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml')

diff --git a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
index 02c683305..794b62477 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -21,36 +21,15 @@
 
 	<context:component-scan base-package="at.gv.egovernment.moa.id.auth.servlet" />
 	<context:component-scan base-package="at.gv.egovernment.moa.id.protocols" />
- 
- 	<bean id="PVPIDPCredentialProvider"
- 				class="at.gv.egovernment.moa.id.protocols.pvp2x.signer.IDPCredentialProvider" />
- 
- 	<bean id="PVP2XProtocol"
- 				class="at.gv.egovernment.moa.id.protocols.pvp2x.PVP2XProtocol">
-		<property name="pvpIDPCredentials">
-			<ref bean="PVPIDPCredentialProvider" />
-		</property>
- 	</bean>
- 
-  	<bean id="pvpMetadataService"
- 				class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.MetadataAction">
-		<property name="pvpIDPCredentials">
-			<ref bean="PVPIDPCredentialProvider" />
-		</property>
- 	</bean>
- 
-   	<bean id="PVPAuthenticationRequestAction"
- 				class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.AuthenticationAction">
-		<property name="pvpIDPCredentials">
-			<ref bean="PVPIDPCredentialProvider" />
-		</property>
- 	</bean>
- 
+   
  	<bean id="MOAAuthnRequestValidator"
  			class="at.gv.egovernment.moa.id.protocols.pvp2x.validation.AuthnRequestValidator" />
  
 	<bean id="MOAID_AuthenticationManager" 
 				class="at.gv.egovernment.moa.id.moduls.AuthenticationManager"/>
+	
+	<bean id="simplePendingReqIdGenerationStrategy" 
+				class="at.gv.egiz.eaaf.core.impl.utils.SimplePendingRequestIdGenerationStrategy"/>
 
 	<bean id="AuthenticationDataBuilder" 
 				class="at.gv.egovernment.moa.id.auth.builder.AuthenticationDataBuilder"/>
-- 
cgit v1.2.3


From 66859cd53d4181350525e91c4d35071932675ca7 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 29 May 2019 14:04:44 +0200
Subject: refactoring from MOA-ID 3.4.x to MOA E-ID Proxy 4.0.x

---
 .../main/resources/moaid.authentication.beans.xml  | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml')

diff --git a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
index 794b62477..598376261 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -22,6 +22,32 @@
 	<context:component-scan base-package="at.gv.egovernment.moa.id.auth.servlet" />
 	<context:component-scan base-package="at.gv.egovernment.moa.id.protocols" />
    
+   	<bean 	id="bkuSelectionProcess"
+   			class="at.gv.egovernment.moa.id.auth.modules.BKUSelectionModuleImpl"/>
+   
+   	<bean 	id="eaafProtocolAuthenticationService"
+			class="at.gv.egiz.eaaf.core.impl.idp.auth.services.ProtocolAuthenticationService">
+		<property name="guiBuilder" ref="guiFormBuilder" />
+	</bean>
+       
+ 	<bean id="PVPIDPCredentialProvider"
+ 				class="at.gv.egovernment.moa.id.protocols.pvp2x.signer.IDPCredentialProvider" />
+ 
+ 	<bean id="PVP2XProtocol"
+ 				class="at.gv.egovernment.moa.id.protocols.pvp2x.PVP2XProtocol">
+		<property name="pvpIDPCredentials" ref="PVPIDPCredentialProvider" />
+ 	</bean>
+ 
+  	<bean id="pvpMetadataService"
+ 				class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.MetadataAction">
+		<property name="pvpIDPCredentials" ref="PVPIDPCredentialProvider" />
+ 	</bean>
+ 
+   	<bean id="PVPAuthenticationRequestAction"
+ 				class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.AuthenticationAction">
+		<property name="pvpIDPCredentials" ref="PVPIDPCredentialProvider" />
+ 	</bean>
+   
  	<bean id="MOAAuthnRequestValidator"
  			class="at.gv.egovernment.moa.id.protocols.pvp2x.validation.AuthnRequestValidator" />
  
-- 
cgit v1.2.3