updates from ladok

git-svn-id: svn+ssh://svn.it.su.se/svn/swamid-metadata/trunk@324 0878fbc5-a6f2-46f6-b174-cb7b08c221d1

1 files changed, 13 insertions, 12 deletions

diff --git a/nya-1.0/nb10.ladok.umu.se-idp.xml b/nya-1.0/nb10.ladok.umu.se-idp.xml
index 30701cd1..3bee6875 100644
--- a/nya-1.0/nb10.ladok.umu.se-idp.xml
+++ b/nya-1.0/nb10.ladok.umu.se-idp.xml
@@ -14,34 +14,34 @@
             <ds:KeyInfo>
                 <ds:X509Data>
                     <ds:X509Certificate>
-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
+MIIDODCCAiCgAwIBAgIJAKrMtoSZOJxNMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTAubGFkb2sudW11LnNlMB4XDTEwMDQwODEzMzY1N1oXDTIwMDQwNTEzMzY1N1owHDEaMBgGA1UEAxMRbmIxMC5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeF2m2iHT+TwkVyM6z8UpZ/dVyEhocZD6t3k6BXnBXosmE92rz/BUQ0AvYr4FEwkJcElGwuZH474EI9qut91UNCdn0dphXBxAM5iXTHTcjK+gqslbKFkODUhAYXP3TLs/i9Jgm5nvFgzUsZRxy6BmHjMVgPO54/YPyUt/ZlT0ZqCpXb4VR0A95OFVz0INwCY5tJao2wy/CISq2+A9DoI3FuWfmv5j/yXnW4IFYKmdwc3C1jTFoa2REpDgkhJMSNjrtmKgWVfGTy5+gV76iQW1p58rQxoxvR1xDvBHM8TiDItirhkYmHmzGX+HMRd/XqrDRw+0tCYO8xDk7kiyOGVPLAgMBAAGjfTB7MB0GA1UdDgQWBBSGpFIr/DDfpkL8db/toYNArtQDpTBMBgNVHSMERTBDgBSGpFIr/DDfpkL8db/toYNArtQDpaEgpB4wHDEaMBgGA1UEAxMRbmIxMC5sYWRvay51bXUuc2WCCQCqzLaEmTicTTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBZEeCzRZiQQGKUYX1vM/nAH5X7K5PxjQ00KWvvNB68EW1tWqs4KYGyAiOIOHccoEMsXRH9iGZ5RY0FccKzBt4dMrTlC80lQ5LlTnTlesbERvIjalO9psAOcYqYXi3HYKSKVx9exSkx5MCJLgtg0D50j3ofB4Fa0nOqEKDN1dzmck9h1rhgt37NMF5VJkI6SIfqJKmGxKtsBaIa5w2anX6ugbjqF5H/UozGrAiJMLk745nhwY8TvGTo7dde5xH7E+TZIlNfsvmhSC9b76lKUJx9KzEgLFmGTJZrMGYQpIH1xLbhigabhHQmL7JYrYTx/ZnhkocqSJNL9MjJNTS1OgwP
                     </ds:X509Certificate>
                 </ds:X509Data>
             </ds:KeyInfo>
         </KeyDescriptor>
         
         <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   Location="https://nb10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
                                    index="1"/>
 
         <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   Location="https://nb10.ladok.umu.se:8443/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://nb10.ladok.umu.se:444/shibboleth-idp/profile/Shibboleth/SSO" />
+                             Location="https://nb10.ladok.umu.se/idp/profile/Shibboleth/SSO" />
         
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST/SSO" />
+                             Location="https://nb10.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
 
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO" />
+                             Location="https://nb10.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
         
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/Redirect/SSO" />
+                             Location="https://nb10.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -54,22 +54,23 @@ MIIDDjCCAfagAwIBAgIJAMpOmLHAAQ5bMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0x
             <ds:KeyInfo>
                 <ds:X509Data>
                     <ds:X509Certificate>
-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
+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
                     </ds:X509Certificate>
                 </ds:X509Data>
             </ds:KeyInfo>
-        </KeyDescriptor> 
+        </KeyDescriptor>
+
         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery" />
+                          Location="https://nb10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
         
         <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery" />
+                          Location="https://nb10.ladok.umu.se:8443/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>
-  <Organization>
+    <Organization>
     <OrganizationName xml:lang="en">studera.nu</OrganizationName>
     <OrganizationDisplayName xml:lang="en">studera.nu (nb10)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.studera.nu</OrganizationURL>