Config changes and rework for new credential APIs.

[shibboleth/sp.git] / schemas / shibboleth-spconfig-2.0.xsd

diff --git a/schemas/shibboleth-spconfig-2.0.xsd b/schemas/shibboleth-spconfig-2.0.xsd
index 9649f1f..0d70774 100644 (file)
--- a/schemas/shibboleth-spconfig-2.0.xsd
+++ b/schemas/shibboleth-spconfig-2.0.xsd
@@ -47,7 +47,6 @@
                                <element ref="conf:OutOfProcess"/>
                                <element ref="conf:InProcess"/>
                                <element ref="conf:Applications"/>
-                               <element ref="conf:Credentials" minOccurs="0"/>
                                <element ref="conf:SecurityPolicies"/>
                        </sequence>
                        <attribute name="logger" type="anyURI"/>
@@ -339,11 +338,12 @@
                        <sequence>\r
                                <element ref="conf:Sessions"/>\r
                                <element ref="conf:Errors"/>\r
-                               <element ref="conf:CredentialUse" minOccurs="0"/>\r
+                               <element ref="conf:DefaultRelyingParty"/>\r
                                <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="CredentialResolver" type="conf:PluggableType" minOccurs="0"/>\r
                                <element ref="conf:Application" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
                        <attribute name="id" type="conf:string" fixed="default"/>\r
@@ -362,11 +362,12 @@
                        <sequence>\r
                                <element ref="conf:Sessions" minOccurs="0"/>\r
                                <element ref="conf:Errors" minOccurs="0"/>\r
-                               <element ref="conf:CredentialUse" minOccurs="0"/>\r
+                               <element ref="conf:DefaultRelyingParty" minOccurs="0"/>\r
                                <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="AttributeResolver" 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="providerId" type="anyURI"/>\r
@@ -459,27 +460,7 @@
                </complexType>\r
        </element>\r
 \r
-       <attributeGroup name="CredentialUseGroup">\r
-               <attribute name="TLS" type="conf:string"/>\r
-               <attribute name="Signing" type="conf:string"/>\r
-               <attribute name="Encryption" type="conf:string"/>\r
-               <attribute name="signRequests" type="boolean" default="false"/>\r
-               <attribute name="signatureAlg" type="anyURI"/>\r
-               <attribute name="authType">\r
-                       <simpleType>\r
-                               <restriction base="conf:string">\r
-                                       <enumeration value="basic"/>\r
-                                       <enumeration value="digest"/>\r
-                                       <enumeration value="ntlm"/>\r
-                                       <enumeration value="gss"/>\r
-                               </restriction>\r
-                       </simpleType>\r
-               </attribute>\r
-               <attribute name="authUsername"/>\r
-               <attribute name="authPassword"/>\r
-       </attributeGroup>\r
-\r
-       <element name="CredentialUse">\r
+       <element name="DefaultRelyingParty">\r
                <annotation>\r
                        <documentation>Container for specifying security methods to use with particular peers</documentation>\r
                </annotation>\r
@@ -487,46 +468,26 @@
                        <sequence>\r
                                <element name="RelyingParty" minOccurs="0" maxOccurs="unbounded">\r
                                        <complexType>\r
-                                               <sequence>\r
-                                                       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
-                                               </sequence>\r
+                                               <sequence/>\r
                                                <attribute name="Name" type="conf:string" use="required"/>\r
-                                               <attributeGroup ref="conf:CredentialUseGroup"/>\r
+                                               <attributeGroup ref="conf:RelyingPartyGroup"/>\r
                                                <anyAttribute namespace="##other" processContents="lax"/>\r
                                        </complexType>\r
                                </element>\r
-                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
-                       <attributeGroup ref="conf:CredentialUseGroup"/>\r
+                       <attributeGroup ref="conf:RelyingPartyGroup"/>\r
                <anyAttribute namespace="##other" processContents="lax"/>\r
                </complexType>\r
        </element>\r
        \r
-       <element name="Credentials">
-               <annotation>\r
-                       <documentation>Container for specifying sources of credentials</documentation>\r
-               </annotation>\r
-               <complexType>\r
-                       <sequence>\r
-                               <element name="CredentialResolver" minOccurs="1" maxOccurs="unbounded">
-                                       <annotation>\r
-                                               <documentation>References CredentialResolver plugins</documentation>\r
-                                       </annotation>\r
-                                       <complexType>
-                                               <complexContent>
-                                                       <restriction base="conf:PluggableType">
-                                                               <sequence>
-                                                                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                                                               </sequence>
-                                                               <attribute name="id" type="conf:string" use="required"/>\r
-                                                               <anyAttribute namespace="##any" processContents="lax"/>
-                                                       </restriction>
-                                               </complexContent>
-                                       </complexType>
-                               </element>\r
-                       </sequence>
-               </complexType>
-       </element>\r
+       <attributeGroup name="RelyingPartyGroup">\r
+               <attribute name="authType" type="conf:string" default="TLS"/>\r
+               <attribute name="authUsername" type="conf:string"/>\r
+               <attribute name="authPassword" type="conf:string"/>\r
+               <attribute name="signRequests" type="boolean" default="false"/>
+               <attribute name="signatureAlg" type="anyURI"/>\r
+               <attribute name="encryptRequests" type="boolean" default="true"/>\r
+       </attributeGroup>\r
        \r
        <element name="SecurityPolicies">
                <annotation>\r