Imported Upstream version 2.2.1+dfsg

[shibboleth/sp.git] / schemas / shibboleth-2.0-attribute-map.xsd

diff --git a/schemas/shibboleth-2.0-attribute-map.xsd b/schemas/shibboleth-2.0-attribute-map.xsd
index 3a72cda..caf5e1e 100644 (file)
--- a/schemas/shibboleth-2.0-attribute-map.xsd
+++ b/schemas/shibboleth-2.0-attribute-map.xsd
@@ -3,7 +3,7 @@
         xmlns="http://www.w3.org/2001/XMLSchema"
         xmlns:am="urn:mace:shibboleth:2.0:attribute-map"
         elementFormDefault="qualified"
-        version="2.1">
+        version="2.2">
 
     <annotation>
         <documentation>
@@ -26,6 +26,14 @@
     <simpleType name="listOfStrings">
         <list itemType="am:string"/>
     </simpleType>
+
+    <complexType name="PluggableType">
+        <sequence>
+            <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="type" type="am:string" use="required"/>
+        <anyAttribute namespace="##any" processContents="lax"/>
+    </complexType>
     
     <element name="Attributes">
         <annotation>
@@ -33,8 +41,12 @@
         </annotation>
         <complexType>
             <sequence>
+                <element name="MetadataProvider" type="am:PluggableType" minOccurs="0"/>
+                <element name="TrustEngine" type="am:PluggableType" minOccurs="0"/>
+                <element name="AttributeFilter" type="am:PluggableType" minOccurs="0"/>
                 <element name="Attribute" type="am:AttributeType" maxOccurs="unbounded"/>
             </sequence>
+            <attribute name="metadataPolicyId" type="am:string"/>
         </complexType>
     </element>
 
@@ -73,13 +85,18 @@
                 Decodes a SAML attribute into its Shibboleth-internal representation.
             </documentation>
         </annotation>
-        <attribute name="caseSensitive" type="boolean" default="true">
+        <attribute name="caseSensitive" type="boolean">
             <annotation>
                 <documentation>
                     Flag controlling case sensitivity when comparisons to the attribute's values are done.
                 </documentation>
             </annotation>
         </attribute>
+        <attribute name="internal" type="boolean">
+            <annotation>
+                <documentation>Flag controlling whether the resulting attribute should be exported for CGI use.</documentation>
+            </annotation>
+        </attribute>
     </complexType>
     
     <complexType name="StringAttributeDecoder">
@@ -127,6 +144,13 @@
                         </documentation>
                     </annotation>
                 </attribute>
+                <attribute name="defaultQualifiers" type="boolean">
+                    <annotation>
+                        <documentation>
+                            Flag controlling whether to default in values for NameQualifier/SPNameQualifier if not set.
+                        </documentation>
+                    </annotation>
+                </attribute>
             </extension>
         </complexContent>
     </complexType>
@@ -147,6 +171,13 @@
                         </documentation>
                     </annotation>
                 </attribute>
+                <attribute name="defaultQualifiers" type="boolean">
+                    <annotation>
+                        <documentation>
+                            Flag controlling whether to default in values for NameQualifier/SPNameQualifier if not set.
+                        </documentation>
+                    </annotation>
+                </attribute>
                 <attribute name="formatter" type="am:string">
                     <annotation>
                         <documentation>