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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Apr 17 13:34:19 2014
New Revision: 5743

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5743&view=rev
Log:
IDP-389 Change schema to all inline public key and certificate file as other ways of providing the key to the SignatureValidationParser

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=5743&r1=5742&r2=5743&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd Thu Apr 17 13:34:19 2014
@@ -372,7 +372,16 @@
         </annotation>
         <complexContent>
             <extension base="shibmd:MetadataFilterType">
-                <attribute name="trustEngineRef" use="required">
+                <sequence>
+                    <element name="PublicKey" type="string" minOccurs="0" maxOccurs="1">
+                        <annotation>
+                            <documentation>
+                                The PEM of the public key used to sign the metadata.
+                            </documentation>
+                        </annotation>
+                    </element>
+                </sequence>
+                <attribute name="trustEngineRef" type="string">
                     <annotation>
                         <documentation>The ID of the trust engine used to validate the signature.</documentation>
                     </annotation>
@@ -381,6 +390,13 @@
                     <annotation>
                         <documentation>
                             A boolean flag indicating whether a signature is required on incoming metadata.
+                        </documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="certificateFile" type="string">
+                    <annotation>
+                        <documentation>
+                            The location of a file containing a certificate with the public key to test against.
                         </documentation>
                     </annotation>
                 </attribute>