Renamed Applications/Application tags.

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

diff --git a/schemas/shibboleth-2.0-native-sp-config.xsd b/schemas/shibboleth-2.0-native-sp-config.xsd
index d192e46..2fed592 100644 (file)
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -426,9 +426,9 @@
                </complexType>\r
        </element>\r
        \r
-       <element name="Applications">\r
+       <element name="ApplicationDefaults">\r
                <annotation>\r
-                       <documentation>Container for global settings and application-specific overrides</documentation>\r
+                       <documentation>Container for default settings and application-specific overrides</documentation>\r
                </annotation>\r
                <complexType>\r
                        <sequence>\r
@@ -443,7 +443,7 @@
                                <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
+                               <element ref="conf:ApplicationOverride" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
                        <attribute name="id" type="conf:string" fixed="default"/>\r
                        <attribute name="entityID" type="anyURI" use="required"/>\r
@@ -454,7 +454,7 @@
                </complexType>\r
        </element>\r
        \r
-       <element name="Application">\r
+       <element name="ApplicationOverride">\r
                <annotation>\r
                        <documentation>Container for application-specific overrides</documentation>\r
                </annotation>\r
@@ -487,8 +487,6 @@
                <attribute name="unsetHeaders" type="conf:listOfStrings"/>\r
                <attribute name="metadataAttributePrefix" type="conf:string"/>\r
            <attribute name="attributePrefix" type="conf:string"/>\r
-               <attribute name="localLogout" type="anyURI"/>\r
-               <attribute name="globalLogout" type="anyURI"/>\r
        </attributeGroup>\r
 \r
     <attributeGroup name="RelyingPartyGroup">\r
@@ -626,6 +624,8 @@
                        <attribute name="metadata" type="anyURI"/>\r
                        <attribute name="access" type="anyURI"/>\r
                        <attribute name="ssl" type="anyURI"/>\r
+            <attribute name="localLogout" type="anyURI"/>\r
+            <attribute name="globalLogout" type="anyURI"/>\r
                        <attribute name="supportContact" type="conf:string"/>\r
                        <attribute name="logoLocation" type="anyURI"/>\r
                        <attribute name="styleSheet" type="anyURI"/>\r
@@ -641,6 +641,7 @@
             <sequence/>\r
             <attribute name="Name" type="conf:string" use="required"/>\r
             <attributeGroup ref="conf:RelyingPartyGroup"/>\r
+            <attribute name="entityID" type="anyURI"/>\r
             <anyAttribute namespace="##other" processContents="lax"/>\r
         </complexType>\r
     </element>\r