From c20d8f3da0b112864130031d39800e60289380d4 Mon Sep 17 00:00:00 2001
From: Christian Wagner <c.wagner@datentechnik-innovation.com>
Date: Tue, 13 Jan 2015 16:12:36 +0100
Subject: add raw configuration persistence functionality

some problems: * all tables annotated via '@Table' are created in every database connected
               * loading of 'Configuration' via Spring isn't pretty at all
---
 .../src/main/resources/configuration.beans.xml     | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 id/server/moa-id-commons/src/main/resources/configuration.beans.xml

(limited to 'id/server/moa-id-commons/src/main/resources/configuration.beans.xml')

diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
new file mode 100644
index 000000000..762c55507
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
@@ -0,0 +1,53 @@
+<?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">
+
+	<tx:annotation-driven />
+	<context:annotation-config />
+
+	<context:property-placeholder location="${location}"/>  
+
+
+	<bean id="configPropertyDao"
+		class="com.datentechnik.moa.id.conf.persistence.dal.ConfigPropertyDaoImpl" />
+	<bean id="config" class="com.datentechnik.moa.id.conf.persistence.ConfigurationImpl">
+		<property name="configPropertyDao" ref="configPropertyDao" />
+	</bean>
+
+
+	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
+		<aop:scoped-proxy/>
+		<property name="driverClassName" value="${dataSource.driverClassName}" />
+		<property name="url" value="${dataSource.url}"/>
+		<property name="username" value="${dataSource.username}" />
+		<property name="password" value="${dataSource.password}" />
+		<property name="testOnBorrow" value="true" />
+		<property name="validationQuery" value="SELECT 1" />
+	</bean>
+	
+
+	<bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
+		<property name="showSql" value="true" />
+		<property name="generateDdl" value="${jpaVendorAdapter.generateDdl}" />
+		<property name="databasePlatform" value="${jpaVendorAdapter.databasePlatform}" />
+	</bean>
+
+
+	<bean name="moaidconf" id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+		<property name="dataSource" ref="dataSource" />
+		<property name="jpaVendorAdapter" ref="jpaVendorAdapter" />
+		<property name="persistenceUnitName" value="moaidconf" />
+	</bean>
+	
+	 <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+		<property name="entityManagerFactory" ref="entityManagerFactory" />
+	</bean>  
+	
+</beans>
\ No newline at end of file
-- 
cgit v1.2.3


From 8ce4c2f836484676b5d5a98001613a72df15d22d Mon Sep 17 00:00:00 2001
From: Gerwin Gsenger <g.gsenger@datentechnik-innovation.at>
Date: Wed, 14 Jan 2015 10:27:47 +0100
Subject: add NewAuthenticationProvider (instantiated as Spring bean, reads
 JSON from db), add AuthConfiguration interface for Authentication providers

---
 id/server/moa-id-commons/src/main/resources/configuration.beans.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'id/server/moa-id-commons/src/main/resources/configuration.beans.xml')

diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
index 762c55507..a2e678a5f 100644
--- a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
+++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
@@ -21,6 +21,7 @@
 		<property name="configPropertyDao" ref="configPropertyDao" />
 	</bean>
 
+	<bean id="auth" class="at.gv.egovernment.moa.id.config.auth.NewAuthConfigurationProvider"/>
 
 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
 		<aop:scoped-proxy/>
-- 
cgit v1.2.3


From 22474d762e26931489593403774c1755601878be Mon Sep 17 00:00:00 2001
From: Christian Wagner <c.wagner@datentechnik-innovation.com>
Date: Wed, 14 Jan 2015 15:16:43 +0100
Subject: add a class that has the same method signatures as
 'ConfiguratiohnDBRead' and is capable of reading from the new key-value DB

---
 id/server/moa-id-commons/src/main/resources/configuration.beans.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'id/server/moa-id-commons/src/main/resources/configuration.beans.xml')

diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
index a2e678a5f..1a2e1fedd 100644
--- a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
+++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
@@ -22,6 +22,8 @@
 	</bean>
 
 	<bean id="auth" class="at.gv.egovernment.moa.id.config.auth.NewAuthConfigurationProvider"/>
+	
+	<bean id="auth" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBRead"/>
 
 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
 		<aop:scoped-proxy/>
-- 
cgit v1.2.3


From f2ebaedd107e0660150faeee6dbe06be5094ac0a Mon Sep 17 00:00:00 2001
From: Gerwin Gsenger <g.gsenger@datentechnik-innovation.at>
Date: Mon, 19 Jan 2015 10:00:36 +0100
Subject: add workaround for static field bean initialization, rework
 getMOAIDConfiguration()

---
 id/server/moa-id-commons/src/main/resources/configuration.beans.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/moa-id-commons/src/main/resources/configuration.beans.xml')

diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
index 1a2e1fedd..ee906a407 100644
--- a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
+++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
@@ -23,7 +23,7 @@
 
 	<bean id="auth" class="at.gv.egovernment.moa.id.config.auth.NewAuthConfigurationProvider"/>
 	
