[java-identity-provider COMMIT] /trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd

[noreply at shibboleth.net]

Author: scantor
Date: Thu May  5 14:49:05 2016
New Revision: 8228

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8228&view=rev
Log:
Port RegistrationAuthority changes back into collapsed schema.

Modified:
    trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd?rev=8228&r1=8227&r2=8228&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd	(original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd	Thu May  5 14:49:05 2016
@@ -685,6 +685,8 @@
             <documentation>
                 A match function that ensures that an attribute value's scope matches a scope given in
                 metadata for the entity or role.
+                
+                Not implemented in V3.
             </documentation>
         </annotation>
         <complexContent>
@@ -692,6 +694,19 @@
         </complexContent>
     </complexType>
 
+    <complexType name="AttributeIssuerRegistrationAuthority">
+        <annotation>
+            <documentation>
+                A match function that matches the attribute issuer's MDRPI content against a list of potential values.
+                
+                Not supported in V3.
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="afp:RegistrationAuthorityMatchType" />
+        </complexContent>
+    </complexType>
+
     <complexType name="RegistrationAuthority">
         <annotation>
             <documentation>
@@ -699,13 +714,19 @@
             </documentation>
         </annotation>
         <complexContent>
+            <extension base="afp:RegistrationAuthorityMatchType" />
+        </complexContent>
+    </complexType>
+
+    <complexType name="RegistrationAuthorityMatchType" abstract="true">
+        <complexContent>
             <extension base="afp:MatchFunctorType">
                 <attribute name="registrars" type="afp:anyURIListType" use="required">
                     <annotation>
                         <documentation>The string values to match.</documentation>
                     </annotation>
                 </attribute>
-                <attribute name="matchIfMetadataSilent" type="string">
+                <attribute name="matchIfMetadataSilent" type="boolean">
                     <annotation>
                         <documentation>
                             A boolean flag indicating whether a match should occur if the metadata does