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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Sep  7 11:01:52 2015
New Revision: 7727

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7727&view=rev
Log:
IDP-808 Collapse Filter configuration namespaces - Schema manipulation (1)

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

extend the afp: namespace to additionally contain all the Types and Elements we get from basic: and saml:

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=7727&r1=7726&r2=7727&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 11:01:52 2015
@@ -207,4 +207,737 @@
         </attribute>
     </complexType>
 
+    <!--  
+    
+        The old 'Basic' Schema 
+      
+      -->
+
+    <!-- Blanket Match Function -->
+    <complexType name="ANY">
+        <annotation>
+            <documentation>A match function that evaluates to true.</documentation>
+        </annotation>
+        <complexContent>
+            <extension base="afp:MatchFunctorType"/>
+        </complexContent>
+    </complexType>
+
+    <!--  Boolean Match Functions -->
+    <complexType name="AND">
+        <annotation>
+            <documentation>
+                A match function that performs a logical AND on the results of all contained matching functions.
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="afp:MatchFunctorType">
+                <choice maxOccurs="unbounded">
+                    <element name="Rule" type="afp:MatchFunctorType">
+                        <annotation>
+                            <documentation>
+                                The set of match function rules to be ANDed.
+                            </documentation>
+                        </annotation>
+                    </element>
+                    <element name="RuleReference" type="afp:ReferenceType">
+                        <annotation>
+                            <documentation>
+                                The set of match function rules to be ANDed.
+                            </documentation>
+                        </annotation>
+                    </element>
+                </choice>
+            </extension>
+        </complexContent>
+    </complexType>
+
+    <complexType name="OR">
+        <annotation>
+            <documentation>
+                A match function that performs a logical OR on the results of all contained matching functions.
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="afp:MatchFunctorType">
+                <choice maxOccurs="unbounded">
+                    <element name="Rule" type="afp:MatchFunctorType">
+                        <annotation>
+                            <documentation>
+                                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 ORed.
+                            </documentation>
+                        </annotation>
+                    </element>
+                </choice>
+            </extension>
+        </complexContent>
+    </complexType>
+
+    <complexType name="NOT">
+        <annotation>
+            <documentation>
+                A match function that performs a logical NOT on the result of the contained matching function.
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="afp:MatchFunctorType">
+                <choice>
+                    <element name="Rule" type="afp:MatchFunctorType">
+                        <annotation>
+                            <documentation>
+                                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 negated.
+                            </documentation>
+                        </annotation>
+                    </element>
+                </choice>
+            </extension>
+        </complexContent>
+    </complexType>
+
+    <!-- Predicate Plugin Function -->
+    <complexType name="Predicate">
+        <annotation>
+            <documentation>

[... 630 lines stripped ...]