Pulled old credential schema.

[shibboleth/sp.git] / schemas / shibboleth-targetconfig-1.0.xsd

diff --git a/schemas/shibboleth-targetconfig-1.0.xsd b/schemas/shibboleth-targetconfig-1.0.xsd
index 3dc887a..f05f7da 100644 (file)
--- a/schemas/shibboleth-targetconfig-1.0.xsd
+++ b/schemas/shibboleth-targetconfig-1.0.xsd
@@ -7,7 +7,7 @@
        elementFormDefault="qualified"
        attributeFormDefault="unqualified"
        blockDefault="substitution"
-       version="1.1">
+       version="2.0">
 
        <import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="cs-sstc-schema-assertion-1.1.xsd"/>
        <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="saml-schema-metadata-2.0.xsd"/>
@@ -85,12 +85,23 @@
                <attribute name="retryInterval" type="unsignedInt" use="optional" default="300"/>
                <attribute name="strictValidity" type="boolean" use="optional" default="true"/>
                <attribute name="propagateErrors" type="boolean" use="optional" default="false"/>
+               <attribute name="writeThrough" type="boolean" use="optional" default="false"/>
        </attributeGroup>
        
        <element name="MemorySessionCache">
                <complexType>
                        <attributeGroup ref="conf:SessionCacheProperties"/>
-                       <attribute name="writeThrough" type="boolean" use="optional" default="true"/>
+                       <anyAttribute namespace="##other" processContents="lax"/>
+               </complexType>
+       </element>
+       <element name="ODBCSessionCache">
+               <complexType>
+                       <sequence>
+                               <element name="ConnectionString" type="string" minOccurs="0"/>
+                       </sequence>
+                       <attributeGroup ref="conf:SessionCacheProperties"/>
+                       <attribute name="odbcTimeout" type="unsignedInt" use="optional" default="14400"/>
+                       <attribute name="storeAttributes" type="boolean" use="optional" default="false"/>
                        <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
@@ -143,10 +154,19 @@
                        </choice>
                        <choice>
                                <element ref="conf:MemorySessionCache"/>
+                               <element ref="conf:ODBCSessionCache"/>
                                <element ref="conf:MySQLSessionCache"/>
                                <element ref="conf:SessionCache"/>
                        </choice>
                        <choice minOccurs="0">
+                               <element name="ODBCReplayCache">
+                                       <complexType>
+                                               <sequence>
+                                                       <element name="ConnectionString" type="string" minOccurs="0"/>
+                                               </sequence>
+                                               <anyAttribute namespace="##other" processContents="lax"/>
+                                       </complexType>
+                               </element>
                                <element name="MySQLReplayCache">
                                        <complexType>
                                                <sequence>
@@ -174,7 +194,6 @@
                        <element ref="conf:Extensions" minOccurs="0"/>
                        <choice minOccurs="0">
                                <element ref="conf:MemorySessionCache"/>
-                               <element ref="conf:MySQLSessionCache"/>
                                <element ref="conf:SessionCache"/>
                        </choice>
                        <element name="RequestMapProvider" type="conf:PluggableType" minOccurs="0"/>
@@ -261,6 +280,7 @@
                <attribute name="requireSession" type="boolean" use="optional"/>
                <attribute name="requireSessionWith" type="string" use="optional"/>
                <attribute name="exportAssertion" type="boolean" use="optional"/>
+               <attribute name="redirectToSSL" type="unsignedInt" use="optional"/>
                <anyAttribute namespace="##other" processContents="lax"/>
        </attributeGroup>
        <element name="AccessControlProvider" type="conf:PluggableType"/>
@@ -343,7 +363,6 @@
                     <element ref="saml:AttributeDesignator"/>
                     <element ref="saml:Audience"/>
                     <element name="AAPProvider" type="conf:PluggableType"/>
-                    <!-- deprecated --> <element name="FederationProvider" type="conf:PluggableType"/>
                     <element name="MetadataProvider" type="conf:PluggableType"/>
                     <element name="TrustProvider" type="conf:PluggableType"/>
                                </choice>
@@ -472,6 +491,7 @@
                        <attribute name="metadata" type="anyURI" use="optional"/>
                        <attribute name="rm" type="anyURI" use="required"/>
                        <attribute name="access" type="anyURI" use="optional"/>
+                       <attribute name="ssl" type="anyURI" use="optional"/>
                        <attribute name="supportContact" type="string" use="optional"/>
                        <attribute name="logoLocation" type="anyURI" use="optional"/>
                        <attribute name="styleSheet" type="anyURI" use="optional"/>