SSPCPP-697 - Align the filter schema(s) and functor types where feasible.

[shibboleth/cpp-sp.git] / schemas / shibboleth-2.0-afp-mf-basic.xsd

diff --git a/schemas/shibboleth-2.0-afp-mf-basic.xsd b/schemas/shibboleth-2.0-afp-mf-basic.xsd
index 24d1526..608b1c8 100644 (file)
--- a/schemas/shibboleth-2.0-afp-mf-basic.xsd
+++ b/schemas/shibboleth-2.0-afp-mf-basic.xsd
@@ -28,7 +28,7 @@
         </annotation>
         <complexContent>
             <extension base="afp:MatchFunctorType">
-                <choice minOccurs="2" maxOccurs="unbounded">
+                <choice maxOccurs="unbounded">
                     <element name="Rule" type="afp:MatchFunctorType">
                         <annotation>
                             <documentation>
@@ -56,18 +56,18 @@
         </annotation>
         <complexContent>
             <extension base="afp:MatchFunctorType">
-                <choice minOccurs="2" maxOccurs="unbounded">
+                <choice maxOccurs="unbounded">
                     <element name="Rule" type="afp:MatchFunctorType">
                         <annotation>
                             <documentation>
-                                The set of match function rules to be ANDed.
+                                The set of match function rules to be ORed.
                             </documentation>
                         </annotation>
                     </element>
                     <element name="RuleReference" type="afp:ReferenceType">
                         <annotation>
                             <documentation>
-                                The set of match function rules to be ANDed.
+                                The set of match function rules to be ORed.
                             </documentation>
                         </annotation>
                     </element>
@@ -88,14 +88,14 @@
                     <element name="Rule" type="afp:MatchFunctorType">
                         <annotation>
                             <documentation>
-                                The set of match function rules to be ANDed.
+                                The set of match function rules to be negated.
                             </documentation>
                         </annotation>
                     </element>
                     <element name="RuleReference" type="afp:ReferenceType">
                         <annotation>
                             <documentation>
-                                The set of match function rules to be ANDed.
+                                The set of match function rules to be negated.
                             </documentation>
                         </annotation>
                     </element>
@@ -304,42 +304,6 @@
         </complexContent>
     </complexType>
 
-    <!-- Misc. Functions -->
-    <complexType name="Script">
-        <annotation>
-            <documentation>
-                A match function that evaluates a script to determine if some criteria is met. The script MUST return a
-                boolean.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <choice>
-                    <element name="Script" type="string" minOccurs="0">
-                        <annotation>
-                            <documentation>The script to evaluate to construct the attribute.</documentation>
-                        </annotation>
-                    </element>
-                    <element name="ScriptFile" type="string" minOccurs="0">
-                        <annotation>
-                            <documentation>
-                                The filesystem path to the script to evaluate to construct the attribute.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </choice>
-                <attribute name="language" type="string">
-                    <annotation>
-                        <documentation>
-                            The JSR-233 name for the scripting language that will be used. By default "javascript" is
-                            supported.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
     <complexType name="NumberOfAttributeValues">
         <annotation>
             <documentation>