Final? rename of SHAR/SHIRE sections

[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 404e4b6..a0b29c3 100644 (file)
--- a/schemas/shibboleth-targetconfig-1.0.xsd
+++ b/schemas/shibboleth-targetconfig-1.0.xsd
@@ -37,15 +37,18 @@
                <sequence>
                        <element ref="conf:Extensions" minOccurs="0"/>
                        <choice minOccurs="0">
+                               <element name="OutOfProcess" type="conf:GlobalConfigurationType"/>
                                <element name="Global" type="conf:GlobalConfigurationType"/>
                                <element name="SHAR" type="conf:GlobalConfigurationType"/>
                        </choice>
                        <choice minOccurs="0">
+                               <element name="InProcess" type="conf:LocalConfigurationType"/>
                                <element name="Local" type="conf:LocalConfigurationType"/>
                                <element name="SHIRE" type="conf:LocalConfigurationType"/>
                        </choice>
                        <element ref="conf:Applications"/>
                        <element name="CredentialsProvider" type="conf:PluggableType" minOccurs="0" maxOccurs="unbounded"/>
+                       <element ref="conf:AttributeFactory" minOccurs="0" maxOccurs="unbounded"/>
                </sequence>
                <attribute name="logger" type="anyURI" use="optional"/>
                <attribute name="clockSkew" type="unsignedInt" use="optional"/>
@@ -96,6 +99,7 @@
                                                </attribute>
                                        </complexType>
                                </element>
+                               <element name="MemoryListener" type="conf:PluggableType"/>
                                <element name="Listener" type="conf:PluggableType"/>
                        </choice>
                        <choice>
@@ -385,6 +389,8 @@
                                <element ref="conf:SessionInitiator"/>
                                <element ref="md:AssertionConsumerService"/>
                                <element ref="md:SingleLogoutService"/>
+                               <element ref="conf:DiagnosticService"/>
+                               <element name="ExtensionService" type="conf:PluggableType"/>
                        </choice>
                        <!-- deprecated --> <attribute name="wayfURL" type="anyURI" use="optional"/>
                        <!-- deprecated --> <attribute name="shireURL" type="anyURI" use="optional"/>
@@ -417,6 +423,28 @@
                        <attribute name="checkCDC" type="anyURI" use="optional"/>
                        <attribute name="isDefault" type="boolean" use="optional"/>
                        <attribute name="id" type="string" use="optional"/>
+                       <anyAttribute namespace="##any" processContents="lax"/>
+               </complexType>
+       </element>
+       <element name="DiagnosticService">
+               <annotation>
+                       <documentation>Used to specify internal diagnostic capabilities</documentation>
+               </annotation>
+               <complexType>
+                       <sequence>
+                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                       </sequence>
+                       <attribute name="Location" type="anyURI" use="required"/>
+                       <attribute name="Binding" type="anyURI" use="required"/>
+                       <attribute name="echo" type="boolean" use="optional"/>
+                       <attribute name="log" type="boolean" use="optional"/>
+                       <attribute name="config" type="boolean" use="optional"/>
+                       <attribute name="acl" use="optional">
+                               <simpleType>
+                                       <list itemType="string"/>
+                               </simpleType>
+                       </attribute>
+                       <anyAttribute namespace="##any" processContents="lax"/>
                </complexType>
        </element>
 
@@ -441,11 +469,25 @@
        </element>
 
        <attributeGroup name="CredentialUseGroup">
-               <attribute name="TLS" type="string" use="required"/>
-               <attribute name="Signing" type="string" use="required"/>
+               <attribute name="TLS" type="string" use="optional"/>
+               <attribute name="Signing" type="string" use="optional"/>
                <attribute name="signRequest" type="boolean" use="optional" default="false"/>
+               <attribute name="signatureAlg" type="anyURI" use="optional"/>
+               <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">
@@ -470,5 +512,20 @@
                <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
+       
+       <element name="AttributeFactory">
+               <annotation>
+                       <documentation>Specifies a plugin that implements a specialized SAML attribute</documentation>
+               </annotation>
+               <complexType>
+                       <sequence>
+                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                       </sequence>
+                       <attribute name="type" type="string" use="required"/>
+                       <attribute name="AttributeName" type="string" use="required"/>
+               <anyAttribute namespace="##other" processContents="lax"/>
+               </complexType>
+       </element>
+       
 </schema>