From 3da3836bcd77a23ca00df2bdb088e63b47cc6499 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 7 Jan 2014 15:07:32 +0100
Subject: mandatory field in global config

---
 .../src/main/resources/config/moaid_config_2.0.xsd      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'id/server')

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 9700b0a4f..b1834fc96 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
@@ -49,7 +49,7 @@
 			<xsd:extension base="xsd:string"/>
 		</xsd:simpleContent>
 	</xsd:complexType>
-	<xsd:element name="AbstractSimpleIdentification" type="AbstractSimpleIdentificationType">
+	<xsd:element name="AbstractSimpleIdentification" type="QualityAuthenticationAssuranceLevelType">
 		<xsd:annotation>
 			<xsd:documentation>possibility to include common austrian primary
 				keys in human readable way, english translation not available
@@ -79,12 +79,13 @@
 			<xsd:pattern value="[A-Z]{2}"/>
 		</xsd:restriction>
 	</xsd:simpleType>
-	<xsd:complexType name="RequestedAttributesType">
+	<xsd:complexType name="StorkAttribute">
 		<xsd:sequence>
-			<xsd:element name="AttributeValue" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element name="name" type="xsd:string"></xsd:element>
+			<xsd:element name="mandatory" type="xsd:boolean"></xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
-	<xsd:element name="RequestedAttributes" type="RequestedAttributesType"/>
+	<xsd:element name="RequestedAttributes" type="StorkAttribute"/>
 	<xsd:simpleType name="LoginType">
 		<xsd:restriction base="xsd:token">
 			<xsd:enumeration value="stateless"/>
@@ -853,7 +854,7 @@
 				</xsd:sequence>
 				<xsd:sequence>
 					<xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0"/>
-					<xsd:element ref="RequestedAttributes"/>
+					<xsd:element ref="RequestedAttributes" maxOccurs="unbounded" minOccurs="1"/>
 				</xsd:sequence>
 			</xsd:choice>
 		</xsd:complexType>
@@ -922,10 +923,10 @@
 			<xsd:sequence>
 				<xsd:element name="StorkLogonEnabled"
 					type="xsd:boolean" />
-				<xsd:element ref="Attributes"></xsd:element>
+				<xsd:element ref="Attributes" maxOccurs="unbounded" minOccurs="1"></xsd:element>
 				<xsd:element ref="Qaa" maxOccurs="1" minOccurs="0"></xsd:element>
 			</xsd:sequence>
-		</xsd:complexType>
+   		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="Contact">
 		<xsd:complexType>
@@ -989,7 +990,7 @@
 		</xsd:sequence>
 	</xsd:complexType>
 
-    <xsd:element name="Attributes" type="RequestedAttributesType"></xsd:element>
+    <xsd:element name="Attributes" type="StorkAttribute"></xsd:element>
 
     <xsd:element name="Qaa" type="QualityAuthenticationAssuranceLevelType"></xsd:element>
 </xsd:schema>
-- 
cgit v1.2.3