From 9de590c6bdc4d589ff1ef138bd98824f66783c70 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 11 Feb 2011 11:55:42 +0100
Subject: cleanup ID and resolve SWAMIDOPS-6176

---
 nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml | 35 ++++++++------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

(limited to 'nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml')

diff --git a/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
index c454002f..d0a9fa4c 100644
--- a/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-02.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-02.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
                                    
         <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
         <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
 
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
-                             Location="https://nya-02.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-02.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
         
         <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
         <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
         
     </AttributeAuthorityDescriptor>
     
-</EntityDescriptor>    
+</EntityDescriptor>
-- 
cgit v1.2.3