Extend Trust checking to the SSL session to the AA

[java-idp.git] / src / schemas / shibboleth-arp-1.0.xsd

diff --git a/src/schemas/shibboleth-arp-1.0.xsd b/src/schemas/shibboleth-arp-1.0.xsd
index b084720..3c17f08 100755 (executable)
--- a/src/schemas/shibboleth-arp-1.0.xsd
+++ b/src/schemas/shibboleth-arp-1.0.xsd
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.2 U (http://www.xmlspy.com) by Test (Test) -->
 <xs:schema targetNamespace="urn:mace:shibboleth:arp:1.0" xmlns:arp="urn:mace:shibboleth:arp:1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
        <xs:simpleType name="RequireType">
                <xs:restriction base="xs:string">
@@ -19,7 +18,7 @@
                                        <xs:sequence minOccurs="0">
                                                <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                                        </xs:sequence>
-                                       <xs:attribute name="matchFunction" type="xs:anyURI" default="urn:mace:shibboleth:arp:matchFunction:stringValue"/>
+                                       <xs:attribute name="matchFunction" type="xs:anyURI" default="urn:mace:shibboleth:arp:matchFunction:stringMatch"/>
                                        <xs:attribute name="release" type="arp:RequireType" use="required"/>
                                </xs:complexType>
                        </xs:element>
@@ -47,12 +46,12 @@
                                                                                                        <xs:complexType>
                                                                                                                <xs:simpleContent>
                                                                                                                        <xs:extension base="xs:string">
-                                                                                                                               <xs:attribute name="matchFunction" type="xs:anyURI" default="urn:mace:shibboleth:arp:matchFunction:exactShar"/>
+                                                                                                                               <xs:attribute name="matchFunction" type="xs:anyURI" default="urn:mace:shibboleth:arp:matchFunction:stringMatch"/>
                                                                                                                        </xs:extension>
                                                                                                                </xs:simpleContent>
                                                                                                        </xs:complexType>
                                                                                                </xs:element>
-                                                                                               <xs:choice>
+                                                                                               <xs:choice minOccurs="0" maxOccurs="1">
                                                                                                        <xs:element name="Resource">
                                                                                                                <xs:complexType>
                                                                                                                        <xs:simpleContent>