[java-identity-provider COMMIT] in /trunk: idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/re...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 30 12:02:52 2014
New Revision: 7219

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7219&view=rev
Log:
IDP-556 -  Metadata schema should relax ordering of MetadataFilter and TrustEngine elements.

Modified:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml?rev=7219&r1=7218&r2=7219&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml Tue Dec 30 12:02:52 2014
@@ -9,12 +9,13 @@
 	requireValidMetadata="false" failFastInitialization="false" id="signed"
 	xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
 
+    <security:TrustEngine id="MyTrustEngine" xsi:type="security:StaticExplicitKeySignature">
+        <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
+            <security:Certificate>%{DIR}/filter/switch.pem</security:Certificate>
+        </security:Credential>
+    </security:TrustEngine>
+    
 	<metadata:MetadataFilter xsi:type="metadata:SignatureValidation"
 		trustEngineRef="MyTrustEngine" />
 
-	<security:TrustEngine id="MyTrustEngine" xsi:type="security:StaticExplicitKeySignature">
-		<security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
-			<security:Certificate>%{DIR}/filter/switch.pem</security:Certificate>
-		</security:Credential>
-	</security:TrustEngine>
 </metadata:MetadataProvider>

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=7219&r1=7218&r2=7219&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd Tue Dec 30 12:02:52 2014
@@ -139,14 +139,12 @@
                 </attribute>
                 <attribute name="disregardSslCertificate" type="string">
                     <annotation>
-                        <documentation>This is deprecated, use disregardTLSCertificate instead.
-                        </documentation>
+                        <documentation>This is deprecated, use disregardTLSCertificate instead.</documentation>
                     </annotation>
                 </attribute>
                 <attribute name="disregardTLSCertificate" type="string">
                     <annotation>
-                        <documentation>Server certificate will be ignored when fetching from an HTTPS source.
-                        </documentation>
+                        <documentation>Server certificate will be ignored when using an HTTPS source.</documentation>
                     </annotation>
                 </attribute>
                 <attribute name="maintainExpiredMetadata" type="string">
@@ -163,14 +161,14 @@
                     <annotation>
                         <documentation>
                             The maximum length of time to wait for the remote server to response.
-
                             Timeout is expressed in ISO8601 duration notation.
                         </documentation>
                     </annotation>
                 </attribute>
                 <attribute name="proxyHost" type="string">
                     <annotation>
-                        <documentation>Hostname of the HTTP proxy through which connections will be made.
+                        <documentation>
+                            Hostname of the HTTP proxy through which connections will be made.
                         </documentation>
                     </annotation>
                 </attribute>
@@ -207,9 +205,7 @@
                 </attribute>
                 <attribute name="httpCaching" type="shibmd:HttpClientCachingType">
                     <annotation>
-                        <documentation>
-                            The type of HttpClient caching to perform. Defaults to 'none'.
-                        </documentation>
+                        <documentation>The type of HttpClient caching to perform. Defaults to 'none'.</documentation>
                     </annotation>
                 </attribute>

[... 309 lines stripped ...]