From 71da4a9bc7e2ff79b2fb4cf8903d15fd75372859 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 19 Jul 2013 11:50:19 +0200
Subject: SSO and Configuration updated TODO:   --PVP2 from configuration  
 --UseIFrame for OAs   --SSO with mandates   --Resign IdentityLink  
 --Encrypted MOASession in Database

---
 .../src/main/resources/config/moaid_config_2.0.xsd | 36 ++++++++++++----------
 1 file changed, 20 insertions(+), 16 deletions(-)

(limited to 'id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd')

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 e7ca2d0dd..b7982aca5 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
@@ -329,10 +329,13 @@
 			</xsd:element>
 			<xsd:element name="SSO">
 				<xsd:complexType>
-					<xsd:sequence>
+					<xsd:choice>
 						<xsd:element name="target" type="xsd:string"/>
-						<xsd:element name="FriendlyName" type="xsd:string"/>
-					</xsd:sequence>
+						<xsd:element ref="IdentificationNumber" minOccurs="1"/>
+					</xsd:choice>
+					<xsd:attribute name="PublicURL" type="xsd:string"/>
+					<xsd:attribute name="FriendlyName" type="xsd:string"/>
+					<xsd:attribute name="SpecialText" type="xsd:string"/>
 				</xsd:complexType>
 			</xsd:element>
 			<xsd:element name="SecurityLayer">
@@ -538,14 +541,7 @@
 								</xsd:sequence>
 							</xsd:complexType>
 						</xsd:element>
-						<xsd:element name="IdentificationNumber" minOccurs="0">
-							<xsd:complexType>
-								<xsd:sequence>
-									<xsd:element name="Type" type="xsd:string"/>
-									<xsd:element name="Value" type="xsd:string"/>
-								</xsd:sequence>
-							</xsd:complexType>
-						</xsd:element>
+						<xsd:element ref="IdentificationNumber" minOccurs="0"/>
 						<xsd:element name="Templates" type="TemplatesType" minOccurs="0"/>
 						<xsd:element name="TransformsInfo" type="TransformsInfoType" minOccurs="0" maxOccurs="unbounded"/>
 						<xsd:element name="Mandates" minOccurs="0">
@@ -896,11 +892,11 @@
 	<xsd:element name="OA_SAML1">
 		<xsd:complexType>
 			<xsd:sequence>
-				<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="provideStammzahl" type="xsd:boolean" default="false" minOccurs="1" maxOccurs="1"/>
+				<xsd:element name="provideAUTHBlock" type="xsd:boolean" default="false" minOccurs="1" maxOccurs="1"/>
+				<xsd:element name="provideIdentityLink" type="xsd:boolean" default="false" minOccurs="1" maxOccurs="1"/>
+				<xsd:element name="provideCertificate" type="xsd:boolean" default="false" minOccurs="1" maxOccurs="1"/>
+				<xsd:element name="provideFullMandatorData" type="xsd:boolean" default="false" minOccurs="1" maxOccurs="1"/>
 				<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"/>
@@ -933,4 +929,12 @@
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
+	<xsd:element name="IdentificationNumber">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="Type" type="xsd:string"/>
+				<xsd:element name="Value" type="xsd:string"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
 </xsd:schema>
-- 
cgit v1.2.3