From 328f850d0b5775bc8aed8f5ced1a6ef6269cb831 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 6 Aug 2013 18:53:14 +0200
Subject:  - Change UserBase implementation  - starts with general MOAID Config

---
 .../src/main/resources/config/moaid_config_2.0.xsd | 69 ++++++++++++----------
 .../main/resources/config/persistence_template.xml |  2 +-
 2 files changed, 39 insertions(+), 32 deletions(-)

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

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 a90205260..ac8aa3b40 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
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Mit XMLSpy v2013 sp1 (http://www.altova.com) von Thomas Lenz (Graz University of Technology IAIK) bearbeitet -->
 <xsd:schema xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.buergerkarte.at/namespaces/moaconfig#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0.0">
+	<xsd:complexType name="OnlineApplication">
+		<xsd:complexContent>
+			<xsd:extension base="OnlineApplicationType">
+				<xsd:attribute name="publicURLPrefix" type="xsd:anyURI" use="required"/>
+				<xsd:attribute name="keyBoxIdentifier" type="MOAKeyBoxSelector" use="optional" default="SecureSignatureKeypair"/>
+				<xsd:attribute name="type" use="optional" default="publicService">
+					<xsd:simpleType>
+						<xsd:restriction base="xsd:NMTOKEN">
+							<xsd:enumeration value="businessService"/>
+							<xsd:enumeration value="publicService"/>
+						</xsd:restriction>
+					</xsd:simpleType>
+				</xsd:attribute>
+				<xsd:attribute name="calculateHPI" type="xsd:boolean" use="optional" default="false"/>
+				<xsd:attribute name="friendlyName" type="xsd:string" use="optional"/>
+				<xsd:attribute name="target" type="xsd:string" use="optional"/>
+				<xsd:attribute name="targetFriendlyName" type="xsd:string" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
 	<xsd:element name="Configuration">
 		<xsd:complexType>
 			<xsd:sequence>
@@ -171,31 +191,11 @@
 						</xsd:sequence>
 					</xsd:complexType>
 				</xsd:element>
-				<xsd:element name="OnlineApplication" maxOccurs="unbounded">
+				<xsd:element name="OnlineApplication" type="OnlineApplication" maxOccurs="unbounded">
 					<xsd:annotation>
 						<xsd:documentation>enthält Parameter für die OA
 						</xsd:documentation>
 					</xsd:annotation>
-					<xsd:complexType>
-						<xsd:complexContent>
-							<xsd:extension base="OnlineApplicationType">
-								<xsd:attribute name="publicURLPrefix" type="xsd:anyURI" use="required"/>
-								<xsd:attribute name="keyBoxIdentifier" type="MOAKeyBoxSelector" use="optional" default="SecureSignatureKeypair"/>
-								<xsd:attribute name="type" use="optional" default="publicService">
-									<xsd:simpleType>
-										<xsd:restriction base="xsd:NMTOKEN">
-											<xsd:enumeration value="businessService"/>
-											<xsd:enumeration value="publicService"/>
-										</xsd:restriction>
-									</xsd:simpleType>
-								</xsd:attribute>
-								<xsd:attribute name="calculateHPI" type="xsd:boolean" use="optional" default="false"/>
-								<xsd:attribute name="friendlyName" type="xsd:string" use="optional"/>
-								<xsd:attribute name="target" type="xsd:string" use="optional"/>
-								<xsd:attribute name="targetFriendlyName" type="xsd:string" use="optional"/>
-							</xsd:extension>
-						</xsd:complexContent>
-					</xsd:complexType>
 				</xsd:element>
 				<xsd:element name="ChainingModes" minOccurs="0">
 					<xsd:annotation>
@@ -429,15 +429,6 @@
 					</xsd:sequence>
 				</xsd:complexType>
 			</xsd:element>
-			<xsd:element name="Templates">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="OnlineBKU" type="xsd:anyURI" minOccurs="1" maxOccurs="1"/>
-						<xsd:element name="HandyBKU" type="xsd:anyURI" minOccurs="1" maxOccurs="1"/>
-						<xsd:element name="LocalBKU" type="xsd:anyURI" minOccurs="1" maxOccurs="1"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:complexType name="TransformsInfoType">
@@ -504,7 +495,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="isActive" type="xsd:boolean" default="false" minOccurs="1" maxOccurs="1"/>
 			<xsd:element name="AuthComponent_OA" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>enthält Parameter über die OA, die die
@@ -941,4 +932,20 @@
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
+	<xsd:complexType name="UserDatabase">
+		<xsd:sequence>
+			<xsd:element name="bpk" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="familyname" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="givenname" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="institut" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="mail" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="phone" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="username" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="password" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="isActive" type="xsd:boolean" default="true" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="isAdmin" type="xsd:boolean" default="true" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="lastLogin" type="xsd:date" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="OnlineApplication" type="OnlineApplication" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+	</xsd:complexType>
 </xsd:schema>
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 bd60f5a46..25092ff58 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,7 +2,7 @@
 <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.config.UserDatabase</class>
+			<!-- <class>at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase</class> -->
 			
 <!-- 			<properties>
 			    C3p0 connection pooling configuration
-- 
cgit v1.2.3