From 7fb3ae0e4922ec76e998937b771df244574be394 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 14 Jan 2014 13:45:24 +0100
Subject: refactored stork-related database structure

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

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

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 6972b031c..3ed7c936a 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
@@ -72,8 +72,6 @@
 	</xsd:simpleType>
 	<xsd:element name="QualityAuthenticationAssuranceLevel" type="QualityAuthenticationAssuranceLevelType"/>
 	<xsd:element name="AttributeValue" type="xsd:anyType"/>
-	<xsd:complexType name="RequestedAttributeType"/>
-	<xsd:element name="RequestedAttribute" type="RequestedAttributeType"/>
 	<xsd:simpleType name="CountryCodeType">
 		<xsd:restriction base="xsd:token">
 			<xsd:pattern value="[A-Z]{2}"/>
@@ -85,7 +83,6 @@
 			<xsd:element name="mandatory" type="xsd:boolean"></xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
-	<xsd:element name="RequestedAttributes" type="StorkAttribute"/>
 	<xsd:simpleType name="LoginType">
 		<xsd:restriction base="xsd:token">
 			<xsd:enumeration value="stateless"/>
@@ -853,8 +850,10 @@
 					<xsd:element ref="SAMLSigningParameter"/>
 				</xsd:sequence>
 				<xsd:sequence>
-					<xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0"/>
-					<xsd:element ref="RequestedAttributes" maxOccurs="unbounded" minOccurs="1"/>
+					<xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0" />
+				</xsd:sequence>
+				<xsd:sequence>
+					<xsd:element ref="Attributes" maxOccurs="unbounded" minOccurs="0" />
 				</xsd:sequence>
 			</xsd:choice>
 		</xsd:complexType>
@@ -924,7 +923,7 @@
 				<xsd:element name="StorkLogonEnabled"
 					type="xsd:boolean" />
 				<xsd:element ref="Qaa" maxOccurs="1" minOccurs="0"></xsd:element>
-				<xsd:element name="Attributes" type="OAStorkAttribute" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+				<xsd:element ref="OAAttributes" maxOccurs="unbounded" minOccurs="0"></xsd:element>
 			</xsd:sequence>
    		</xsd:complexType>
 	</xsd:element>
@@ -996,8 +995,10 @@
 
     <xsd:complexType name="OAStorkAttribute">
     	<xsd:sequence>
-    		<xsd:element name="attribute" type="StorkAttribute"></xsd:element>
     		<xsd:element name="mandatory" type="xsd:boolean"></xsd:element>
+    		<xsd:element name="name" type="xsd:string"></xsd:element>
     	</xsd:sequence>
     </xsd:complexType>
+
+    <xsd:element name="OAAttributes" type="OAStorkAttribute"></xsd:element>
 </xsd:schema>
-- 
cgit v1.2.3