Merge branch 'master' of md-master.swamid.se:swamid-metadata

26 files changed, 201 insertions, 37 deletions

diff --git a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
index 28acf0ae..3960b0ef 100644
--- a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
@@ -77,7 +77,7 @@
   <Organization>
     <OrganizationName xml:lang="sv">Försvarshögskolan</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Försvarshögskolan</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Försvarshögskolan</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Swedish National Defence College</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.fhs.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/akka-adm.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.uu.se-shibboleth.xml
new file mode 100644
index 00000000..bc7626ba
--- /dev/null
+++ b/swamid-2.0/akka-adm.uu.se-shibboleth.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://akka-adm.uu.se/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Uppsala University AKKA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Authentication Control - Directory Administration</mdui:Description>
+        <mdui:Description xml:lang="sv">Autentisering Kontroll - Katalogadministration</mdui:Description>
+        <mdui:Logo height="50" width="50"> https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50"> https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en"> https://akka-adm.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv"> https://akka-adm.uu.se</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+		MIIE8TCCAtmgAwIBAgIJAI1GQ30Oxl5yMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+		BAMTDmFra2EtYWRtLnV1LnNlMB4XDTE0MTIwMTE0NTYxOVoXDTI0MTEyODE0NTYx
+		OVowGTEXMBUGA1UEAxMOYWtrYS1hZG0udXUuc2UwggIiMA0GCSqGSIb3DQEBAQUA
+		A4ICDwAwggIKAoICAQDasvdLAV6nGnaz8CHzDdne7zx2xOGFq8d7tsAMAHb9hRWf
+		6z1UicnDPZ0CYVvw7KAFX9ZwUAXzNjG8OYYwf0kFiteaQVWRAe0nxgmNiUALtiQ2
+		MqE2un7I34Oe7fJJiOdeH4dc8ojNgEbOg2iYhHeZQ3suAj3Q/X00c41b/oqsI8Kw
+		XJSYqjJuhpDXUH9S854LU4via9a8fSDJm5rJus0dFEqwxMnV9zhivBK4h8y1imML
+		CStFmTV0PYuO3fvNksl1DOxszSu7CbePjd8I/HhrP1NXdSma4SIA4yRkFXdszqeu
+		ZO94y7GOD37RTq7OLtFl0BjVU2Nyh/bPVg3++hpoBUQgCfJR9tIubDG/Gbt/2xKN
+		9Trx81xdyAJG8PJyZPpXf9m3guXUYucrLYOVGyNQtmX9sO3W0O6x1S1bXUfFXQKD
+		mkIa0g5FMe3pKlofbW8Jte+/Vt9wc/S7xsWIeu/imWPempIe1aoAm3LF+NLanLL/
+		Uvh5AuOpZBydjf4xRtlcBII2YlRXb7CkZMJ5MtZWDLQvZnARoFmn+lSRVZds2PDB
+		dkLvM8eNVBK4xKpx/A8QY1aY8rB0zkv+bn61Jb3/Agl1Fzvk9EKoMkqnZT7TzBc0
+		G9Qxz0ZKh3PpY4e2F1N1frO6dSfR1f16jw2nT/c5S6a5QdkkLgEEWZUG7cKTuQID
+		AQABozwwOjAZBgNVHREEEjAQgg5ha2thLWFkbS51dS5zZTAdBgNVHQ4EFgQU7OoY
+		ncjP0tZ+I98M2ElTKiERix0wDQYJKoZIhvcNAQEFBQADggIBAD6Jn9oHlZ6Y3cM9
+		bBVkyi5As36MZPJ/T8exSdaAtyLiwxxgUDlfyphl3iWed44tfrEje4x3Lw7LLjPP
+		iEvT2FEswmYUmaukzg8Dr2hTjYVH7EbbRfp7DnxEBCjMtaQdDJ1FQ7J5GiVxVJUc
+		SdYLboCIqEnOqo+UBS+RnoYPLxaJFxkL/FaXBWlmsQ+IG6czLXmxqz+6+J3NFuMr
+		hGriPrKioG+Eo1CRHDFNh8+4slQJgFph/+xF3yeRjCUvkwaUewhSYEo81uj3PmZp
+		TXuoleUEs2uDAJaHSnLcm5lQMkTUqw9kBxFlQBY1QSniJ9xmn0KzUjCDbzYx1Z8L
+		zBK4tbogzkXfN38yRH9Ugy1eVckKMfs7JtaMn/8+faujPR+drbvor9wd9QZjG4ln
+		seQwlGOrp7H/L+XsWWBxA70xSifdwAgc6eEXDbShwr1nXiK3nVAJPCyfKsPVGjhq
+		Kx9SM9iF2qTkIIirDbOs97aQfWEYifDzd1Pa9YNIXBfukiFV0DQRqquDi9wwJ2la
+		wQxuvWJn1uxYorjqziZmk8AKBb8eujRzAhBQ0m/ABKs65/e9jP9OkYUnkrDczKKy
+		1gRrBL6ykWQYLq7cADDmRnaebfQ05flzrTUmY3yA+VT+dXMCRFRCR8ko2PU2G2S5
+		lEhvUG971lBpFbEUfV+hyAu+keKI
+        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-adm.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>IT Servicedesk</md:SurName>
+    <md:EmailAddress>helpdesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/datasets.sunet.se-shibboleth.xml b/swamid-2.0/datasets.sunet.se-shibboleth.xml
index d63e944b..c618002d 100644
--- a/swamid-2.0/datasets.sunet.se-shibboleth.xml
+++ b/swamid-2.0/datasets.sunet.se-shibboleth.xml
@@ -1,9 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9effc03beb324ea59d231c49998d8207f04e2abf" entityID="https://datasets.sunet.se/shibboleth">
-
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://datasets.sunet.se/shibboleth">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -28,7 +28,6 @@ and do *NOT* provide it in real time to your partners.
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://datasets.sunet.se/Shibboleth.sso/Login"/>
@@ -79,5 +78,4 @@ SFTz2brDLzUEIO3lt6p+Xo5YeuMYoojCZKixJIpCB2TI6cet72dtXYOKuXWsqg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://datasets.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://datasets.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/dev.idp.eduid.se-idp.xml b/swamid-2.0/dev.idp.eduid.se-idp.xml
index cd57be43..20f2d4b2 100644
--- a/swamid-2.0/dev.idp.eduid.se-idp.xml
+++ b/swamid-2.0/dev.idp.eduid.se-idp.xml
@@ -67,7 +67,7 @@ hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
   </ns0:IDPSSODescriptor>
   <ns0:Organization>
     <ns0:OrganizationName xml:lang="en">eduID TEST</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">eduID TEST</ns0:OrganizationDisplayName>
