Correct location of TransportOption feature, makes no sense inside policies.

[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 90ab0ee..ec8bf41 100644 (file)
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -81,8 +81,9 @@
                 <element ref="conf:ReplayCache" minOccurs="0"/>\r
                 <element ref="conf:ArtifactMap" minOccurs="0"/>\r
                 <element name="RequestMapper" type="conf:PluggableType" minOccurs="0"/>\r
-                               <element ref="conf:Applications"/>\r
+                               <element ref="conf:ApplicationDefaults"/>\r
                                <element ref="conf:SecurityPolicies"/>\r
+                <element ref="conf:TransportOption" minOccurs="0" maxOccurs="unbounded"/>
                        </sequence>\r
                        <attribute name="logger" type="anyURI"/>\r
                        <attribute name="clockSkew" type="unsignedInt"/>\r
@@ -426,9 +427,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 +444,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 +455,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 +488,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
@@ -507,7 +506,7 @@
         <attribute name="timeout" type="unsignedShort"/>\r
         <attribute name="requireConfidentiality" type="boolean"/>\r
         <attribute name="requireTransportAuth" type="boolean"/>\r
-        <attribute name="signedAssertions" type="boolean"/>\r
+        <attribute name="requireSignedAssertions" type="boolean"/>\r
     </attributeGroup>\r
     \r
        <element name="Sessions">\r
@@ -626,6 +625,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
@@ -677,7 +678,6 @@
                                        </annotation>\r
                                        <complexType>\r
                                                <sequence>\r
-                                                       <element ref="conf:TransportOption" minOccurs="0" maxOccurs="unbounded"/>\r
                                                        <element name="Rule" type="conf:PluggableType" minOccurs="1" maxOccurs="unbounded"/>\r
                                                </sequence>\r
                                                <attribute name="id" type="conf:string" use="required"/>\r