From 1b7401488933f031a68dfe929b25db86279b52d2 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 15 Feb 2016 18:12:06 +0100
Subject: First untested part: Refactor authentication modules and process
 management to Spring

---
 .../main/resources/moaid.authentication.beans.xml  | 61 ++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml

(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
new file mode 100644
index 000000000..05ceb65f4
--- /dev/null
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -0,0 +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"
+	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">
+ 
+	<bean id="MOAID_AuthenticationManager" 
+				class="at.gv.egovernment.moa.id.moduls.AuthenticationManager"/>
+
+	<bean id="AuthenticationDataBuilder" 
+				class="at.gv.egovernment.moa.id.auth.builder.AuthenticationDataBuilder"/>
+
+	<bean id="MOAID_SSOManager" 
+				class="at.gv.egovernment.moa.id.moduls.SSOManager"/>
+
+	<bean id="TransactionStorage" 
+				class="at.gv.egovernment.moa.id.storage.DBTransactionStorage"/>
+
+	<bean id="AuthenticationSessionStoreage" 
+				class="at.gv.egovernment.moa.id.storage.DBAuthenticationSessionStoreage"/>
+				
+	<bean id="RequestStorage" 
+				class="at.gv.egovernment.moa.id.moduls.RequestStorage"/>
+				
+	<bean id="ProcessInstanceStoreage" 
+				class="at.gv.egovernment.moa.id.process.dao.ProcessInstanceStoreDAOImpl"/>
+
+	<bean id="StatisticLogger" 
+				class="at.gv.egovernment.moa.id.advancedlogging.StatisticLogger"/>
+
+	<bean id="MOAReversionLogger" 
+				class="at.gv.egovernment.moa.id.advancedlogging.MOAReversionLogger"/>
+				
+	<bean id="AuthenticationSessionCleaner" 
+				class="at.gv.egovernment.moa.id.auth.AuthenticationSessionCleaner"/>								
+				
+<!-- Authentication Process Tasks -->
+	<bean id="GenerateBKUSelectionFrameTask" 
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GenerateBKUSelectionFrameTask"/>
+				
+	<bean id="EvaluateBKUSelectionTask" 
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.EvaluateBKUSelectionTask"/>
+				
+	<bean id="RestartAuthProzessManagement" 
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.RestartAuthProzessManagement"/>				
+
+	<bean id="FinalizeAuthenticationTask" 
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.FinalizeAuthenticationTask"/>
+
+	<bean id="CreateInterfedeartionRequestTask" 
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.CreateInterfedeartionRequestTask"/>				
+
+	<bean id="ReceiveInterfederationResponseTask" 
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.ReceiveInterfederationResponseTask"/>				
+				
+</beans>
\ No newline at end of file
-- 
cgit v1.2.3


From c9370266c7553db65e9d18f7fe2a0230ab94d912 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 18 Feb 2016 11:02:55 +0100
Subject: refactor authentication process to use service-provider configuration
 from pending-request

---
 .../idserverlib/src/main/resources/moaid.authentication.beans.xml      | 3 +++
 1 file changed, 3 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 05ceb65f4..82579977c 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -15,6 +15,9 @@
 	<bean id="AuthenticationDataBuilder" 
 				class="at.gv.egovernment.moa.id.auth.builder.AuthenticationDataBuilder"/>
 
+	<bean id="StartAuthentificationParameterParser" 
+				class="at.gv.egovernment.moa.id.auth.parser.StartAuthentificationParameterParser"/>
+
 	<bean id="MOAID_SSOManager" 
 				class="at.gv.egovernment.moa.id.moduls.SSOManager"/>
 
-- 
cgit v1.2.3


From 18f7c6609058ed5c3bfb59c625682f4f4a53d75d Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 19 Feb 2016 10:22:11 +0100
Subject: refactor Single Sign-On authentication consents evaluator to get
 executed by processEngine

---
 .../idserverlib/src/main/resources/moaid.authentication.beans.xml   | 6 ++++++
 1 file changed, 6 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 82579977c..dcaeb42c3 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -61,4 +61,10 @@
 	<bean id="ReceiveInterfederationResponseTask" 
 				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.ReceiveInterfederationResponseTask"/>				
 				
+	<bean id="GenerateSSOConsentEvaluatorFrameTask" 
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GenerateSSOConsentEvaluatorFrameTask"/>
+				
+	<bean id="EvaluateSSOConsentsTaskImpl" 
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.EvaluateSSOConsentsTaskImpl"/>								
+				
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3


From b1235f66ee1e890f9868724f9faedd222541178b Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 22 Feb 2016 11:34:32 +0100
Subject: refactor PVP implementation to share code with PVP Service-Provider
 moduls

---
 .../main/resources/moaid.authentication.beans.xml  | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 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 dcaeb42c3..abb9720a7 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -44,27 +44,35 @@
 				
 <!-- Authentication Process Tasks -->
 	<bean id="GenerateBKUSelectionFrameTask" 
-				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GenerateBKUSelectionFrameTask"/>
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GenerateBKUSelectionFrameTask"
+				scope="prototype"/>
 				
 	<bean id="EvaluateBKUSelectionTask" 
-				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.EvaluateBKUSelectionTask"/>
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.EvaluateBKUSelectionTask"
+				scope="prototype"/>
 				
 	<bean id="RestartAuthProzessManagement" 
-				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.RestartAuthProzessManagement"/>				
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.RestartAuthProzessManagement"
+				scope="prototype"/>				
 
 	<bean id="FinalizeAuthenticationTask" 
-				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.FinalizeAuthenticationTask"/>
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.FinalizeAuthenticationTask"
+				scope="prototype"/>
 
 	<bean id="CreateInterfedeartionRequestTask" 
-				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.CreateInterfedeartionRequestTask"/>				
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.CreateInterfedeartionRequestTask"
+				scope="prototype"/>				
 
 	<bean id="ReceiveInterfederationResponseTask" 
-				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.ReceiveInterfederationResponseTask"/>				
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.ReceiveInterfederationResponseTask"
+				scope="prototype"/>				
 				
 	<bean id="GenerateSSOConsentEvaluatorFrameTask" 
-				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GenerateSSOConsentEvaluatorFrameTask"/>
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GenerateSSOConsentEvaluatorFrameTask"
+				scope="prototype"/>
 				
 	<bean id="EvaluateSSOConsentsTaskImpl" 
-				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.EvaluateSSOConsentsTaskImpl"/>								
+				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.EvaluateSSOConsentsTaskImpl"
+				scope="prototype"/>								
 				
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3


From f81e455bfc1bdd23ce89bfcc0b626210417d0cbb Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 22 Feb 2016 12:27:38 +0100
Subject: fix some refactoring problems

---
 .../idserverlib/src/main/resources/moaid.authentication.beans.xml | 8 --------
 1 file changed, 8 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 abb9720a7..be4402a03 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -58,14 +58,6 @@
 	<bean id="FinalizeAuthenticationTask" 
 				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.FinalizeAuthenticationTask"
 				scope="prototype"/>
-
-	<bean id="CreateInterfedeartionRequestTask" 
-				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.CreateInterfedeartionRequestTask"
-				scope="prototype"/>				
-
-	<bean id="ReceiveInterfederationResponseTask" 
-				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.ReceiveInterfederationResponseTask"
-				scope="prototype"/>				
 				
 	<bean id="GenerateSSOConsentEvaluatorFrameTask" 
 				class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GenerateSSOConsentEvaluatorFrameTask"
-- 
cgit v1.2.3


From d476d340b2fb6694eac18d94e6c0ddbaad5b7545 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 24 Feb 2016 12:16:05 +0100
Subject: move bean definitions

---
 .../src/main/resources/moaid.authentication.beans.xml      | 14 ++++++++++++++
 1 file changed, 14 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 be4402a03..11d92cea3 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -9,6 +9,20 @@
 		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">
  
+ 	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
+		<property name="transitionConditionExpressionEvaluator">
+			<bean class="at.gv.egovernment.moa.id.process.springweb.SpringWebExpressionEvaluator" />
+		</property>
+	</bean>
+	
+	<!-- import auth modules -->
+	<import resource="classpath*:**/*.authmodule.beans.xml" />
+
+	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.auth.modules.registration.ModuleRegistration" factory-method="getInstance" />
+	
+	<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="MOAID_AuthenticationManager" 
 				class="at.gv.egovernment.moa.id.moduls.AuthenticationManager"/>
 
-- 
cgit v1.2.3