-	<bean id="auth" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBRead"/>
+	<bean id="configRead" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBRead"/>
 
 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
 		<aop:scoped-proxy/>
-- 
cgit v1.2.3


From 4791f1f77125e1c4c76d189f441924fd62874091 Mon Sep 17 00:00:00 2001
From: Christian Wagner <c.wagner@datentechnik-innovation.com>
Date: Mon, 19 Jan 2015 15:57:51 +0100
Subject: add writer to store the configuration in key-value database

use solely kv database within 'AuthConfigurationProvider'
add constants declaring db keys
---
 id/server/moa-id-commons/src/main/resources/configuration.beans.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'id/server/moa-id-commons/src/main/resources/configuration.beans.xml')

diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
index ee906a407..87cccc7b2 100644
--- a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
+++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
@@ -25,6 +25,8 @@
 	
 	<bean id="configRead" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBRead"/>
 
+	<bean id="configWrite" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBWrite"/>
+
 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
 		<aop:scoped-proxy/>
 		<property name="driverClassName" value="${dataSource.driverClassName}" />
-- 
cgit v1.2.3


From 15c60cf9939536c352778c6c411608397e57c516 Mon Sep 17 00:00:00 2001
From: Gerwin Gsenger <g.gsenger@datentechnik-innovation.at>
Date: Thu, 22 Jan 2015 16:49:49 +0100
Subject: add CLI migration (XML to property file, property file to db, db to
 property file)

---
 id/server/moa-id-commons/src/main/resources/configuration.beans.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'id/server/moa-id-commons/src/main/resources/configuration.beans.xml')

diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
index 87cccc7b2..444b01095 100644
--- a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
+++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
@@ -21,8 +21,6 @@
 		<property name="configPropertyDao" ref="configPropertyDao" />
 	</bean>
 
-	<bean id="auth" class="at.gv.egovernment.moa.id.config.auth.NewAuthConfigurationProvider"/>
-	
 	<bean id="configRead" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBRead"/>
 
 	<bean id="configWrite" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBWrite"/>
-- 
cgit v1.2.3


From 0fb4c31f049d71e917dfbfdab96553a807195d0c Mon Sep 17 00:00:00 2001
From: Martin Bonato <mbonato@datentechnik-innovation.com>
Date: Thu, 9 Apr 2015 13:24:55 +0200
Subject: Rename java packages

---
 id/server/moa-id-commons/src/main/resources/configuration.beans.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/moa-id-commons/src/main/resources/configuration.beans.xml')

diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
index 444b01095..732c19721 100644
--- a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
+++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
@@ -16,8 +16,8 @@
 
 
 	<bean id="configPropertyDao"
-		class="com.datentechnik.moa.id.conf.persistence.dal.ConfigPropertyDaoImpl" />
-	<bean id="config" class="com.datentechnik.moa.id.conf.persistence.ConfigurationImpl">
+		class="at.gv.egovernment.moa.id.commons.db.dao.config.ConfigPropertyDaoImpl" />
+	<bean id="config" class="at.gv.egovernment.moa.id.commons.config.persistence.ConfigurationImpl">
 		<property name="configPropertyDao" ref="configPropertyDao" />
 	</bean>
 
-- 
cgit v1.2.3


From 5bc01dab26425144a41dbece04b642fb963e1315 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 2 Jul 2015 07:26:30 +0200
Subject: devel

---
 .../src/main/resources/configuration.beans.xml     | 56 ----------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 id/server/moa-id-commons/src/main/resources/configuration.beans.xml

(limited to 'id/server/moa-id-commons/src/main/resources/configuration.beans.xml')

diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
deleted file mode 100644
index 732c19721..000000000
--- a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
+++ /dev/null
@@ -1,56 +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">
-
-	<tx:annotation-driven />
-	<context:annotation-config />
-
-	<context:property-placeholder location="${location}"/>  
-
-
-	<bean id="configPropertyDao"
-		class="at.gv.egovernment.moa.id.commons.db.dao.config.ConfigPropertyDaoImpl" />
-	<bean id="config" class="at.gv.egovernment.moa.id.commons.config.persistence.ConfigurationImpl">
-		<property name="configPropertyDao" ref="configPropertyDao" />
-	</bean>
-
-	<bean id="configRead" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBRead"/>
-
-	<bean id="configWrite" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBWrite"/>
-
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
-		<aop:scoped-proxy/>
-		<property name="driverClassName" value="${dataSource.driverClassName}" />
-		<property name="url" value="${dataSource.url}"/>
-		<property name="username" value="${dataSource.username}" />
-		<property name="password" value="${dataSource.password}" />
-		<property name="testOnBorrow" value="true" />
-		<property name="validationQuery" value="SELECT 1" />
-	</bean>
-	
-
-	<bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
-		<property name="showSql" value="true" />
-		<property name="generateDdl" value="${jpaVendorAdapter.generateDdl}" />
-		<property name="databasePlatform" value="${jpaVendorAdapter.databasePlatform}" />
-	</bean>
-
-
-	<bean name="moaidconf" id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<property name="dataSource" ref="dataSource" />
-		<property name="jpaVendorAdapter" ref="jpaVendorAdapter" />
-		<property name="persistenceUnitName" value="moaidconf" />
-	</bean>
-	
-	 <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-		<property name="entityManagerFactory" ref="entityManagerFactory" />
-	</bean>  
-	
-</beans>
\ No newline at end of file
-- 
cgit v1.2.3


