[java-identity-provider COMMIT] /trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Feb 11 17:05:39 2015
New Revision: 7335

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7335&view=rev
Log:
Checkpoint work on HTTPS TLS TrustEngines - IdP config schema for metadata providers.

Modified:
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd?rev=7335&r1=7334&r2=7335&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd Wed Feb 11 17:05:39 2015
@@ -117,6 +117,22 @@
         </annotation>
         <complexContent>
             <extension base="shibmd:ReloadingMetadataProviderType">
+                <sequence>
+                    <element name="TLSTrustEngine"  minOccurs="0" maxOccurs="1">
+                        <annotation>
+                            <documentation>
+                                TrustEngine used to evaluate HTTPS server TLS certificates.
+                            
+                                This element conflicts with and is overridden by the tlsTrustEngineRef attribute.
+                            </documentation>
+                        </annotation>
+                        <complexType>
+                            <sequence>
+                                <element ref="security:TrustEngine" minOccurs="1" maxOccurs="1" />
+                            </sequence>
+                        </complexType>
+                    </element>
+                </sequence>
                 <attribute name="httpClientRef" type="string">
                     <annotation>
                         <documentation>
@@ -218,6 +234,16 @@
                 <attribute name="httpMaxCacheEntrySize" type="string">
                     <annotation>
                         <documentation>The maximum response body size which may be cached, in bytes.</documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="tlsTrustEngineRef" type="string">
+                    <annotation>
+                        <documentation>
+                            A reference to an externally-defined Spring bean which specifies an
+                            instance of TrustEngine used to evaluate HTTPS server TLS certificates.
+                            
+                            This attribute conflicts with and overrides the TLSTrustEngine child element.
+                        </documentation>
                     </annotation>
                 </attribute>
                 <!-- Need to deal with socket factory -->
@@ -369,6 +395,22 @@
         </annotation>
         <complexContent>
             <extension base="shibmd:DynamicMetadataProviderType"> 
+                <sequence>
+                    <element name="TLSTrustEngine"  minOccurs="0" maxOccurs="1">
+                        <annotation>
+                            <documentation>
+                                TrustEngine used to evaluate HTTPS server TLS certificates.
+                            
+                                This element conflicts with and is overridden by the tlsTrustEngineRef attribute.
+                            </documentation>
+                        </annotation>
+                        <complexType>
+                            <sequence>
+                                <element ref="security:TrustEngine" minOccurs="1" maxOccurs="1" />
+                            </sequence>
+                        </complexType>
+                    </element>
+                </sequence>
                 <attribute name="httpClientRef" type="string">
                     <annotation>
                         <documentation>
@@ -478,6 +520,16 @@
                     <annotation>
                         <documentation>
                             The maximum response body size which may be cached, in bytes.
+                        </documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="tlsTrustEngineRef" type="string">
+                    <annotation>
+                        <documentation>
+                            A reference to an externally-defined Spring bean which specifies an
+                            instance of TrustEngine used to evaluate HTTPS server TLS certificates.
+                            
+                            This attribute conflicts with and overrides the TLSTrustEngine child element.
                         </documentation>
                     </annotation>
                 </attribute>