Move settings from Policy to RelyingParty to allow per-RP values.

[shibboleth/cpp-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 54bdd2b..652024e 100644 (file)
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -662,6 +662,12 @@
                <attribute name="encryptionAlg" type="anyURI"/>\r
                <attribute name="keyName" type="conf:string"/>\r
                <attribute name="artifactEndpointIndex" type="unsignedShort"/>\r
+        <attribute name="chunkedEncoding" type="boolean"/>\r
+        <attribute name="connectTimeout" type="unsignedShort"/>\r
+        <attribute name="timeout" type="unsignedShort"/>\r
+        <attribute name="requireConfidentiality" type="boolean"/>\r
+        <attribute name="requireTransportAuth" type="boolean"/>\r
+        <attribute name="signedAssertions" type="boolean"/>\r
        </attributeGroup>\r
        \r
        <element name="SecurityPolicies">\r
@@ -681,12 +687,6 @@
                                                </sequence>\r
                                                <attribute name="id" type="conf:string" use="required"/>\r
                                                <attribute name="validate" type="boolean" default="false"/>\r
-                                               <attribute name="signedAssertions" type="boolean" default="false"/>\r
-                                               <attribute name="requireConfidentiality" type="boolean" default="true"/>\r
-                                               <attribute name="requireTransportAuth" type="boolean" default="true"/>\r
-                                               <attribute name="chunkedEncoding" type="boolean" default="true"/>\r
-                                               <attribute name="connectTimeout" type="unsignedShort" default="15"/>\r
-                                               <attribute name="timeout" type="unsignedShort" default="30"/>\r
                                                <anyAttribute namespace="##any" processContents="lax"/>\r
                                        </complexType>\r
                                </element>\r