+    <ns0:OrganizationDisplayName xml:lang="en">eduID TEST dev</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
   </ns0:Organization>
   <ns0:ContactPerson contactType="technical">
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index de961613..dd459074 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -336,7 +336,7 @@
   </IDPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="sv">Linköping University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Linköpings Universitet (ADFS)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Linköpings universitet (ADFS)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Linköping University (ADFS)</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.liu.se/</OrganizationURL>
   </Organization>
diff --git a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
index 125676f7..5cd31580 100644
--- a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
+++ b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
@@ -95,7 +95,7 @@ icptKTpDxrRjfCXibBT1
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">The Swedish School of sport and health sciences</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Gymnastik- och Idrottshögskolan</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.gih.se</OrganizationURL>
   </Organization>
diff --git a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
index d6687c6c..715d0f3f 100644
--- a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
+++ b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
@@ -86,8 +86,8 @@ X627IsSkKg==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">NORDUnetTEST</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">NORDUnet (Test IdP)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NORDUnet (Test IdP)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">NORDUnet Test IdP</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">NORDUnet Test IdP</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
index 73d78830..507f0e70 100644
--- a/swamid-2.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
@@ -89,8 +89,8 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">BTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Personnel</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml
index 9c596ec6..f646dac8 100644
--- a/swamid-2.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.his.se-idp-shibboleth.xml
@@ -100,7 +100,7 @@ drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
   <Organization>
     <OrganizationName xml:lang="en">HIS</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Högskolan i Skövde</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Skövde</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.his.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
index 6bb17238..57534be4 100644
--- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
@@ -94,8 +94,8 @@ XCYbfP8E3cs4MB+K
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">IRF</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Institutet för Rymdfysik</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
index 448c8625..539dabea 100644
--- a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
@@ -84,7 +84,7 @@ VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Stockholms Universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Stockholms universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Stockholm University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
   </Organization>
diff --git a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
index d136e031..6664519e 100644
--- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -89,8 +89,8 @@ Qz1btpwpzorDI58f7uezMy6zg2+3aLxJ</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KMH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Kungliga Musikhögskolan</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Royal College of Music</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kmh.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
index 652a95e0..8d10830a 100644
--- a/swamid-2.0/idp.kva.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
@@ -92,7 +92,7 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KVA</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga vetenskapsakademien</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Kungliga Vetenskapsakademien</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">The Royal Swedish Academy of Sciences</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kva.se</OrganizationURL>
   </Organization>
diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
index 47c1896d..5f1a0abe 100644
--- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
@@ -94,8 +94,8 @@ dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">MAH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Malmö Högskola</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Malmö Högskola</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Malmö högskola</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Malmö University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.mah.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
index 41caee10..c038ceab 100644
--- a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
@@ -85,7 +85,7 @@ MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
   <Organization>
     <OrganizationName xml:lang="en">The Red Cross University College</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Red Cross University College</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.rkh.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
index 46e52d33..8ba6db17 100644
--- a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
@@ -85,8 +85,8 @@ nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">STUDENTS-BTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Students</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
index 3f4b94d9..adae6b1a 100644
--- a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
@@ -43,7 +43,7 @@
   <md:Organization>
     <md:OrganizationName xml:lang="sv">UmU</md:OrganizationName>
     <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.umu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
