From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 16 Nov 2010 22:22:33 +0000 (+0000)
Subject: Update to latest draft and filenames.
X-Git-Tag: 2.4~7
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=commitdiff_plain;h=eb2427f99a927020b52cf53f0ff578cd6232a75b

Update to latest draft and filenames.
---

diff --git a/schemas/saml20-catalog.xml.in b/schemas/saml20-catalog.xml.in
index 8db31dd..b5ef6d3 100644
--- 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
--- a/schemas/sstc-saml-metadata-ui.xsd
+++ b/schemas/sstc-saml-metadata-ui-v1.0.xsd
@@ -12,10 +12,14 @@
   <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.xsd
+      Document identifier: sstc-saml-metadata-ui-v1.0.xsd
       Location: http://docs.oasis-open.org/security/saml/Post2.0/
       Revision history:
-      V1.0 (September 2010):
+      16 November 2010:
+        Added Keywords element/type.
+      01 November 2010
+        Changed filename.
+      September 2010:
         Initial version.
     </documentation>
   </annotation>
@@ -30,6 +34,7 @@
     <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"/>
@@ -42,6 +47,19 @@
   <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>