From d0e4e457b349e7d4ffc7b9eb146d79c8100f9781 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 10 Feb 2016 16:25:06 +0100
Subject: switch to Spring based application initializer

---
 .../idserverlib/src/main/resources/moaid.configuration.beans.xml      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml
index 7e319e235..5855fc766 100644
--- a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml
@@ -11,7 +11,9 @@
 
 	<context:property-placeholder location="${moa.id.configuration}"/> 
 
-	<bean id="moaidauthconfig" class="at.gv.egovernment.moa.id.config.auth.PropertyBasedAuthConfigurationProvider"/>
+	<bean id="moaidauthconfig" class="at.gv.egovernment.moa.id.config.auth.PropertyBasedAuthConfigurationProvider">
+		<constructor-arg value="#{systemProperties['moa.id.configuration']}"/>
+	</bean>
 	
 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
 		<aop:scoped-proxy/>
-- 
cgit v1.2.3


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.configuration.beans.xml   | 44 ----------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml

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

diff --git a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml
deleted file mode 100644
index 5855fc766..000000000
--- a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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:property-placeholder location="${moa.id.configuration}"/> 
-
-	<bean id="moaidauthconfig" class="at.gv.egovernment.moa.id.config.auth.PropertyBasedAuthConfigurationProvider">
-		<constructor-arg value="#{systemProperties['moa.id.configuration']}"/>
-	</bean>
-	
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
-		<aop:scoped-proxy/>
-		<property name="driverClassName" value="${configuration.hibernate.connection.driver_class}" />
-		<property name="url" value="${configuration.hibernate.connection.url}"/>
-		<property name="username" value="${configuration.hibernate.connection.username}" />
-		<property name="password" value="${configuration.hibernate.connection.password}" />
-				
-		<property name="connectionProperties" value="${configuration.dbcp.connectionProperties}" />
-		<property name="initialSize" value="${configuration.dbcp.initialSize}" />		
-		<property name="maxActive" value="${configuration.dbcp.maxActive}" />
-		<property name="maxIdle" value="${configuration.dbcp.maxIdle}" />
-		<property name="minIdle" value="${configuration.dbcp.minIdle}" />
-		<property name="maxWait" value="${configuration.dbcp.maxWaitMillis}" />
-		<property name="testOnBorrow" value="${configuration.dbcp.testOnBorrow}" />
-		<property name="testOnReturn" value="${configuration.dbcp.testOnReturn}" />
-		<property name="testWhileIdle" value="${configuration.dbcp.testWhileIdle}" />
-		<property name="validationQuery" value="${configuration.dbcp.validationQuery}" />
-	</bean>
-	
-	<bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
-		<property name="showSql" value="${configuration.hibernate.show_sql}" />
-		<property name="generateDdl" value="${configuration.jpaVendorAdapter.generateDdl}" />
-		<property name="databasePlatform" value="${configuration.hibernate.dialect}" />
-	</bean>
-	
-	
-</beans>
\ No newline at end of file
-- 
cgit v1.2.3


From 274a85e53fa8c06a869f2bb3a7bd24300ee9b3fd Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 17 Feb 2016 06:54:43 +0100
Subject: fix unresolved depentencies

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

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

diff --git a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml
new file mode 100644
index 000000000..5855fc766
--- /dev/null
+++ b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml
@@ -0,0 +1,44 @@
+<?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:property-placeholder location="${moa.id.configuration}"/> 
+
+	<bean id="moaidauthconfig" class="at.gv.egovernment.moa.id.config.auth.PropertyBasedAuthConfigurationProvider">
+		<constructor-arg value="#{systemProperties['moa.id.configuration']}"/>
+	</bean>
+	
+	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
+		<aop:scoped-proxy/>
+		<property name="driverClassName" value="${configuration.hibernate.connection.driver_class}" />
+		<property name="url" value="${configuration.hibernate.connection.url}"/>
+		<property name="username" value="${configuration.hibernate.connection.username}" />
+		<property name="password" value="${configuration.hibernate.connection.password}" />
+				
+		<property name="connectionProperties" value="${configuration.dbcp.connectionProperties}" />
+		<property name="initialSize" value="${configuration.dbcp.initialSize}" />		
+		<property name="maxActive" value="${configuration.dbcp.maxActive}" />
+		<property name="maxIdle" value="${configuration.dbcp.maxIdle}" />
+		<property name="minIdle" value="${configuration.dbcp.minIdle}" />
+		<property name="maxWait" value="${configuration.dbcp.maxWaitMillis}" />
+		<property name="testOnBorrow" value="${configuration.dbcp.testOnBorrow}" />
+		<property name="testOnReturn" value="${configuration.dbcp.testOnReturn}" />
+		<property name="testWhileIdle" value="${configuration.dbcp.testWhileIdle}" />
+		<property name="validationQuery" value="${configuration.dbcp.validationQuery}" />
+	</bean>
+	
+	<bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
+		<property name="showSql" value="${configuration.hibernate.show_sql}" />
+		<property name="generateDdl" value="${configuration.jpaVendorAdapter.generateDdl}" />
+		<property name="databasePlatform" value="${configuration.hibernate.dialect}" />
+	</bean>
+	
+	
+</beans>
\ No newline at end of file
-- 
cgit v1.2.3


From 54a26c8e353069abacefe5232f8270bec6b3cc60 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 21 Mar 2016 15:49:24 +0100
Subject: update libs

---
 .../idserverlib/src/main/resources/moaid.configuration.beans.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml
index 5855fc766..9c27ba581 100644
--- a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml
@@ -15,7 +15,7 @@
 		<constructor-arg value="#{systemProperties['moa.id.configuration']}"/>
 	</bean>
 	
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
+	<bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" lazy-init="true" destroy-method="close">
 		<aop:scoped-proxy/>
 		<property name="driverClassName" value="${configuration.hibernate.connection.driver_class}" />
 		<property name="url" value="${configuration.hibernate.connection.url}"/>
@@ -24,10 +24,10 @@
 				
 		<property name="connectionProperties" value="${configuration.dbcp.connectionProperties}" />
 		<property name="initialSize" value="${configuration.dbcp.initialSize}" />		
-		<property name="maxActive" value="${configuration.dbcp.maxActive}" />
+		<property name="maxTotal" value="${configuration.dbcp.maxActive}" />
 		<property name="maxIdle" value="${configuration.dbcp.maxIdle}" />
 		<property name="minIdle" value="${configuration.dbcp.minIdle}" />
-		<property name="maxWait" value="${configuration.dbcp.maxWaitMillis}" />
+		<!-- property name="maxWait" value="${configuration.dbcp.maxWaitMillis}" / -->
 		<property name="testOnBorrow" value="${configuration.dbcp.testOnBorrow}" />
 		<property name="testOnReturn" value="${configuration.dbcp.testOnReturn}" />
 		<property name="testWhileIdle" value="${configuration.dbcp.testWhileIdle}" />
-- 
cgit v1.2.3