upgrade to fresh version of mdui schema
authorLeif Johansson <leifj@sunet.se>
Thu, 22 Dec 2011 01:19:22 +0000 (02:19 +0100)
committerLeif Johansson <leifj@sunet.se>
Thu, 22 Dec 2011 01:19:22 +0000 (02:19 +0100)
schema.xsd
schema/mdui-schema.xsd [deleted file]
schema/sstc-saml-metadata-ui-v1.0.xsd [new file with mode: 0644]

index 4c47b87..e156b8c 100644 (file)
@@ -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 (file)
index 03ca32a..0000000
+++ /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 (file)
index 0000000..5894cb5
--- /dev/null
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<schema \r
+  targetNamespace="urn:oasis:names:tc:SAML:metadata:ui"\r
+  xmlns="http://www.w3.org/2001/XMLSchema"\r
+  xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"\r
+  xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"\r
+  elementFormDefault="unqualified"\r
+  attributeFormDefault="unqualified"\r
+  blockDefault="substitution"\r
+  version="1.0">\r
+\r
+  <annotation>\r
+    <documentation>\r
+      Document title: Metadata Extension Schema for SAML V2.0 Metadata Extensions for Login and Discovery User Interface Version 1.0\r
+      Document identifier: sstc-saml-metadata-ui-v1.0.xsd\r
+      Location: http://docs.oasis-open.org/security/saml/Post2.0/\r
+      Revision history:\r
+      01 November 2010\r
+        Changed filename.\r
+      September 2010:\r
+        Initial version.\r
+    </documentation>\r
+  </annotation>\r
+\r
+  <import namespace="urn:oasis:names:tc:SAML:2.0:metadata"\r
+    schemaLocation="saml-schema-metadata-2.0.xsd"/>\r
+  <import namespace="http://www.w3.org/XML/1998/namespace"\r
+    schemaLocation="http://www.w3.org/2001/xml.xsd"/>\r
+\r
+  <element name="UIInfo" type="mdui:UIInfoType" />\r
+  <complexType name="UIInfoType">\r
+    <choice minOccurs="0" maxOccurs="unbounded">\r
+      <element ref="mdui:DisplayName"/>\r
+      <element ref="mdui:Description"/>\r
+      <element ref="mdui:Keywords"/>\r
+      <element ref="mdui:Logo"/>\r
+      <element ref="mdui:InformationURL"/>\r
+      <element ref="mdui:PrivacyStatementURL"/>\r
+      <any namespace="##other" processContents="lax"/>\r
+    </choice>\r
+  </complexType>\r
+\r
+  <element name="DisplayName" type="md:localizedNameType"/>\r
+  <element name="Description" type="md:localizedNameType"/>\r
+  <element name="InformationURL" type="md:localizedURIType"/>\r
+  <element name="PrivacyStatementURL" type="md:localizedURIType"/>\r
+\r
+  <element name="Keywords" type="mdui:KeywordsType"/>\r
+  <complexType name="KeywordsType">\r
+    <simpleContent>\r
+      <extension base="mdui:listOfStrings">\r
+        <attribute ref="xml:lang" use="required"/>\r
+      </extension>\r
+    </simpleContent>\r
+  </complexType>\r
+  \r
+  <simpleType name="listOfStrings">\r
+    <list itemType="string"/>\r
+  </simpleType>\r
+\r
+  <element name="Logo" type="mdui:LogoType"/>\r
+  <complexType name="LogoType">\r
+    <simpleContent>\r
+      <extension base="anyURI">\r
+        <attribute name="height" type="positiveInteger" use="required"/>\r
+        <attribute name="width" type="positiveInteger" use="required"/>\r
+        <attribute ref="xml:lang"/>\r
+      </extension>\r
+    </simpleContent>\r
+  </complexType>\r
+\r
+  <element name="DiscoHints" type="mdui:DiscoHintsType"/>\r
+  <complexType name="DiscoHintsType">\r
+    <choice minOccurs="0" maxOccurs="unbounded">\r
+      <element ref="mdui:IPHint"/>\r
+      <element ref="mdui:DomainHint"/>\r
+      <element ref="mdui:GeolocationHint"/>\r
+      <any namespace="##other" processContents="lax"/>\r
+    </choice>\r
+  </complexType>\r
+\r
+  <element name="IPHint" type="string"/>\r
+  <element name="DomainHint" type="string"/>   \r
+  <element name="GeolocationHint" type="anyURI"/>\r
+\r
+</schema>\r
+\r