diff --git a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml
index cdf0c551..01187453 100644
--- a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml
@@ -103,7 +103,7 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KAU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Karlstads Universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Karlstads universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
   </Organization>
diff --git a/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
index cc0f44ba..b9641062 100644
--- a/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
@@ -116,8 +116,8 @@ sdhdXg==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska Högskolan</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska Högskolan (old)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (old)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
index 34ffc5e1..2cdb22df 100644
--- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -120,8 +120,8 @@ x7JUFw==</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska Högskolan (test)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (test)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
index 335c9912..e142e8fd 100644
--- a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
@@ -87,7 +87,7 @@ Pz8R3A==</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">ORU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Örebro Universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Örebro universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
   </Organization>
diff --git a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
index 6067ae9c..7293f8f5 100644
--- a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
@@ -90,8 +90,8 @@ B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">LTU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Luleå Tekniska Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Luleå Tekniska Universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Lulea University of Technology</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
index b09c823d..836e749b 100644
--- a/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
@@ -95,8 +95,8 @@ ADE1bHKRi4qX9DYfBN7g
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">LU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Lunds Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Lunds Universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Lunds universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.lu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
index 45eeda4a..e0c47cf9 100644
--- a/swamid-2.0/signon.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
@@ -98,7 +98,7 @@ CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
   <Organization>
     <OrganizationName xml:lang="en">HH</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Högskolan i Halmstad</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Halmstad University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
index 8bfba979..9aae47fb 100644
--- a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
@@ -96,7 +96,7 @@ I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
   <Organization>
     <OrganizationName xml:lang="en">MIUN</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Mittuniversitetet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Mittuniversitetet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Mid Sweden University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/www.ate.legion02.led.its.umu.se-gui-sp.xml b/swamid-2.0/www.ate.legion02.led.its.umu.se-gui-sp.xml
new file mode 100644
index 00000000..8c7a84d5
--- /dev/null
+++ b/swamid-2.0/www.ate.legion02.led.its.umu.se-gui-sp.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ate.legion02.led.its.umu.se/gui-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok Legion02 ATE</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok Legion02 ATE</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Nästa generation av studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Next generation of the administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.ate.legion02.led.its.umu.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.ate.legion02.led.its.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.ate.legion02.led.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.ate.legion02.led.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDVDCCAjygAwIBAgIJAKu3ozzE2pLPMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
+BAMTH3d3dy5hdGUubGVnaW9uMDIubGVkLml0cy51bXUuc2UwHhcNMTQxMTI4MTQz
+NDEwWhcNMjQxMTI1MTQzNDEwWjAqMSgwJgYDVQQDEx93d3cuYXRlLmxlZ2lvbjAy
+LmxlZC5pdHMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+5b572lEk0A13LIJxScLWu81igNYPnUkUnVk/3C69kB9CxCXnNsqmj5kfhJjdmN77
+fpTVoHwnaSguN9nuDPB0QuJhT//c3wrNI7JjJDRSQRbyq5c7Mgz5hh2yzfOOrAZs
+XHGPjpk1z/XXYiWxqkHRPEOrBRs6AtM8NOyPrS68odgZ3a9X81jUacxnGs0O6ncf
+GGe4cREuESRRjnUNPmUw9/g1ZgnC8xQ+XQNT6XaGEnYcknwvubQqQLkZJ4ucOeCJ
+kPrDJUWNWqdM1iLK5zXtJoR9R5ny2D+oPM1bdcG1i9yl4OlNgw/6WAjKWTqQdv16
+PzN5TK8aSC04Nwbz3bPRkQIDAQABo30wezBaBgNVHREEUzBRgh93d3cuYXRlLmxl
+Z2lvbjAyLmxlZC5pdHMudW11LnNlhi5odHRwczovL3d3dy5hdGUubGVnaW9uMDIu
+bGVkLml0cy51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBSA4AJyI8TCNBhV3a/7YQTa
+yVatvjANBgkqhkiG9w0BAQUFAAOCAQEAbdaLpz5gs2HSqbl84YbdAU2kB9cfduzl
+ZISXkyA9fLTLnU6kD2rU+yMYDGwqvEpoM1Q6kEOB/EivhicipNhzMwQBSePNfKT5
+zY8CbqMQpy+C/VQKRGwROc91LRpOmyukx3ut8qE2GnfYHbiVGNbQAL++nKHIwDZL
+z5A7rSMSFPGWRTjG0xtGYvA3MFD0gGziE3GXsSS1nRsmDA3M8tFas5vEtwQwRln2
+B6LB28Xf4ZFA+za2fX/6nWvQdNnayPXmST0XzmzHY83N+33PBlzQc9x9osrbcbg1
+gi5C9LLZ+6+nXk1WlzdS3eJVAbYzfLrU8Y1Kw1Wx9oVTD/OqrYwWZQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ate.legion02.led.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>