Sync up to C++

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

diff --git a/src/schemas/shibboleth.xsd b/src/schemas/shibboleth.xsd
index 392fed4..67833f3 100644 (file)
--- a/src/schemas/shibboleth.xsd
+++ b/src/schemas/shibboleth.xsd
@@ -7,7 +7,7 @@
        xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
        elementFormDefault="qualified"
        attributeFormDefault="unqualified"
-       version="1.2">
+       version="1.3">
 
     <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"/>
@@ -72,6 +72,7 @@
                        <complexType>
                            <simpleContent>
                                <extension base="string">
+                                                               <attribute name="Accept" type="boolean" use="optional" default="true"/>
                                    <attribute name="Type" type="shib:AttributeRuleValueType" use="optional" default="literal"/>
                                    <anyAttribute namespace="##other" processContents="lax"/>
                                </extension>
@@ -104,6 +105,8 @@
         <attribute name="Factory" type="string" use="optional"/>
         <attribute name="Alias" type="string" use="optional"/>
                <attribute name="Header" type="string" use="optional"/>
+               <attribute name="Scoped" type="boolean" use="optional" default="false"/>
+               <attribute name="CaseSensitive" type="boolean" use="optional" default="true"/>
                <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
 
@@ -202,11 +205,17 @@
                    <sequence>
                        <element name="HandleService" type="shib:AuthorityType" maxOccurs="unbounded"/>
                        <element name="AttributeAuthority" type="shib:AuthorityType" minOccurs="0" maxOccurs="unbounded"/>
-                       <element name="Domain" type="shib:regexp_string" minOccurs="0" maxOccurs="unbounded"/>
+                       <element ref="shib:Domain" minOccurs="0" maxOccurs="unbounded"/>
                    </sequence>
                </extension>
         </complexContent>
     </complexType>
+       
+       <element name="Domain" type="shib:regexp_string">
+               <annotation>
+                       <documentation xml:lang="en">A metadata extension used to regulate allowable attribute scopes.</documentation>
+               </annotation>
+       </element>
 
     <complexType name="DestinationSiteType">
         <annotation>
@@ -219,7 +228,6 @@
                    <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"/>
@@ -227,7 +235,6 @@
                        </element>
                        <element name="AttributeRequester" maxOccurs="unbounded">
                                <complexType>
-                                       <sequence/>
                                        <attribute name="Name" type="string" use="required"/>
                                                <anyAttribute namespace="##any" processContents="lax"/>
                                </complexType>