projects / shibboleth / sp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove deprecated metadata element.
[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 fad9d02..9f8da9e 100644 (file)
--- a/schemas/shibboleth-targetconfig-1.0.xsd
+++ b/schemas/shibboleth-targetconfig-1.0.xsd
@@ -37,12 +37,14 @@
                <sequence>
                        <element ref="conf:Extensions" minOccurs="0"/>
                        <choice minOccurs="0">
-                               <element name="Global" type="conf:GlobalConfigurationType"/>
-                               <element name="SHAR" type="conf:GlobalConfigurationType"/>
+                               <element name="OutOfProcess" type="conf:OutOfProcessType"/>
+                               <element name="Global" type="conf:OutOfProcessType"/>
+                               <element name="SHAR" type="conf:OutOfProcessType"/>
                        </choice>
                        <choice minOccurs="0">
-                               <element name="Local" type="conf:LocalConfigurationType"/>
-                               <element name="SHIRE" type="conf:LocalConfigurationType"/>
+                               <element name="InProcess" type="conf:InProcessType"/>
+                               <element name="Local" type="conf:InProcessType"/>
+                               <element name="SHIRE" type="conf:InProcessType"/>
                        </choice>
                        <element ref="conf:Applications"/>
                        <element name="CredentialsProvider" type="conf:PluggableType" minOccurs="0" maxOccurs="unbounded"/>
@@ -74,7 +76,57 @@
                </complexType>
        </element>
 
-       <complexType name="GlobalConfigurationType">
+       <attributeGroup name="SessionCacheProperties">
+               <attribute name="cleanupInterval" type="unsignedInt" use="optional" default="300"/>
+               <attribute name="cacheTimeout" type="unsignedInt" use="optional" default="28800"/>
+               <attribute name="AAConnectTimeout" type="unsignedInt" use="optional" default="15"/>
+               <attribute name="AATimeout" type="unsignedInt" use="optional" default="30"/>
+               <attribute name="defaultLifetime" type="unsignedInt" use="optional" default="1800"/>
+               <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"/>
+                       <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>
+       <element name="MySQLSessionCache">
+               <complexType>
+                       <sequence>
+                               <element name="Argument" type="string" minOccurs="0" maxOccurs="unbounded"/>
+                       </sequence>
+                       <attributeGroup ref="conf:SessionCacheProperties"/>
+                       <attribute name="mysqlTimeout" type="unsignedInt" use="optional" default="14400"/>
+                       <attribute name="storeAttributes" type="boolean" use="optional" default="false"/>
+                       <anyAttribute namespace="##other" processContents="lax"/>
+               </complexType>
+       </element>
+       <element name="SessionCache">
+               <complexType>
+                       <complexContent>
+                               <extension base="conf:PluggableType">
+                                       <attributeGroup ref="conf:SessionCacheProperties"/>
+                               </extension>
+                       </complexContent>
+               </complexType>
+       </element>
+       
+       <complexType name="OutOfProcessType">
                <annotation>
                        <documentation>Container for global (server independent) configuration</documentation>
                </annotation>
@@ -101,34 +153,20 @@
                                <element name="Listener" type="conf:PluggableType"/>
                        </choice>
                        <choice>
-                               <element name="MemorySessionCache">
-                                       <complexType>
-                                               <attributeGroup ref="conf:SessionCacheProperties"/>
-                                               <anyAttribute namespace="##other" processContents="lax"/>
-                                       </complexType>
-                               </element>
-                               <element name="MySQLSessionCache">
+                               <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="Argument" type="string" minOccurs="0" maxOccurs="unbounded"/>
+                                                       <element name="ConnectionString" type="string" minOccurs="0"/>
                                                </sequence>
-                                               <attributeGroup ref="conf:SessionCacheProperties"/>
-                                               <attribute name="mysqlTimeout" type="unsignedInt" use="optional" default="14400"/>
-                                               <attribute name="storeAttributes" type="boolean" use="optional" default="false"/>
                                                <anyAttribute namespace="##other" processContents="lax"/>
                                        </complexType>
                                </element>
-                               <element name="SessionCache">
-                                       <complexType>
-                                               <complexContent>
-                                                       <extension base="conf:PluggableType">
-                                                               <attributeGroup ref="conf:SessionCacheProperties"/>
-                                                       </extension>
-                                               </complexContent>
-                                       </complexType>
-                               </element>
-                       </choice>
-                       <choice minOccurs="0">
                                <element name="MySQLReplayCache">
                                        <complexType>
                                                <sequence>
@@ -145,18 +183,7 @@
                <anyAttribute namespace="##other" processContents="lax"/>
        </complexType>
 
-       <attributeGroup name="SessionCacheProperties">
-       <attribute name="cleanupInterval" type="unsignedInt" use="optional" default="300"/>
-       <attribute name="cacheTimeout" type="unsignedInt" use="optional" default="28800"/>
-               <attribute name="AAConnectTimeout" type="unsignedInt" use="optional" default="15"/>
-               <attribute name="AATimeout" type="unsignedInt" use="optional" default="30"/>
-               <attribute name="defaultLifetime" type="unsignedInt" use="optional" default="1800"/>
-               <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"/>
-       </attributeGroup>
-
-       <complexType name="LocalConfigurationType">
+       <complexType name="InProcessType">
                <annotation>
                        <documentation>
                        Container for configuration of locally integrated or platform-specific
@@ -165,6 +192,10 @@
                </annotation>
                <sequence>
                        <element ref="conf:Extensions" minOccurs="0"/>
+                       <choice minOccurs="0">
+                               <element ref="conf:MemorySessionCache"/>
+                               <element ref="conf:SessionCache"/>
+                       </choice>
                        <element name="RequestMapProvider" type="conf:PluggableType" minOccurs="0"/>
                        <element name="Implementation" minOccurs="0">
                                <complexType>
@@ -249,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"/>
@@ -331,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>
@@ -402,6 +433,7 @@
                        <attribute name="lifetime" type="unsignedInt" use="optional"/>
                        <attribute name="timeout" type="unsignedInt" use="optional"/>
                        <attribute name="checkAddress" type="boolean" use="optional"/>
+                       <attribute name="consistentAddress" type="boolean" use="optional" default="true"/>
                        <attribute name="checkReplay" type="boolean" use="optional" default="true"/>
                        <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
@@ -459,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"/>
@@ -474,6 +507,18 @@
                <attribute name="digestAlg" type="anyURI" use="optional"/>
                <attribute name="signedResponse" type="boolean" use="optional" default="false"/>
                <attribute name="signedAssertions" type="boolean" use="optional" default="false"/>
+               <attribute name="authType" use="optional">
+                       <simpleType>
+                               <restriction base="string">
+                                       <enumeration value="basic"/>
+                                       <enumeration value="digest"/>
+                                       <enumeration value="ntlm"/>
+                                       <enumeration value="gss"/>
+                               </restriction>
+                       </simpleType>
+               </attribute>
+               <attribute name="authUsername" use="optional"/>
+               <attribute name="authPassword" use="optional"/>
        </attributeGroup>
 
        <element name="CredentialUse">
Shibboleth SP