Removed Policy element from configuration

[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 be79c64..512d0e6 100644 (file)
--- a/schemas/shibboleth-targetconfig-1.0.xsd
+++ b/schemas/shibboleth-targetconfig-1.0.xsd
@@ -3,8 +3,6 @@
        xmlns="http://www.w3.org/2001/XMLSchema"
        xmlns:conf="urn:mace:shibboleth:target:config:1.0"
        xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="urn:mace:shibboleth:target:config:1.0 shibboleth-targetconfig-1.0.xsd" 
        elementFormDefault="qualified"
        attributeFormDefault="unqualified"
        blockDefault="substitution"
@@ -41,7 +39,8 @@
                                <element name="CredentialsProvider" type="conf:PluggableType" maxOccurs="unbounded"/>
                        </sequence>
                        <attribute name="logger" type="anyURI" use="optional"/>
-                       <anyAttribute namespace="##any" processContents="lax"/>
+                       <attribute name="clockSkew" type="unsignedInt" use="optional"/>
+                       <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
 
@@ -104,9 +103,11 @@
                                        <element name="MemorySessionCache">
                                                <complexType>
                                                        <complexContent>
-                                                               <extension base="anyType">
+                                                               <restriction base="anyType" mixed="false">
+                                                                       <sequence/>
                                                                        <attributeGroup ref="conf:SessionCacheProperties"/>
-                                                               </extension>
+                                                                       <anyAttribute namespace="##other" processContents="lax"/>
+                                                               </restriction>
                                                        </complexContent>
                                                </complexType>
                                        </element>
@@ -119,7 +120,7 @@
                                                                        </sequence>
                                                                        <attributeGroup ref="conf:SessionCacheProperties"/>
                                                                        <attribute name="mysqlTimeout" type="unsignedInt" use="optional" default="14400"/>
-                                                                       <anyAttribute namespace="##any" processContents="lax"/>
+                                                                       <anyAttribute namespace="##other" processContents="lax"/>
                                                                </restriction>
                                                        </complexContent>
                                                </complexType>
@@ -137,7 +138,7 @@
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                        </sequence>
                        <attribute name="logger" type="anyURI" use="optional"/>
-                       <anyAttribute namespace="##any" processContents="lax"/>
+                       <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
 
@@ -161,16 +162,12 @@
                <complexType>
                        <sequence>
                                <element ref="conf:Extensions" minOccurs="0"/>
-                               <choice minOccurs="0">
-                                       <element ref="conf:RequestMap"/>
-                                       <element name="RequestMapProvider" type="conf:PluggableType"/>
-                               </choice>
+                               <element name="RequestMapProvider" type="conf:PluggableType" minOccurs="0"/>
                                <element name="Implementation" minOccurs="0">
                                        <complexType>
                                                <choice maxOccurs="unbounded">
                                                        <element ref="conf:ISAPI"/>
                                                        <element ref="conf:NSAPI"/>
-                                                       <element ref="conf:Apache"/>
                                                        <element ref="conf:Java"/>
                                                        <any namespace="##other" processContents="lax"/>
                                                </choice>
@@ -179,7 +176,7 @@
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                        </sequence>
                        <attribute name="logger" type="anyURI" use="optional"/>
-                       <anyAttribute namespace="##any" processContents="lax"/>
+                       <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
        
@@ -191,7 +188,9 @@
                                                <complexContent>
                                                        <extension base="anyType">
                                                                <attribute name="id" type="unsignedInt" use="required"/>
-                                                               <attribute name="host" type="string" use="required"/>
+                                                               <attribute name="name" type="string" use="required"/>
+                                       <attribute name="port" type="unsignedInt" use="optional"/>
+                                                               <attribute name="scheme" type="string" use="optional"/>
                                                        </extension>
                                                </complexContent>
                                        </complexType>
@@ -199,7 +198,7 @@
                                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                        </sequence>
                        <attribute name="normalizeRequest" type="boolean" use="optional"/>
-                       <anyAttribute namespace="##any" processContents="lax"/>
+                       <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
        <element name="NSAPI" type="anyType"/>
@@ -247,7 +246,7 @@
        <attributeGroup name="ContentSettings">
                <attribute name="requireSession" type="boolean" use="optional"/>
                <attribute name="exportAssertion" type="boolean" use="optional"/>
-               <anyAttribute namespace="##any" processContents="lax"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
        </attributeGroup>
        <element name="AccessControlProvider" type="conf:PluggableType"/>
 
@@ -320,16 +319,26 @@
                </annotation>
                <complexType>
                        <sequence>
+                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                                <element ref="conf:Sessions"/>
                                <element ref="conf:Errors"/>
-                               <element ref="conf:Policy" minOccurs="0"/>
                                <element ref="conf:CredentialUse" minOccurs="0"/>
+                               <choice minOccurs="0" maxOccurs="unbounded">
+                    <element ref="saml:AttributeDesignator"/>
+                    <element ref="saml:Audience"/>
+                    <element name="AAPProvider" type="conf:PluggableType"/>
+                    <element name="FederationProvider" type="conf:PluggableType"/>
+                    <element name="TrustProvider" type="conf:PluggableType"/>
+                    <element name="RevocationProvider" type="conf:PluggableType"/>
+                               </choice>
                                <element ref="conf:Application" minOccurs="0" maxOccurs="unbounded"/>
-                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                        </sequence>
                        <attribute name="id" type="string" fixed="default"/>
                        <attribute name="providerId" type="anyURI" use="required"/>
-               <anyAttribute namespace="##any" processContents="lax"/>
+                       <attribute name="signRequest" type="boolean" use="optional" default="false"/>
+                       <attribute name="signedResponse" type="boolean" use="optional" default="false"/>
+                       <attribute name="signedAssertions" type="boolean" use="optional" default="false"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
        
@@ -341,15 +350,25 @@
                </annotation>
                <complexType>
                        <sequence>
+                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                                <element ref="conf:Sessions"/>
                                <element ref="conf:Errors" minOccurs="0"/>
-                               <element ref="conf:Policy" minOccurs="0"/>
                                <element ref="conf:CredentialUse" minOccurs="0"/>
-                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                               <choice minOccurs="0" maxOccurs="unbounded">
+                    <element ref="saml:AttributeDesignator"/>
+                    <element ref="saml:Audience"/>
+                    <element name="AAPProvider" type="conf:PluggableType"/>
+                    <element name="FederationProvider" type="conf:PluggableType"/>
+                    <element name="TrustProvider" type="conf:PluggableType"/>
+                    <element name="RevocationProvider" type="conf:PluggableType"/>
+                               </choice>
                        </sequence>
                        <attribute name="id" type="string" use="required"/>
                        <attribute name="providerId" type="anyURI" use="optional"/>
-               <anyAttribute namespace="##any" processContents="lax"/>
+                       <attribute name="signRequest" type="boolean" use="optional" default="false"/>
+                       <attribute name="signedResponse" type="boolean" use="optional" default="false"/>
+                       <attribute name="signedAssertions" type="boolean" use="optional" default="false"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
 
@@ -363,12 +382,12 @@
                                        <attribute name="wayfURL" type="anyURI" use="required"/>
                                        <attribute name="shireURL" type="anyURI" use="required"/>
                                        <attribute name="shireSSL" type="boolean" use="optional"/>
-                                       <attribute name="cookieName" type="string" use="required"/>
+                                       <attribute name="cookieName" type="string" use="optional"/>
                                        <attribute name="cookieProps" type="string" use="optional"/>
                                        <attribute name="lifetime" type="unsignedInt" use="optional"/>
                                        <attribute name="timeout" type="unsignedInt" use="optional"/>
                                        <attribute name="checkAddress" type="boolean" use="optional"/>
-                               <anyAttribute namespace="##any" processContents="lax"/>
+                                       <attribute name="oldAuthnRequest" type="boolean" use="optional"/>
                 </extension>
             </complexContent>
                </complexType>
@@ -384,37 +403,14 @@
                        <attribute name="shire" type="anyURI" use="required"/>
                        <attribute name="rm" type="anyURI" use="required"/>
                        <attribute name="access" type="anyURI" use="required"/>
-                       <attribute name="supportContact" type="string" use="required"/>
-                       <attribute name="logoLocation" type="anyURI" use="required"/>
-                       <anyAttribute namespace="##any" processContents="lax"/>
+                       <attribute name="supportContact" type="string" use="optional"/>
+                       <attribute name="logoLocation" type="anyURI" use="optional"/>
+                       <attribute name="styleSheet" type="anyURI" use="optional"/>
                 </extension>
             </complexContent>
                </complexType>
        </element>
 
-       <element name="Policy">
-               <annotation>
-                       <documentation>
-                       Container for specifying various policies for attributes, trust, and federations
-                       </documentation>
-               </annotation>
-               <complexType>
-                       <sequence>
-                               <element ref="saml:AttributeDesignator" minOccurs="0" maxOccurs="unbounded"/>
-                               <element name="AAPProvider" type="conf:PluggableType" minOccurs="0" maxOccurs="unbounded"/>
-                               <element name="FederationProvider" type="conf:PluggableType" minOccurs="0" maxOccurs="unbounded"/>
-                               <element name="TrustProvider" type="conf:PluggableType" minOccurs="0" maxOccurs="unbounded"/>
-                               <element name="RevocationProvider" type="conf:PluggableType" minOccurs="0" maxOccurs="unbounded"/>
-                               <element ref="saml:Audience"  minOccurs="0" maxOccurs="unbounded"/>
-                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                       </sequence>
-                       <attribute name="signRequest" type="boolean" use="optional" default="false"/>
-                       <attribute name="signedResponse" type="boolean" use="optional" default="false"/>
-                       <attribute name="signedAssertions" type="boolean" use="optional" default="false"/>
-               <anyAttribute namespace="##any" processContents="lax"/>
-               </complexType>
-       </element>
-       
        <element name="CredentialUse">
                <annotation>
                        <documentation>Container for specifying credentials to use</documentation>
@@ -436,7 +432,7 @@
                        </sequence>
                        <attribute name="TLS" type="string" use="required"/>
                        <attribute name="Signing" type="string" use="required"/>
-               <anyAttribute namespace="##any" processContents="lax"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
 </schema>