Added singleAssertion option.

[java-idp.git] / src / schemas / shibboleth-idpconfig-1.0.xsd

diff --git a/src/schemas/shibboleth-idpconfig-1.0.xsd b/src/schemas/shibboleth-idpconfig-1.0.xsd
index dbb84f4..2e3dad8 100644 (file)
--- a/src/schemas/shibboleth-idpconfig-1.0.xsd
+++ b/src/schemas/shibboleth-idpconfig-1.0.xsd
@@ -24,11 +24,7 @@
 
        <xs:complexType name="LogWithLevels">
                <xs:attribute name="location" type="xs:anyURI" use="required" />
-               <xs:attribute name="level" type="idp:LevelType" use="optional" default="WARN" />
-       </xs:complexType>
-
-       <xs:complexType name="Log">
-               <xs:attribute name="location" type="xs:anyURI" use="required"/>
+               <xs:attribute name="level" type="idp:LevelType" use="optional" />
        </xs:complexType>
 
        <xs:simpleType name="Log4JConfigType">
@@ -44,8 +40,8 @@
                                        <xs:sequence>
                                                <xs:element name="RelyingParty" maxOccurs="unbounded">
                                                        <xs:complexType>
-                                                               <xs:sequence minOccurs="0">
-                                                                       <xs:element name="HSNameFormat">
+                                                               <xs:sequence minOccurs="0" maxOccurs="unbounded">
+                                                                       <xs:element name="NameID">
                                                                                <xs:complexType>
                                                                                        <xs:attribute name="nameMapping" type="xs:string" use="required"/>
                                                                                </xs:complexType>
@@ -59,7 +55,9 @@
                                                                <xs:attribute name="forceAttributePush" type="xs:boolean" use="optional"/>
                                                                <xs:attribute name="signAssertions" type="xs:boolean" use="optional"/>
                                                                <xs:attribute name="forceAttributeNoPush" type="xs:boolean" use="optional"/>
+                                                               <xs:attribute name="singleAssertion" type="xs:boolean" use="optional"/>
                                                                <xs:attribute name="defaultToPOSTProfile" type="xs:boolean" use="optional"/>
+                                                               <xs:attribute name="schemaHack" type="xs:boolean" use="optional"/>
                                                                <xs:attribute name="defaultAuthMethod" type="xs:string" use="optional"/>
                                                                <xs:attribute name="preferredArtifactType" type="xs:integer" use="optional"/>
                                                                <xs:attribute name="defaultTarget" type="xs:string" use="optional"/>
@@ -87,7 +85,8 @@
                                                        <xs:choice>
                                                                <xs:sequence>
                                                                        <xs:element name="ErrorLog" type="idp:LogWithLevels" minOccurs="0" maxOccurs="1" />
-                                                                       <xs:element name="TransactionLog" type="idp:Log" minOccurs="0" maxOccurs="1" />
+                                                                       <xs:element name="TransactionLog" type="idp:LogWithLevels" minOccurs="0" 
+                                                                               maxOccurs="1" />
                                                                </xs:sequence>
                                                                <xs:element name="Log4JConfig">
                                                                        <xs:complexType>
@@ -115,7 +114,7 @@
                                        <xs:element name="ProtocolHandler" minOccurs="0" maxOccurs="unbounded">
                                                <xs:complexType>
                                                        <xs:sequence>
-                                                               <xs:element name="Location" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded" />
+                                                               <xs:element name="Location" type="xs:string" minOccurs="1" maxOccurs="unbounded" />
                                                                <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                                                        </xs:sequence>
                                                        <xs:attribute name="implementation" type="xs:string" use="required" />
@@ -140,7 +139,7 @@
                                        default="urn:oasis:names:tc:SAML:1.0:am:unspecified"/>
                                <xs:attribute name="passThruErrors" type="xs:boolean" use="optional" default="false"/>
                                <xs:attribute name="authHeaderName" type="xs:string" use="optional"/>
-                               <xs:attribute name="maxHSThreads" type="xs:integer" use="optional"/>
+                               <xs:attribute name="maxSigningThreads" type="xs:integer" use="optional"/>
                        </xs:complexType>
                </xs:element>