From 49acb697426d3c313ad047449ea62ac1bf3f4fd0 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 18 Jul 2013 12:01:21 +0200
Subject: MOA-ID 2.x Configuration implemented   -SSO deaktivated   -Login with
 mandate and normal tested

---
 .../src/main/resources/config/moaid_config_2.0.xsd | 33 +++++++++-------------
 1 file changed, 13 insertions(+), 20 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 136e49154..e7ca2d0dd 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
@@ -51,15 +51,7 @@
 	</xsd:simpleType>
 	<xsd:element name="QualityAuthenticationAssuranceLevel" type="QualityAuthenticationAssuranceLevelType"/>
 	<xsd:element name="AttributeValue" type="xsd:anyType"/>
-	<xsd:complexType name="RequestedAttributeType">
-		<xsd:sequence>
-			<xsd:element ref="AttributeValue" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		<xsd:attribute name="Name" type="xsd:string" use="required"/>
-		<xsd:attribute name="NameFormat" type="xsd:anyURI" use="required"/>
-		<xsd:attribute name="FriendlyName" type="xsd:string" use="optional"/>
-		<xsd:attribute name="isRequired" type="xsd:boolean" use="optional"/>
-	</xsd:complexType>
+	<xsd:complexType name="RequestedAttributeType"/>
 	<xsd:element name="RequestedAttribute" type="RequestedAttributeType"/>
 	<xsd:simpleType name="CountryCodeType">
 		<xsd:restriction base="xsd:token">
@@ -68,7 +60,7 @@
 	</xsd:simpleType>
 	<xsd:complexType name="RequestedAttributesType">
 		<xsd:sequence>
-			<xsd:element ref="RequestedAttribute" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element name="AttributeValue" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:element name="RequestedAttributes" type="RequestedAttributesType"/>
@@ -584,6 +576,7 @@
 						</xsd:simpleType>
 					</xsd:attribute>
 					<xsd:attribute name="useIFrame" type="xsd:boolean" default="false"/>
+					<xsd:attribute name="useUTC" type="xsd:boolean" default="true"/>
 					<!--xsd:element ref="pr:AbstractSimpleIdentification" minOccurs="0" 
 						maxOccurs="1"/ -->
 				</xsd:complexType>
@@ -876,7 +869,7 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="RequestedAttribute" minOccurs="0" maxOccurs="unbounded"/>
+				<xsd:element name="AttributeValue" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
 			<xsd:attribute name="countryCode" type="CountryCodeType" use="required"/>
 			<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>
@@ -903,14 +896,14 @@
 	<xsd:element name="OA_SAML1">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element name="provideStammzahl" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
-				<xsd:element name="provideAUTHBlock" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
-				<xsd:element name="provideIdentityLink" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
-				<xsd:element name="provideCertificate" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
-				<xsd:element name="provideFullMandatorData" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
-				<xsd:element name="useUTC" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
-				<xsd:element name="useCondition" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
-				<xsd:element name="conditionLength" type="xsd:integer" minOccurs="1" maxOccurs="1"/>
+				<xsd:element name="provideStammzahl" type="xsd:boolean" minOccurs="1" maxOccurs="1" default="false"/>
+				<xsd:element name="provideAUTHBlock" type="xsd:boolean" minOccurs="1" maxOccurs="1"  default="false"/>
+				<xsd:element name="provideIdentityLink" type="xsd:boolean" minOccurs="1" maxOccurs="1"  default="false"/>
+				<xsd:element name="provideCertificate" type="xsd:boolean" minOccurs="1" maxOccurs="1"  default="false"/>
+				<xsd:element name="provideFullMandatorData" type="xsd:boolean" minOccurs="1" maxOccurs="1"  default="false"/>
+				<xsd:element name="useCondition" type="xsd:boolean" minOccurs="0" maxOccurs="1"/>
+				<xsd:element name="conditionLength" type="xsd:integer" minOccurs="0" maxOccurs="1"/>
+				<xsd:element name="sourceID" type="xsd:string" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
@@ -936,7 +929,7 @@
 				</xsd:element>
 				<xsd:element name="AlternativeSourceID" type="xsd:string"/>
 				<xsd:element name="CertStoreDirectory" type="xsd:anyURI"/>
-				<xsd:element name="TrustManagerRevocationChecking" type="xsd:boolean"/>
+				<xsd:element name="TrustManagerRevocationChecking" type="xsd:boolean" default="true"/>
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
-- 
cgit v1.2.3