From 54899ac6b0286e1c3a9067157a5247e35b60c0e5 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Thu, 30 Nov 2023 09:23:39 +0100
Subject: SWAMID-3507: Updated akka-adm.test.uu.se

---
 .../swamid-2.0/akka-adm.test.uu.se-shibboleth.xml  | 104 +++++++++++++++++++++
 .../akka-adm.test.uu.se-shibboleth.xml             | 104 ---------------------
 2 files changed, 104 insertions(+), 104 deletions(-)
 create mode 100644 metadata/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml
 delete mode 100644 metadata/swamid-testing/akka-adm.test.uu.se-shibboleth.xml

diff --git a/metadata/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml b/metadata/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml
new file mode 100644
index 00000000..f713c4a1
--- /dev/null
+++ b/metadata/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://akka-adm.test.uu.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-16T18:53:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University AKKA (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Autentisering/Kontroll - Katalogadministration (TEST)</mdui:Description>
+        <mdui:Description xml:lang="en">Authentication/Control - Directory Administration (TEST)</mdui:Description>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://akka.uadm.uu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://akka.uadm.uu.se/?languageId=1</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=864209981&amp;l=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=864209981&amp;l=sv</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFDDCCAvSgAwIBAgIJAKteO8AenOr0MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF3V1Yy1ha2thMDA0LXQuaXRzLnV1LnNlMB4XDTE1MTAyMDA3Mjc1OVoXDTI1
+MTAxNzA3Mjc1OVowIjEgMB4GA1UEAxMXdXVjLWFra2EwMDQtdC5pdHMudXUuc2Uw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5Yykfh896zzlUMDkKfgP9
+bDEqGjRGLyIJaj+nDqtBzpStcqutIBbFhg59hkCO0rSQ7tTqAfiyTd+Tumu//+Va
+eP5cs98FPMePfRd53xYECQzIw4UtVAjEQJEgnhrtuW6izhKv8QBy7NE/+w44kwx1
+NyHnwk0LhkmPr8t131PfCqktOZ5zuRu/neqx99CPbsBLtFZ7Sq3YFBrQA8w5UhiQ
+EyHR3moUUYxOI/1QzjrEjBOM/3tRnX5JW1vYJUTuTPpOz3/xNUFYuD3WyVfIGS2d
+/qyDmfJF8W9WZHFosKszJ/ptsLFu1htS8M6X5NE75/Axw1Iq7j/tuf6Ie/PyyIpF
+898YdX7ZNb4SrjkaEK28uKmomXW3eA9OtJfzYZI2n9cKmaEHPP0clBDksyPn16q8
+6sAOq0MWOUUZ6/KnWPmZWczEaHzsvlsAdP715c4QjfRN0eh65T0gUJA8YcKqBIef
+qLaW4buj1udWFCfmH3V9DwOcedEU2v90Qxrn/Og7VUoCaaw05OeouRIxPVZVhyX2
+jCxWtVl1HWXDKcDDwh2q70B2TzCnlmHnEINxldAvAfy2vAW/BusCNxrLiscHdj3a
+1+N97p3xHrtMdUTEs1GsQVnVSNHxinshGiIis3lw+W5xuOnEVFpzBjad2oqLCj8t
+m2IzDvqYtNXE91fg0kwMUQIDAQABo0UwQzAiBgNVHREEGzAZghd1dWMtYWtrYTAw
+NC10Lml0cy51dS5zZTAdBgNVHQ4EFgQUUruxH3bOINDbPvFnLUaZzNmRTzwwDQYJ
+KoZIhvcNAQEFBQADggIBADY78qD6b3UWghVabhCLWLW9MPrMiV0FeKaOHOuQYERv
+DsU3//Nc9lwExqfOavsdQu5sWmjv8DwfJkmRxRz83qtFUlcPCc3NTRwLDkB/BFpy
+RUYXQtzbOfAJA5zHZvFeNVtgDNT+492BrdHlovMCkYEmYsEJbH+JlTuPK0qxwRqI
+mrPt0xTY/uTfr3WJWjUuDJfRXBqk7RduPE/OuRmJgR5y2YTuhD7xuH3g2n11Lcqp
+oDANE9jKgPeFD8otFNmDxb8vzFaHvxPN8VAJEzTbtA0ijvpOWFodlv/yVsn8klvE
+WSLRvWzSCXenOaSCaf4y92Fi4n0WjOXtWV4C7nkjrlO6ov9FxDo9U+p7PQ568T8N
+mt3qQBeVbAFb2McyyB4J8XSO2PGOZOfx/P+QREqCCSQK+vd5/WNZdU/O+QEVOA67
+xLEWZrA8ctG8LISaRvo25r6JAnwrQYF7RaCFCBmqBe1JYYdtEaiSVAbo1WKsxRub
+ijMA4vVFfH6jjSOnzquVyciKxDOaCNNT2h8qqBiVA1DyS0m3N403ebwNrzoFwGrk
+54g7VI1jtxz15prFXwN3yIaG14fUHsRiEAWu84QBAQ2wnufJNWqaLiHHUPDaxTpg
+lo0T4kERMhfIMpY98G4xTyJQrk6qqNItEsD8CWePbYFnlo+c2IxU9tvGM6sLA50k</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.test.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="sv">Uppsala universitets AKKA (TEST)</md:ServiceName>
+      <md:ServiceName xml:lang="en">Uppsala University AKKA (TEST)</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>IT Support</md:SurName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>IT Support</md:SurName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/akka-adm.test.uu.se-shibboleth.xml b/metadata/swamid-testing/akka-adm.test.uu.se-shibboleth.xml
deleted file mode 100644
index f6250234..00000000
--- a/metadata/swamid-testing/akka-adm.test.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://akka-adm.test.uu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-16T18:53:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University AKKA (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Autentisering/Kontroll - Katalogadministration (TEST)</mdui:Description>
-        <mdui:Description xml:lang="en">Authentication/Control - Directory Administration (TEST)</mdui:Description>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://akka.uadm.uu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://akka.uadm.uu.se/?languageId=1</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=864209981</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=864209981</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFDDCCAvSgAwIBAgIJAKteO8AenOr0MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF3V1Yy1ha2thMDA0LXQuaXRzLnV1LnNlMB4XDTE1MTAyMDA3Mjc1OVoXDTI1
-MTAxNzA3Mjc1OVowIjEgMB4GA1UEAxMXdXVjLWFra2EwMDQtdC5pdHMudXUuc2Uw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5Yykfh896zzlUMDkKfgP9
-bDEqGjRGLyIJaj+nDqtBzpStcqutIBbFhg59hkCO0rSQ7tTqAfiyTd+Tumu//+Va
-eP5cs98FPMePfRd53xYECQzIw4UtVAjEQJEgnhrtuW6izhKv8QBy7NE/+w44kwx1
-NyHnwk0LhkmPr8t131PfCqktOZ5zuRu/neqx99CPbsBLtFZ7Sq3YFBrQA8w5UhiQ
-EyHR3moUUYxOI/1QzjrEjBOM/3tRnX5JW1vYJUTuTPpOz3/xNUFYuD3WyVfIGS2d
-/qyDmfJF8W9WZHFosKszJ/ptsLFu1htS8M6X5NE75/Axw1Iq7j/tuf6Ie/PyyIpF
-898YdX7ZNb4SrjkaEK28uKmomXW3eA9OtJfzYZI2n9cKmaEHPP0clBDksyPn16q8
-6sAOq0MWOUUZ6/KnWPmZWczEaHzsvlsAdP715c4QjfRN0eh65T0gUJA8YcKqBIef
-qLaW4buj1udWFCfmH3V9DwOcedEU2v90Qxrn/Og7VUoCaaw05OeouRIxPVZVhyX2
-jCxWtVl1HWXDKcDDwh2q70B2TzCnlmHnEINxldAvAfy2vAW/BusCNxrLiscHdj3a
-1+N97p3xHrtMdUTEs1GsQVnVSNHxinshGiIis3lw+W5xuOnEVFpzBjad2oqLCj8t
-m2IzDvqYtNXE91fg0kwMUQIDAQABo0UwQzAiBgNVHREEGzAZghd1dWMtYWtrYTAw
-NC10Lml0cy51dS5zZTAdBgNVHQ4EFgQUUruxH3bOINDbPvFnLUaZzNmRTzwwDQYJ
-KoZIhvcNAQEFBQADggIBADY78qD6b3UWghVabhCLWLW9MPrMiV0FeKaOHOuQYERv
-DsU3//Nc9lwExqfOavsdQu5sWmjv8DwfJkmRxRz83qtFUlcPCc3NTRwLDkB/BFpy
-RUYXQtzbOfAJA5zHZvFeNVtgDNT+492BrdHlovMCkYEmYsEJbH+JlTuPK0qxwRqI
-mrPt0xTY/uTfr3WJWjUuDJfRXBqk7RduPE/OuRmJgR5y2YTuhD7xuH3g2n11Lcqp
-oDANE9jKgPeFD8otFNmDxb8vzFaHvxPN8VAJEzTbtA0ijvpOWFodlv/yVsn8klvE
-WSLRvWzSCXenOaSCaf4y92Fi4n0WjOXtWV4C7nkjrlO6ov9FxDo9U+p7PQ568T8N
-mt3qQBeVbAFb2McyyB4J8XSO2PGOZOfx/P+QREqCCSQK+vd5/WNZdU/O+QEVOA67
-xLEWZrA8ctG8LISaRvo25r6JAnwrQYF7RaCFCBmqBe1JYYdtEaiSVAbo1WKsxRub
-ijMA4vVFfH6jjSOnzquVyciKxDOaCNNT2h8qqBiVA1DyS0m3N403ebwNrzoFwGrk
-54g7VI1jtxz15prFXwN3yIaG14fUHsRiEAWu84QBAQ2wnufJNWqaLiHHUPDaxTpg
-lo0T4kERMhfIMpY98G4xTyJQrk6qqNItEsD8CWePbYFnlo+c2IxU9tvGM6sLA50k</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.test.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Uppsala universitets AKKA (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Uppsala University AKKA (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
-- 
cgit v1.2.3