Copied over mapping and filtering schemas.

[shibboleth/sp.git] / schemas / shibboleth-2.0-native-sp-config.xsd

diff --git a/schemas/shibboleth-spconfig-2.0.xsd b/schemas/shibboleth-2.0-native-sp-config.xsd
similarity index 95%
rename from schemas/shibboleth-spconfig-2.0.xsd
rename to schemas/shibboleth-2.0-native-sp-config.xsd
index f0f2fcb..3cbd1fe 100644 (file)
--- a/schemas/shibboleth-spconfig-2.0.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="US-ASCII"?>\r
-<schema targetNamespace="urn:mace:shibboleth:sp:config:2.0"\r
+<schema targetNamespace="urn:mace:shibboleth:2.0:native:sp:config"\r
        xmlns="http://www.w3.org/2001/XMLSchema"\r
        xmlns:conf="urn:mace:shibboleth:sp:config:2.0"\r
        xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"\r
@@ -16,7 +16,7 @@
 \r
        <annotation>\r
                <documentation>\r
-       2.0 schema for XML-based configuration of Shibboleth SP instances.\r
+       2.0 schema for XML-based configuration of Shibboleth Native SP instances.\r
        First appearing in Shibboleth 2.0 release.\r
        </documentation>\r
     </annotation>\r
@@ -352,7 +352,9 @@
                                <element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>
                 <element name="MetadataProvider" type="conf:PluggableType"/>
                                <element name="TrustEngine" type="conf:PluggableType"/>\r
-                               <element name="AttributeResolver" type="conf:PluggableType"/>\r
+                               <element name="AttributeExtractor" type="conf:PluggableType" minOccurs="0"/>\r
+                               <element name="AttributeResolver" type="conf:PluggableType" minOccurs="0"/>\r
+                               <element name="AttributeFilter" type="conf:PluggableType" minOccurs="0"/>\r
                                <element name="CredentialResolver" type="conf:PluggableType" minOccurs="0"/>\r
                                <element ref="conf:Application" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
@@ -360,7 +362,6 @@
                        <attribute name="entityID" type="anyURI" use="required"/>\r
                        <attribute name="policyId" type="conf:string" use="required"/>\r
                        <attribute name="homeURL" type="anyURI" default="/"/>\r
-                       <attribute name="attributeIds" type="conf:listOfStrings"/>\r
                <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
@@ -377,14 +378,15 @@
                                <element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>\r
                                <element name="MetadataProvider" type="conf:PluggableType" minOccurs="0"/>\r
                                <element name="TrustEngine" type="conf:PluggableType" minOccurs="0"/>\r
+                               <element name="AttributeExtractor" type="conf:PluggableType" minOccurs="0"/>\r
                                <element name="AttributeResolver" type="conf:PluggableType" minOccurs="0"/>\r
+                               <element name="AttributeFilter" type="conf:PluggableType" minOccurs="0"/>\r
                                <element name="CredentialResolver" type="conf:PluggableType" minOccurs="0"/>\r
                        </sequence>\r
                        <attribute name="id" type="conf:string" use="required"/>\r
                        <attribute name="entityID" type="anyURI"/>\r
                        <attribute name="policyId" type="conf:string"/>\r
                        <attribute name="homeURL" type="anyURI" default="/"/>\r
-                       <attribute name="attributeIds" type="conf:listOfStrings"/>\r
                        <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r