From 9ab0682606cf90fd8d4730cded8c8f7202c0699a Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 22 Dec 2011 02:19:22 +0100
Subject: upgrade to fresh version of mdui schema

---
 schema.xsd                            |  2 +-
 schema/mdui-schema.xsd                | 48 -------------------
 schema/sstc-saml-metadata-ui-v1.0.xsd | 87 +++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 49 deletions(-)
 delete mode 100644 schema/mdui-schema.xsd
 create mode 100644 schema/sstc-saml-metadata-ui-v1.0.xsd

diff --git a/schema.xsd b/schema.xsd
index 4c47b877..e156b8ce 100644
--- a/schema.xsd
+++ b/schema.xsd
@@ -5,7 +5,7 @@
 <import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="sstc-saml-schema-assertion-2.0.xsd"/>
 <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="sstc-saml-schema-metadata-2.0.xsd"/>
 <import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="cs-sstc-schema-assertion-1.1.xsd"/>
-<import namespace="urn:oasis:names:tc:SAML:2.0:metadata:ui" schemaLocation="mdui-schema.xsd"/>
+<import namespace="urn:oasis:names:tc:SAML:2.0:metadata:ui" schemaLocation="sstc-saml-metadata-ui-v1.0.xsd"/>
 <import namespace="http://schemas.xmlsoap.org/ws/2004/09/mex" schemaLocation="MetadataExchange.xsd"/>
 <import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
 <import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
diff --git a/schema/mdui-schema.xsd b/schema/mdui-schema.xsd
deleted file mode 100644
index 03ca32a5..00000000
--- a/schema/mdui-schema.xsd
+++ /dev/null
@@ -1,48 +0,0 @@
-<schema targetNamespace="urn:oasis:names:tc:SAML:2.0:metadata:ui"
-	    xmlns:mdui="urn:oasis:names:tc:SAML:2.0:metadata:ui"
-        xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-        xmlns="http://www.w3.org/2001/XMLSchema"
-        elementFormDefault="unqualified"
-        attributeFormDefault="unqualified"
-        blockDefault="substitution"
-        version="2.0" >
-
-    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="sstc-saml-schema-assertion-2.0.xsd"/>
-    <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="sstc-saml-schema-metadata-2.0.xsd"/>
-    <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
-
-    <annotation>
-	    <documentation>
-			Document identifier: TODO
-            Location: TODO
-            Revision history: TODO
-		</documentation>
-	</annotation>
-
-    <element name="DisplayName" type="md:localizedNameType" />
-
-    <element name="Description" type="md:localizedNameType" />
-
-    <element name="Logo" type="mdui:LogoType" />
-	<complexType name="LogoType">
-	   <simpleContent>
-	      <extension base="string">
-	         <attribute ref="xml:lang" use="optional"/>
-	         <attribute name="href" type="anyURI" use="optional"/>
-	         <attribute name="height" type="positiveInteger" use="optional" />
-	         <attribute name="width" type="positiveInteger" use="optional" />
-	      </extension>
-	   </simpleContent>
-	</complexType>
-	
-	<element name="InformationURL" type="md:localizedURIType" />
-	
-	<element name="PrivacyStatementURL" type="md:localizedURIType" />
-	
-	<element name="IPHint" type="string" />
-	
-	<element name="DomainHint" type="string" />
-	
-	<element name="GeolocationHint" type="string" />
-	
-</schema>
diff --git a/schema/sstc-saml-metadata-ui-v1.0.xsd b/schema/sstc-saml-metadata-ui-v1.0.xsd
new file mode 100644
index 00000000..5894cb50
--- /dev/null
+++ b/schema/sstc-saml-metadata-ui-v1.0.xsd
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema 
+  targetNamespace="urn:oasis:names:tc:SAML:metadata:ui"
+  xmlns="http://www.w3.org/2001/XMLSchema"
+  xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+  xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+  elementFormDefault="unqualified"
+  attributeFormDefault="unqualified"
+  blockDefault="substitution"
+  version="1.0">
+
+  <annotation>
+    <documentation>
+      Document title: Metadata Extension Schema for SAML V2.0 Metadata Extensions for Login and Discovery User Interface Version 1.0
+      Document identifier: sstc-saml-metadata-ui-v1.0.xsd
+      Location: http://docs.oasis-open.org/security/saml/Post2.0/
+      Revision history:
+      01 November 2010
+        Changed filename.
+      September 2010:
+        Initial version.
+    </documentation>
+  </annotation>
+
+  <import namespace="urn:oasis:names:tc:SAML:2.0:metadata"
+    schemaLocation="saml-schema-metadata-2.0.xsd"/>
+  <import namespace="http://www.w3.org/XML/1998/namespace"
+    schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
+  <element name="UIInfo" type="mdui:UIInfoType" />
+  <complexType name="UIInfoType">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <element ref="mdui:DisplayName"/>
+      <element ref="mdui:Description"/>
+      <element ref="mdui:Keywords"/>
+      <element ref="mdui:Logo"/>
+      <element ref="mdui:InformationURL"/>
+      <element ref="mdui:PrivacyStatementURL"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </complexType>
+
+  <element name="DisplayName" type="md:localizedNameType"/>
+  <element name="Description" type="md:localizedNameType"/>
+  <element name="InformationURL" type="md:localizedURIType"/>
+  <element name="PrivacyStatementURL" type="md:localizedURIType"/>
+
+  <element name="Keywords" type="mdui:KeywordsType"/>
+  <complexType name="KeywordsType">
+    <simpleContent>
+      <extension base="mdui:listOfStrings">
+        <attribute ref="xml:lang" use="required"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+  
+  <simpleType name="listOfStrings">
+    <list itemType="string"/>
+  </simpleType>
+
+  <element name="Logo" type="mdui:LogoType"/>
+  <complexType name="LogoType">
+    <simpleContent>
+      <extension base="anyURI">
+        <attribute name="height" type="positiveInteger" use="required"/>
+        <attribute name="width" type="positiveInteger" use="required"/>
+        <attribute ref="xml:lang"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+  <element name="DiscoHints" type="mdui:DiscoHintsType"/>
+  <complexType name="DiscoHintsType">
+    <choice minOccurs="0" maxOccurs="unbounded">
+      <element ref="mdui:IPHint"/>
+      <element ref="mdui:DomainHint"/>
+      <element ref="mdui:GeolocationHint"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </complexType>
+
+  <element name="IPHint" type="string"/>
+  <element name="DomainHint" type="string"/>	
+  <element name="GeolocationHint" type="anyURI"/>
+
+</schema>
+
-- 
cgit v1.2.3