Merge session cache implementations.

[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 c187fd3..3f50b38 100644 (file)
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -61,6 +61,26 @@
                                <element ref="conf:Extensions" minOccurs="0"/>\r
                                <element ref="conf:OutOfProcess"/>\r
                                <element ref="conf:InProcess"/>\r
+                <choice minOccurs="0">\r
+                    <element name="UnixListener">\r
+                        <complexType>\r
+                            <attribute name="address" type="conf:string" use="required"/>\r
+                        </complexType>\r
+                    </element>\r
+                    <element name="TCPListener">\r
+                        <complexType>\r
+                            <attribute name="address" type="conf:string" use="required"/>\r
+                            <attribute name="port" type="unsignedInt" use="required"/>\r
+                            <attribute name="acl" type="conf:listOfStrings" default="127.0.0.1"/>\r
+                        </complexType>\r
+                    </element>\r
+                    <element name="Listener" type="conf:PluggableType"/>\r
+                </choice>\r
+                <element ref="conf:StorageService" minOccurs="0" maxOccurs="unbounded"/>\r
+                <element ref="conf:SessionCache" minOccurs="0"/>\r
+                <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:SecurityPolicies"/>\r
                        </sequence>\r
@@ -151,30 +171,11 @@
        \r
        <element name="OutOfProcess">\r
                <annotation>\r
-                       <documentation>Container for shibd out-of-process configuration</documentation>\r
+                       <documentation>Container for out-of-process (shibd) configuration</documentation>\r
                </annotation>\r
                <complexType>\r
                        <sequence>\r
                                <element ref="conf:Extensions" minOccurs="0"/>\r
-                               <choice>\r
-                                       <element name="UnixListener">\r
-                                               <complexType>\r
-                                                       <attribute name="address" type="conf:string" use="required"/>\r
-                                               </complexType>\r
-                                       </element>\r
-                                       <element name="TCPListener">\r
-                                               <complexType>\r
-                                                       <attribute name="address" type="conf:string" use="required"/>\r
-                                                       <attribute name="port" type="unsignedInt" use="required"/>\r
-                                                       <attribute name="acl" type="conf:listOfStrings" default="127.0.0.1"/>\r
-                                               </complexType>\r
-                                       </element>\r
-                                       <element name="Listener" type="conf:PluggableType"/>\r
-                               </choice>\r
-                               <element ref="conf:StorageService" minOccurs="0" maxOccurs="unbounded"/>\r
-                               <element ref="conf:SessionCache" minOccurs="0"/>\r
-                               <element ref="conf:ReplayCache" minOccurs="0"/>\r
-                               <element ref="conf:ArtifactMap" minOccurs="0"/>\r
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
                        <attribute name="logger" type="anyURI"/>\r
@@ -193,16 +194,7 @@
                <complexType>\r
                        <sequence>\r
                                <element ref="conf:Extensions" minOccurs="0"/>\r
-                               <element ref="conf:SessionCache" minOccurs="0"/>\r
-                               <element name="RequestMapper" type="conf:PluggableType"/>\r
-                               <element name="Implementation" minOccurs="0">\r
-                                       <complexType>\r
-                                               <sequence>\r
-                                                       <element ref="conf:ISAPI" minOccurs="0"/>\r
-                                                       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
-                                               </sequence>\r
-                                       </complexType>\r
-                               </element>\r
+                               <element ref="conf:ISAPI" minOccurs="0"/>\r
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
                        </sequence>\r
                        <attribute name="logger" type="anyURI"/>\r