Sync up with latest C++ version

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@928 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/schemas/shibboleth.xsd b/src/schemas/shibboleth.xsd
index 0a7be8c..d9f099f 100644 (file)
--- a/src/schemas/shibboleth.xsd
+++ b/src/schemas/shibboleth.xsd
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="US-ASCII"?>
-<schema targetNamespace="urn:mace:shibboleth:1.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:shib="urn:mace:shibboleth:1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
-    <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
-    <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+<schema targetNamespace="urn:mace:shibboleth:1.0"
+       xmlns="http://www.w3.org/2001/XMLSchema"
+       xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+       xmlns:xml="http://www.w3.org/XML/1998/namespace"
+       xmlns:shib="urn:mace:shibboleth:1.0"
+       elementFormDefault="qualified"
+       attributeFormDefault="unqualified"
+       version="1.2">
+
+    <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
+    <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
     
     
     <!-- Status-Related Information -->
@@ -9,19 +17,9 @@
     <!--
     The following SAML sub-status codes are defined in this namespace:
     
-        "RealTimeRelease"
-            Used with samlp:Responder, signals user wants real-time attribute release
-        
         "InvalidHandle"
             Used with samlp:Requester, signals AA did not recognize handle as valid
     -->
-    
-    <element name="RealTimeReleaseURL" type="anyURI">
-        <annotation>
-               <documentation xml:lang="en">Used by AA in samlp:StatusDetail to signal user wants real-time attribute release.</documentation>
-        </annotation>
-    </element>
-    
 
     <!-- Relaxes SAML AttributeValue type definition -->
 
@@ -34,8 +32,7 @@
                </sequence>
                <anyAttribute namespace="##any" processContents="lax"/>
        </complexType>
-
-
+    
     <!-- Attribute Acceptance Policies -->
        
     <simpleType name="AttributeRuleValueType">
@@ -54,6 +51,7 @@
                         <extension base="string">
                                <attribute name="Accept" type="boolean" use="optional" default="true"/>
                             <attribute name="Type" type="shib:AttributeRuleValueType" use="optional" default="literal"/>
+                            <anyAttribute namespace="##any" processContents="lax"/>
                         </extension>
                     </simpleContent>
                        </complexType>
@@ -62,6 +60,7 @@
                        <element name="AnyValue">
                                <complexType>
                                        <sequence/>
+                                       <anyAttribute namespace="##any" processContents="lax"/>
                                </complexType>
                        </element>
                    <element name="Value" maxOccurs="unbounded">
@@ -69,6 +68,7 @@
                            <simpleContent>
                                <extension base="string">
                                    <attribute name="Type" type="shib:AttributeRuleValueType" use="optional" default="literal"/>
+                                   <anyAttribute namespace="##any" processContents="lax"/>
                                </extension>
                            </simpleContent>
                        </complexType>
@@ -83,6 +83,7 @@
             <complexContent>
                 <extension base="shib:SiteRuleType">
                     <attribute name="Name" type="string" use="required"/>
+                    <anyAttribute namespace="##any" processContents="lax"/>
                 </extension>
             </complexContent>
         </complexType>
@@ -98,6 +99,7 @@
         <attribute name="Factory" type="string" use="optional"/>
         <attribute name="Alias" type="string" use="optional"/>
                <attribute name="Header" type="string" use="optional"/>
+               <anyAttribute namespace="##any" processContents="lax"/>
     </complexType>
 
     <element name="AttributeRule" type="shib:AttributeRuleType">
@@ -112,6 +114,7 @@
             <sequence>
                 <element ref="shib:AttributeRule" minOccurs="0" maxOccurs="unbounded"/>
             </sequence>
+            <anyAttribute namespace="##any" processContents="lax"/>
         </complexType>
     </element>
 
@@ -136,11 +139,13 @@
         </sequence>
         <attribute name="Name" type="string" use="required"/>
         <attribute name="ErrorURL" type="anyURI" use="optional"/>
+        <anyAttribute namespace="##any" processContents="lax"/>
     </complexType>
 
        <simpleType name="ContactTypeType">
                <restriction base="string">
             <enumeration value="technical"/>
+            <enumeration value="support"/>
             <enumeration value="administrative"/>
             <enumeration value="billing"/>
             <enumeration value="other"/>
