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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Sep  7 12:49:50 2015
New Revision: 7733

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7733&view=rev
Log:
IDP-808 Collapse Filter configuration namespaces - booleans

https://issues.shibboleth.net/jira/browse/IDP-808

We do not need to haev reule references inside the booleans.  This is not supported in the basic: namespace so we won't even add it into the afp one.

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=7733&r1=7732&r2=7733&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd	(original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd	Mon Sep  7 12:49:50 2015
@@ -232,7 +232,7 @@
         </annotation>
         <complexContent>
             <extension base="afp:MatchFunctorType">
-                <choice maxOccurs="unbounded">
+                <sequence maxOccurs="unbounded">
                     <element name="Rule" type="afp:MatchFunctorType">
                         <annotation>
                             <documentation>
@@ -240,14 +240,7 @@
                             </documentation>
                         </annotation>
                     </element>
-                    <element name="RuleReference" type="afp:ReferenceType">
-                        <annotation>
-                            <documentation>
-                                The set of match function rules to be ANDed.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </choice>
+                </sequence>
             </extension>
         </complexContent>
     </complexType>
@@ -260,7 +253,7 @@
         </annotation>
         <complexContent>
             <extension base="afp:MatchFunctorType">
-                <choice maxOccurs="unbounded">
+                <sequence maxOccurs="unbounded">
                     <element name="Rule" type="afp:MatchFunctorType">
                         <annotation>
                             <documentation>
@@ -268,14 +261,7 @@
                             </documentation>
                         </annotation>
                     </element>
-                    <element name="RuleReference" type="afp:ReferenceType">
-                        <annotation>
-                            <documentation>
-                                The set of match function rules to be ORed.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </choice>
+                </sequence>
             </extension>
         </complexContent>
     </complexType>
@@ -288,7 +274,7 @@
         </annotation>
         <complexContent>
             <extension base="afp:MatchFunctorType">
-                <choice>
+                <sequence minOccurs="1" maxOccurs="1">
                     <element name="Rule" type="afp:MatchFunctorType">
                         <annotation>
                             <documentation>
@@ -296,14 +282,7 @@
                             </documentation>
                         </annotation>
                     </element>
-                    <element name="RuleReference" type="afp:ReferenceType">
-                        <annotation>
-                            <documentation>
-                                The set of match function rules to be negated.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </choice>
+                </sequence>
             </extension>
         </complexContent>
     </complexType>