From 409e23a07616387d675e065ceac7172997fef5b7 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 2 Jul 2015 07:34:08 +0200
Subject: new files for key/value config

---
 .../src/main/resources/configuration.beans.xml     | 56 ++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 id/server/moa-id-commons/src/main/resources/configuration.beans.xml

(limited to 'id/server/moa-id-commons/src/main/resources/configuration.beans.xml')

diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
new file mode 100644
index 000000000..ea0e7c78d
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
@@ -0,0 +1,56 @@
+<?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 />
+	
+	<context:property-placeholder location="${location}"/>  
+
+	<bean id="configPropertyDao" 
+				class="at.gv.egovernment.moa.id.commons.db.dao.config.DatabaseConfigPropertyImpl"/>
+		
+	<bean id="moaidconfig" class="at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfigurationImpl" />
+<!-- 		<property name="configPropertyDao" ref="configPropertyDao" />
+	</bean> -->
+	
+
+<!--  	<bean id="configRead" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBRead"/> -->
+<!-- <bean id="configWrite" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBWrite"/> -->
+
+	<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="testOnBorrow" value="true" />
+		<property name="validationQuery" value="SELECT 1" />
+	</bean>
+	
+
+	<bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
+		<property name="showSql" value="true" />
+		<property name="generateDdl" value="${jpaVendorAdapter.generateDdl}" />
+		<property name="databasePlatform" value="${configuration.hibernate.dialect}" />
+	</bean>
+
+
+	<bean name="config" id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+		<property name="dataSource" ref="dataSource" />
+		<property name="jpaVendorAdapter" ref="jpaVendorAdapter" />
+		<property name="persistenceUnitName" value="config" />
+	</bean>
+	
+	 <bean name="transactionManager" id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+		<property name="entityManagerFactory" ref="entityManagerFactory" />
+	</bean>  
+	<tx:annotation-driven transaction-manager="transactionManager"/>
+	
+</beans>
\ No newline at end of file
-- 
cgit v1.2.3


From 98dbb23fa5dcd9518beb56fd2410667b385b5524 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 17 Jul 2015 09:18:28 +0200
Subject: first beta version of new MOA-ID WebGUI module for configuration

---
 .../src/main/resources/configuration.beans.xml     | 28 ++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'id/server/moa-id-commons/src/main/resources/configuration.beans.xml')

diff --git a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
index ea0e7c78d..775d02d05 100644
--- a/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
+++ b/id/server/moa-id-commons/src/main/resources/configuration.beans.xml
@@ -11,7 +11,10 @@
 
 	<context:annotation-config />
 	
-	<context:property-placeholder location="${location}"/>  
+	<!-- context:property-placeholder location="${location}"/-->  
+	
+<!-- 	<bean class="at.gv.egovernment.moa.id.commons.config.persistence.JPAPropertiesWithJavaConfig">
+	</bean> -->
 
 	<bean id="configPropertyDao" 
 				class="at.gv.egovernment.moa.id.commons.db.dao.config.DatabaseConfigPropertyImpl"/>
@@ -24,22 +27,27 @@
 <!--  	<bean id="configRead" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBRead"/> -->
 <!-- <bean id="configWrite" class="at.gv.egovernment.moa.id.commons.db.NewConfigurationDBWrite"/> -->
 
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
+<!-- 	<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="driverClassName" value="${hibernate.connection.driver_class}" />
+		<property name="url" value="${hibernate.connection.url}"/>
+		<property name="username" value="${hibernate.connection.username}" />
+		<property name="password" value="${hibernate.connection.password}" />
 		<property name="testOnBorrow" value="true" />
 		<property name="validationQuery" value="SELECT 1" />
-	</bean>
+	</bean> -->
 	
 
-	<bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
+<!-- 	<bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
 		<property name="showSql" value="true" />
 		<property name="generateDdl" value="${jpaVendorAdapter.generateDdl}" />
-		<property name="databasePlatform" value="${configuration.hibernate.dialect}" />
-	</bean>
+		<property name="generateDdl">
+			<bean class="java.lang.Boolean">
+				<constructor-arg value="${jpaVendorAdapter.generateDdl}"/>
+			</bean>
+		</property> 
+		<property name="databasePlatform" value="${hibernate.dialect}" />
+	</bean> -->
 
 
 	<bean name="config" id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-- 
cgit v1.2.3