From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 2 Apr 2009 02:27:49 +0000 (+0000)
Subject: Add extension schemas.
X-Git-Tag: 2.2.0~16
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=commitdiff_plain;h=803cadd4b80a472a15202fded9e4ae3379a4beaf

Add extension schemas.
---

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 1e29d4d..8148a2c 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -41,7 +41,10 @@ schemafiles = \
 	saml-schema-protocol-2.0.xsd \
 	saml-schema-x500-2.0.xsd \
 	saml-schema-xacml-2.0.xsd \
+	sstc-metadata-attr.xsd \
 	sstc-saml1x-metadata.xsd \
+	sstc-saml-attribute-ext.xsd \
+	sstc-saml-delegation.xsd \
 	sstc-saml-metadata-ext-query.xsd \
 	sstc-saml-protocol-ext-thirdparty.xsd
 
diff --git a/schemas/saml20-catalog.xml.in b/schemas/saml20-catalog.xml.in
index c3aef7d..090795e 100644
--- a/schemas/saml20-catalog.xml.in
+++ b/schemas/saml20-catalog.xml.in
@@ -8,7 +8,10 @@
     <system systemId="urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE" uri="@-PKGXMLDIR-@/saml-schema-dce-2.0.xsd"/>
     <system systemId="urn:oasis:names:tc:SAML:2.0:profiles:attribute:X500" uri="@-PKGXMLDIR-@/saml-schema-x500-2.0.xsd"/>
     <system systemId="urn:oasis:names:tc:SAML:2.0:profiles:attribute:XACML" uri="@-PKGXMLDIR-@/saml-schema-xacml-2.0.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:metadata:attribute" uri="@-PKGXMLDIR-@/sstc-metadata-attr.xsd"/>
 	<system systemId="urn:oasis:names:tc:SAML:profiles:v1metadata" uri="@-PKGXMLDIR-@/sstc-saml1x-metadata.xsd"/>
+    <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:protocol:ext:third-party" uri="@-PKGXMLDIR-@/sstc-saml-protocol-ext-thirdparty.xsd"/>
 </catalog>
diff --git a/schemas/sstc-metadata-attr.xsd b/schemas/sstc-metadata-attr.xsd
new file mode 100644
index 0000000..a655d96
--- /dev/null
+++ b/schemas/sstc-metadata-attr.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema 
+  targetNamespace="urn:oasis:names:tc:SAML:metadata:attribute"
+  xmlns="http://www.w3.org/2001/XMLSchema"
+  xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+  xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+  elementFormDefault="unqualified"
+  attributeFormDefault="unqualified"
+  blockDefault="substitution"
+  version="2.0">
+
+  <annotation>
+    <documentation>
+      Document title: SAML V2.0 Metadata Extention for Entity Attributes Schema
+      Document identifier: sstc-metadata-attr.xsd
+      Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
+      Revision history:
+      V1.0 (November 2008):
+        Initial version.
+    </documentation>
+  </annotation>
+
+  <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
+      schemaLocation="saml-schema-assertion-2.0.xsd"/>
+
+  <element name="EntityAttributes" type="mdattr:EntityAttributesType"/>
+  <complexType name="EntityAttributesType">
+    <choice maxOccurs="unbounded">
+      <element ref="saml:Attribute"/>
+      <element ref="saml:Assertion"/>
+    </choice>
+  </complexType>
+
+</schema>
+
diff --git a/schemas/sstc-saml-attribute-ext.xsd b/schemas/sstc-saml-attribute-ext.xsd
new file mode 100644
index 0000000..d4b7c1c
--- /dev/null
+++ b/schemas/sstc-saml-attribute-ext.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema 
+  targetNamespace="urn:oasis:names:tc:SAML:attribute:ext"
+  xmlns="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="unqualified"
+  attributeFormDefault="unqualified"
+  blockDefault="substitution"
+  version="2.0">
+
+  <annotation>
+    <documentation>
+      Document title: SAML V2.0 Attribute Extension Schema
+      Document identifier: sstc-saml-attribute-ext.xsd
+      Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
+      Revision history:
+      V1.0 (October 2008):
+        Initial version.
+    </documentation>
+  </annotation>
+
+  <attribute name="OriginalIssuer" type="anyURI"/>
+  <attribute name="LastModified" type="dateTime"/>
+
+</schema>
+
diff --git a/schemas/sstc-saml-delegation.xsd b/schemas/sstc-saml-delegation.xsd
new file mode 100644
index 0000000..30c73dc
--- /dev/null
+++ b/schemas/sstc-saml-delegation.xsd
@@ -0,0 +1,40 @@
+<schema
+    targetNamespace="urn:oasis:names:tc:SAML:2.0:conditions:delegation"
+    xmlns:del="urn:oasis:names:tc:SAML:2.0:conditions:delegation"
+    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="unqualified"
+    attributeFormDefault="unqualified"
+    blockDefault="substitution"
+    version="2.0">
+    <annotation>
+        <documentation>
+            Document identifier: sstc-saml-delegation
+            Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
+            Revision history:
+            V1.0 (February 2009):
+              Initial version.
+        </documentation>
+    </annotation>
+    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
+        schemaLocation="saml-schema-assertion-2.0.xsd"/>
+    <complexType name="DelegationRestrictionType">
+        <complexContent>
+            <extension base="saml:ConditionAbstractType">
+                <sequence>
+                    <element ref="del:Delegate" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="Delegate" type="del:DelegateType"/>
+    <complexType name="DelegateType">
+        <choice>
+            <element ref="saml:BaseID"/>
+            <element ref="saml:NameID"/>
+            <element ref="saml:EncryptedID"/>
+        </choice>
+        <attribute name="DelegationInstant" type="dateTime" use="optional"/>
+        <attribute name="ConfirmationMethod" type="anyURI" use="optional"/>
+    </complexType>
+</schema>