From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Fri, 7 Dec 2007 18:22:46 +0000 (+0000)
Subject: Fix metadata ordering problem.
X-Git-Tag: 2.4~621
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=04a6a53e05dbd65d56bf1ff4a8548e51ae2dc7a7;hp=d9f97d131cfdabb46f6024739d716b165bebeb7b;p=shibboleth%2Fsp.git

Fix metadata ordering problem.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2660 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/configs/example-metadata.xml b/configs/example-metadata.xml
index 25e812b..be7bf43 100644
--- a/configs/example-metadata.xml
+++ b/configs/example-metadata.xml
@@ -94,9 +94,6 @@ metadata to you properly.
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
         <!-- This tells the SP where/how to resolve SAML 1.x artifacts into SAML assertions. -->
         <ArtifactResolutionService index="1"
             Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
@@ -107,6 +104,9 @@ metadata to you properly.
             Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
             Location="https://idp.example.org:8443/shibboleth/profile/saml2/soap/ArtifactResolution"/>
 
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
         <!-- This tells the SP how and where to request authentication. -->
         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
             Location="https://idp.example.org/shibboleth/profile/shibboleth/SSO"/>
@@ -170,14 +170,15 @@ metadata to you properly.
             </ds:KeyInfo>
         </KeyDescriptor>
 
-       <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-       <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
         <!-- This tells the SP how and where to send queries. -->
         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
             Location="https://idp.example.org:8443/shibboleth/profiles/saml1/soap/AttributeQuery"/>
         <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
             Location="https://idp.example.org:8443/shibboleth/profiles/saml2/soap/AttributeQuery"/>
+
+       <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+       <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
     </AttributeAuthorityDescriptor>
 
     <!-- This is just information about the entity in human terms. -->