From 59fd2c0ea0649c94340d67b735a2d53696065e4c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 26 Jul 2013 07:47:08 +0200
Subject: Bugfixes:  - handle Error if more then one authentication is started
 for one Online-Application  - handle MultiThread error if more then one
 authentication process is active in one user session

Add:
 - Add UserData database. (is required for the web-based configuration tool)
 - Add additional OA parameter in MOA-ID 2.x configuration scheme to set OAs active or not

TODO: change 'searchOAWith....' to only get results with active=true
---
 .../moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd    | 1 +
 .../src/main/resources/config/persistence_template.xml               | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'id/server/moa-id-commons/src/main/resources/config')

diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
index 9f4e54212..a90205260 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
@@ -504,6 +504,7 @@
 	<xsd:complexType name="ProxyComponentType"/>
 	<xsd:complexType name="OnlineApplicationType">
 		<xsd:sequence>
+			<xsd:element name="isActive" type="xsd:boolean" minOccurs="1" maxOccurs="1" default="false"/>
 			<xsd:element name="AuthComponent_OA" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>enthält Parameter über die OA, die die
diff --git a/id/server/moa-id-commons/src/main/resources/config/persistence_template.xml b/id/server/moa-id-commons/src/main/resources/config/persistence_template.xml
index d7ec8c625..727be25ec 100644
--- a/id/server/moa-id-commons/src/main/resources/config/persistence_template.xml
+++ b/id/server/moa-id-commons/src/main/resources/config/persistence_template.xml
@@ -2,9 +2,6 @@
 <persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
 http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <persistence-unit name="##generated">
-			<class>at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore</class>
-      <class>at.gv.egovernment.moa.id.commons.db.dao.session.AuthenticatedSessionStore</class>
-      <class>at.gv.egovernment.moa.id.commons.db.dao.session.OASessionStore</class>
-      <class>at.gv.egovernment.moa.id.commons.db.dao.session.OldSSOSessionIDStore</class> 
+			<class>at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase</class> 
     </persistence-unit>
 </persistence>
-- 
cgit v1.2.3