Update to latest draft and filenames.

diff --git a/schemas/saml20-catalog.xml.in b/schemas/saml20-catalog.xml.in
index 8db31dd..b5ef6d3 100644 (file)
--- a/schemas/saml20-catalog.xml.in
+++ b/schemas/saml20-catalog.xml.in
@@ -13,8 +13,8 @@
     <system systemId="urn:oasis:names:tc:SAML:attribute:ext" uri="@-PKGXMLDIR-@/sstc-saml-attribute-ext.xsd"/>
     <system systemId="urn:oasis:names:tc:SAML:2.0:conditions:delegation" uri="@-PKGXMLDIR-@/sstc-saml-delegation.xsd"/>
     <system systemId="urn:oasis:names:tc:SAML:metadata:ext:query" uri="@-PKGXMLDIR-@/sstc-saml-metadata-ext-query.xsd"/>
-    <system systemId="urn:oasis:names:tc:SAML:metadata:algsupport" uri="@-PKGXMLDIR-@/sstc-saml-metadata-algsupport.xsd"/>
-    <system systemId="urn:oasis:names:tc:SAML:metadata:ui" uri="@-PKGXMLDIR-@/sstc-saml-metadata-ui.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:metadata:algsupport" uri="@-PKGXMLDIR-@/sstc-saml-metadata-algsupport-v1.0.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:metadata:ui" uri="@-PKGXMLDIR-@/sstc-saml-metadata-ui-v1.0.xsd"/>
     <system systemId="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" uri="@-PKGXMLDIR-@/sstc-saml-idp-discovery.xsd"/>
     <system systemId="urn:oasis:names:tc:SAML:profiles:SSO:request-init" uri="@-PKGXMLDIR-@/sstc-request-initiation.xsd"/>
     <system systemId="urn:oasis:names:tc:SAML:protocol:ext:third-party" uri="@-PKGXMLDIR-@/sstc-saml-protocol-ext-thirdparty.xsd"/>

diff --git a/schemas/sstc-saml-metadata-algsupport.xsd b/schemas/sstc-saml-metadata-algsupport-v1.0.xsd
similarity index 100%
rename from schemas/sstc-saml-metadata-algsupport.xsd
rename to schemas/sstc-saml-metadata-algsupport-v1.0.xsd

diff --git a/schemas/sstc-saml-metadata-ui.xsd b/schemas/sstc-saml-metadata-ui-v1.0.xsd
similarity index 78%
rename from schemas/sstc-saml-metadata-ui.xsd
rename to schemas/sstc-saml-metadata-ui-v1.0.xsd
index 0cebfeb..a281227 100644 (file)
--- a/schemas/sstc-saml-metadata-ui.xsd
+++ b/schemas/sstc-saml-metadata-ui-v1.0.xsd
@@ -12,10 +12,14 @@
   <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.xsd\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
-      V1.0 (September 2010):\r
+      16 November 2010:\r
+        Added Keywords element/type.\r
+      01 November 2010\r
+        Changed filename.\r
+      September 2010:\r
         Initial version.\r
     </documentation>\r
   </annotation>\r
@@ -30,6 +34,7 @@
     <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
@@ -42,6 +47,19 @@
   <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