Add global attribute prefix after filtering/resolution, to allow AJP forwarding and...

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

diff --git a/schemas/shibboleth-2.0-afp.xsd b/schemas/shibboleth-2.0-afp.xsd
index 9d3ad12..e132a4f 100644 (file)
--- a/schemas/shibboleth-2.0-afp.xsd
+++ b/schemas/shibboleth-2.0-afp.xsd
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<schema targetNamespace="urn:mace:shibboleth:2.0:afp" xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">\r
+<schema targetNamespace="urn:mace:shibboleth:2.0:afp"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    xmlns:afp="urn:mace:shibboleth:2.0:afp"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+    elementFormDefault="qualified">\r
 \r
     <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="classpath:/schema/xmldsig-core-schema.xsd" />\r
 \r
@@ -18,7 +21,7 @@
     </element>
     <complexType name="AttributeFilterPolicyGroupType">
         <complexContent>
-            <extension base="afp:IndentityType">
+            <extension base="afp:IdentityType">
                 <sequence>
                     <element ref="afp:PolicyRequirementRule" minOccurs="0" maxOccurs="unbounded">
                         <annotation>
@@ -28,20 +31,20 @@
                             </documentation>
                         </annotation>
                     </element>
-                    <element ref="afp:AttributeRule" minOccurs="0" maxOccurs="unbounded">
+                    <element ref="afp:PermitValueRule" minOccurs="0" maxOccurs="unbounded">
                         <annotation>
                             <documentation>
-                                Defines an attribute rule that may be reused across multiple filter policies.
+                                Defines an attribute value filter that may be reused across multiple attribute rules.
                             </documentation>
                         </annotation>
-                    </element>
-                    <element ref="afp:PermitValueRule" minOccurs="0" maxOccurs="unbounded">
+                    </element>\r
+                    <element ref="afp:AttributeRule" minOccurs="0" maxOccurs="unbounded">
                         <annotation>
                             <documentation>
-                                Defines an attribute value filter that may be reused across multiple attribtue rules.
+                                Defines an attribute rule that may be reused across multiple filter policies.
                             </documentation>
                         </annotation>
-                    </element>\r
+                    </element>
                     <element ref="afp:AttributeFilterPolicy" minOccurs="0" maxOccurs="unbounded">
                         <annotation>
                             <documentation>
@@ -73,7 +76,7 @@
     </element>
     <complexType name="AttributeFilterPolicyType">
         <complexContent>
-            <extension base="afp:IndentityType">
+            <extension base="afp:IdentityType">
                 <sequence>
                     <choice>
                         <element ref="afp:PolicyRequirementRule">
@@ -119,7 +122,7 @@
     </element>\r
     <complexType name="AttributeRuleType">
         <complexContent>
-            <extension base="afp:IndentityType">
+            <extension base="afp:IdentityType">
                 <choice>
                     <element ref="afp:PermitValueRule">
                         <annotation>
@@ -161,11 +164,11 @@
     </element>
     <complexType name="MatchFunctorType" abstract="true">
         <complexContent>
-            <extension base="afp:IndentityType" />
+            <extension base="afp:IdentityType" />
         </complexContent>
     </complexType>
 
-    <complexType name="IndentityType">
+    <complexType name="IdentityType">
         <attribute name="id" type="string">
             <annotation>
                 <documentation>An ID, unique within the policy and component type.</documentation>