@@ -173,11 +178,14 @@
         <sequence/>
         <attribute name="Name" type="string" use="required"/>
         <attribute name="Location" type="anyURI" use="required"/>
+        <anyAttribute namespace="##any" processContents="lax"/>
        </complexType>
 
     <complexType name="OriginSiteType">
         <annotation>
-               <documentation xml:lang="en">Origin sites add at least one handle service (with a name and optional KeyInfo), plus optional domains trusted for attribute scoping.</documentation>
+               <documentation xml:lang="en">
+               Origin sites add at least one handle service (with a name), plus optional domains trusted for attribute scoping.
+               </documentation>
         </annotation>
         <complexContent>
                <extension base="shib:SiteType">
@@ -190,6 +198,35 @@
         </complexContent>
     </complexType>
 
+    <complexType name="DestinationSiteType">
+        <annotation>
+               <documentation xml:lang="en">
+               Destination sites add at least one attribute requester (with a name).
+               </documentation>
+        </annotation>
+        <complexContent>
+               <extension base="shib:SiteType">
+                   <sequence>
+                       <element name="AssertionConsumerServiceURL" maxOccurs="unbounded">
+                               <complexType>
+                                       <sequence/>
+                                       <attribute name="Location" type="string" use="required"/>
+                                               <attribute name="Id" type="string" use="optional"/>
+                                               <anyAttribute namespace="##any" processContents="lax"/>
+                               </complexType>
+                       </element>
+                       <element name="AttributeRequester" maxOccurs="unbounded">
+                               <complexType>
+                                       <sequence/>
+                                       <attribute name="Name" type="string" use="required"/>
+                                               <anyAttribute namespace="##any" processContents="lax"/>
+                               </complexType>
+                       </element>
+                   </sequence>
+               </extension>
+        </complexContent>
+    </complexType>
+
     <complexType name="SiteGroupType">
         <annotation>
                <documentation xml:lang="en">Used to logically group sites together, optionally signed.</documentation>
@@ -203,24 +240,33 @@
             <element ref="ds:Signature" minOccurs="0"/>
         </sequence>
         <attribute name="Name" type="string" use="required"/>
+        <attribute name="lastChanged" type="dateTime" use="optional"/>
+        <attribute name="validUntil" type="dateTime" use="optional"/>
+        <attribute name="cacheDuration" type="duration" use="optional"/>
+        <anyAttribute namespace="##any" processContents="lax"/>
     </complexType>    
 
     <element name="OriginSite" type="shib:OriginSiteType"/>
-    <element name="DestinationSite" type="shib:SiteType"/>
+    <element name="DestinationSite" type="shib:DestinationSiteType"/>
     <element name="SiteGroup" type="shib:SiteGroupType"/>
 
+
+       <!-- Old (pre 1.2) Trust Metadata -->
+
        <complexType name="KeyAuthorityType">
                <annotation>
-                       <documentation xml:lang="en">Binds a set of keying material to one or more named system entities.</documentation>
+                       <documentation xml:lang="en">
+                       Binds a set of keying material to one or more named system entities.
+                       </documentation>
                </annotation>
                <sequence>
                        <element ref="ds:KeyInfo"/>
-                       <element name="Subject" type="shib:regexp_string" maxOccurs="unbounded"/>
+                       <element name="Subject" type="shib:regexp_string" minOccurs="0" maxOccurs="unbounded"/>
                </sequence>
+               <anyAttribute namespace="##any" processContents="lax"/>
        </complexType>
-       
        <element name="KeyAuthority" type="shib:KeyAuthorityType"/>
-       
+
        <element name="Trust">
                <annotation>
                        <documentation xml:lang="en">An optionally signed collection of KeyAuthority data.</documentation>
@@ -230,7 +276,11 @@
                                <element ref="shib:KeyAuthority" maxOccurs="unbounded"/>
                                <element ref="ds:Signature" minOccurs="0"/>
                        </sequence>
+               <attribute name="lastChanged" type="dateTime" use="optional"/>
+               <attribute name="validUntil" type="dateTime" use="optional"/>
+               <attribute name="cacheDuration" type="duration" use="optional"/>
+               <anyAttribute namespace="##any" processContents="lax"/>
                </complexType>
        </element>
-       
+
 </schema>