From 7295653883234073bd71277386281a1a6b3cbcff Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Sat, 3 Dec 2022 07:56:30 +0100
Subject: SWAMID-2100 Updated luvittest1.education.lu.se

---
 .../luvittest1.education.lu.se-shibboleth.xml      |  38 +++++-
 swamid-edugain-idp-1.0.mxml                        |  22 ++--
 swamid-edugain-sp-1.0.mxml                         |   4 +-
 swamid-sp-2.0.mxml                                 | 142 ++++++++++-----------
 swamid-testing-idp-1.0.mxml                        |  20 +--
 swamid-testing-sp-1.0.mxml                         |   2 +-
 6 files changed, 128 insertions(+), 100 deletions(-)

diff --git a/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml b/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
index 19aa57d9..27d721b3 100644
--- a/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
+++ b/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
@@ -21,9 +21,8 @@
     <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>
-      <samla:Attribute 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:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -36,6 +35,10 @@
         <mdui:DisplayName xml:lang="en">Lund University LUVIT Test1</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Testmiljö för Lund University LUVIT</mdui:Description>
         <mdui:Description xml:lang="en">Test system for Lund University LUVIT</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.lu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.lu.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.it.lu.se/fileadmin/user_upload/itlu/personaldata.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.it.lu.se/fileadmin/user_upload/itlu/personaldata.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -58,8 +61,7 @@ WE1R7qa6rDANBgkqhkiG9w0BAQUFAAOCAQEAIU9JRzoyORJT4RJQClKLTPKlwHq2
 4RcxS+ERjsteyS9HkyBsZ0jSPLFen/s0SUeotbjthZCi/XK+YWv1wyqggK/lvR6t
 p1dnSLM5Ha+WCfgQnRKOLm39ozN8v68/yDSD6HXAHY/XvgMEBA/uAernasC/GA4v
 FLaJ/zHHHw6kCo9a1k5jQG3mwZhT+/vmUZXWbzHEiOb659NI9NVzLpFq6NVLrILf
-V++yEkt5n8e8BoA3PHj5/MSgzEqPnlNRMhTX5QYW4TYy23uQaXVwybYPSw==
-</ds:X509Certificate>
+V++yEkt5n8e8BoA3PHj5/MSgzEqPnlNRMhTX5QYW4TYy23uQaXVwybYPSw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -87,4 +89,30 @@ V++yEkt5n8e8BoA3PHj5/MSgzEqPnlNRMhTX5QYW4TYy23uQaXVwybYPSw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Lund University LUVIT Test1</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Test system for Lund University LUVIT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Test system for Lund University LUVIT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lund University LUVIT Test1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.lu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Grade</md:Company>
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Nilsson</md:SurName>
+    <md:EmailAddress>mailto:peter.nilsson@grade.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Grade</md:Company>
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Nilsson</md:SurName>
+    <md:EmailAddress>mailto:peter.nilsson@grade.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>Grade</md:Company>
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Nilsson</md:SurName>
+    <md:EmailAddress>mailto:peter.nilsson@grade.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 7f8fae05..9fe8cccc 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -12,11 +12,9 @@
   <xi:include href="swamid-edugain/federation.uniarts.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-edugain/fs.bth.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-edugain/fs.liu.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-edugain/idp01.gih.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-edugain/idp2.bth.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-edugain/idp2.kkh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-edugain/idp3.hig.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-edugain/idp-shib.slu.se-idp.xml"/>
+  <xi:include href="swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-edugain/idp.chalmers.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-edugain/idp.esh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-edugain/idp.hb.se-idp-shibboleth.xml"/>
@@ -32,19 +30,21 @@
   <xi:include href="swamid-edugain/idp.mdh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-edugain/idp.nordu.net-idp-shibboleth.xml"/>
   <xi:include href="swamid-edugain/idp.oru.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-edugain/idp-shib.slu.se-idp.xml"/>
   <xi:include href="swamid-edugain/idp.sunet.se-idp.xml"/>
   <xi:include href="swamid-edugain/idp.ths.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-edugain/idpv4.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-edugain/idp.vr.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-edugain/login2.fhs.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-edugain/idp01.gih.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-edugain/idp2.bth.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-edugain/idp2.kkh.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-edugain/idp3.hig.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-edugain/idpv4.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-edugain/login.du.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-edugain/login.idp.eduid.se-idp.xml.xml"/>
   <xi:include href="swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-edugain/login.ki.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-edugain/login2.fhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-edugain/miunidp.miun.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-edugain/sts.mah.se-adfs-services-trust.xml"/>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 9a576580..704872d8 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -10,8 +10,8 @@
   <xi:include href="swamid-edugain/crowd.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-edugain/demo.beta.seamlessaccess.org-shibboleth.xml"/>
   <xi:include href="swamid-edugain/demo.seamlessaccess.org-shibboleth.xml"/>
-  <xi:include href="swamid-edugain/dev.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-edugain/dev-us.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-edugain/dev.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-edugain/drive-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-edugain/edusign.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-edugain/errorurl-sp-demo.swamid.se-shibboleth.xml"/>
@@ -37,8 +37,8 @@
   <xi:include href="swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml"/>
   <xi:include href="swamid-edugain/sp.sprakochfolkminnen.se-.xml"/>
   <xi:include href="swamid-edugain/staging-us.cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-edugain/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+  <xi:include href="swamid-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-edugain/us.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-edugain/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0d74f853..4edf627d 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -6,35 +6,35 @@
   <xi:include href="swamid-2.0/7t.lbic.lu.se.xml"/>
   <xi:include href="swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/acc.nais.uhr.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/account.hh.se-Shibboleth.xml"/>
+  <xi:include href="swamid-2.0/acc.valda.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/account-idac.ki.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/account-utv.hh.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/account.hh.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/account.lnu.se-saml2.xml"/>
   <xi:include href="swamid-2.0/account.mdu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/account.tst.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/account-utv.hh.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/acc.valda.uhr.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/activate.du.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/activate-test.du.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/activate.du.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs.artologik.net-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/admin.selma7.its.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/admin.selma7.its.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/agate.cohorts.medsci.test.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/agate.cohorts.medsci.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/akka-adm.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/akka-mini-mdh.its.uu.se-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/akka-mini-mdh-test.its.uu.se-Shibboleth.sso-Metadata.xml"/>
-  <xi:include href="swamid-2.0/aktivera.su.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/akka-mini-mdh.its.uu.se-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/aktivera.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/almagest.sai.kau.se.xml"/>
   <xi:include href="swamid-2.0/ams.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/antagningsp.slu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/apps.convertus.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/app.sh.se.xml"/>
-  <xi:include href="swamid-2.0/appstest.convertus.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/app.ub.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/apps.convertus.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/appstest.convertus.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/assemblage.dc.kau.se.xml"/>
   <xi:include href="swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml"/>
@@ -51,8 +51,8 @@
   <xi:include href="swamid-2.0/blender.c3se.chalmers.se-a.xml"/>
   <xi:include href="swamid-2.0/bofur.sae.kau.se.xml"/>
   <xi:include href="swamid-2.0/bombur.sau.kau.se.xml"/>
-  <xi:include href="swamid-2.0/bookings.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/bookings.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/box-saas-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/brandkeeper.se-wsfed.xml"/>
   <xi:include href="swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
@@ -71,20 +71,20 @@
   <xi:include href="swamid-2.0/cohorts.medsci.test.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/cohorts.medsci.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/confluence.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/confluence.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/confluence.it.su.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/confluence.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/converis.info-shibboleth.xml"/>
   <xi:include href="swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml"/>
-  <xi:include href="swamid-2.0/crowd01.ub.uu.se-plugins-servlet-ssocookie.xml"/>
   <xi:include href="swamid-2.0/crowd-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml"/>
+  <xi:include href="swamid-2.0/crowd01.ub.uu.se-plugins-servlet-ssocookie.xml"/>
   <xi:include href="swamid-2.0/cuttlefish.pdc.kth.se.xml"/>
-  <xi:include href="swamid-2.0/cwd02.ub.uu.se-plugins-servlet-ssocookie.xml"/>
   <xi:include href="swamid-2.0/cwd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml"/>
-  <xi:include href="swamid-2.0/daisy2.dsv.su.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/cwd02.ub.uu.se-plugins-servlet-ssocookie.xml"/>
   <xi:include href="swamid-2.0/daisy.dsv.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/daisy.ict.kth.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/daisy2.dsv.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/data.houseoffinance.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/datalab.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/dawn.bmc.lu.se-shibboleth.xml"/>
@@ -96,31 +96,31 @@
   <xi:include href="swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/dev.nais.uhr.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dev.valda.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/devpassport.lu.se-activateaccount-shibboleth.xml"/>
   <xi:include href="swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-2.0/dev.valda.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/digkonto-test.ita.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/diskus.ub.uu.se-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/disp-ci.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/disp-dev.su.se-Shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/disposer.c3se.chalmers.se.xml"/>
-  <xi:include href="swamid-2.0/disp.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/disp-test.su.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/disp.su.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/disposer.c3se.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/du-graylog.cnaas.sunet.se.xml"/>
-  <xi:include href="swamid-2.0/du.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/du-nav.cnaas.sunet.se.xml"/>
   <xi:include href="swamid-2.0/du-ni.cnaas.sunet.se.xml"/>
+  <xi:include href="swamid-2.0/du.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/e5.onthehub.com.xml"/>
-  <xi:include href="swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+  <xi:include href="swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/eduroamkonto.kau.se.xml"/>
-  <xi:include href="swamid-2.0/edusign.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/edusign-test.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/edusign-test.test.hb.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/edusign.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/eduvpn.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml"/>
   <xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
@@ -144,22 +144,22 @@
   <xi:include href="swamid-2.0/hb.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hhs-se.zoom.us.xml"/>
-  <xi:include href="swamid-2.0/his.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/his-se.zoom.us.xml"/>
+  <xi:include href="swamid-2.0/his.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hkrplay.hkr.se.xml"/>
-  <xi:include href="swamid-2.0/hrm.flexhosting.se-hrm-.xml"/>
   <xi:include href="swamid-2.0/hr.su.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/hrm.flexhosting.se-hrm-.xml"/>
   <xi:include href="swamid-2.0/humhub-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/hvplay.hv.se.xml"/>
+  <xi:include href="swamid-2.0/id-test.du.se-saml2.xml"/>
   <xi:include href="swamid-2.0/id.easyvote.se-saml2-lucat.xml"/>
+  <xi:include href="swamid-2.0/id.statenssc.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/idp-proxy-social-test.sunet.se-sp.xml"/>
+  <xi:include href="swamid-2.0/idp-proxy-social.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/idpproxy.dev.eduid.se-eduidsp.xml"/>
   <xi:include href="swamid-2.0/idpproxy.dev.eduid.se-sp.xml"/>
-  <xi:include href="swamid-2.0/idp-proxy-social.sunet.se-sp.xml"/>
-  <xi:include href="swamid-2.0/idp-proxy-social-test.sunet.se-sp.xml"/>
-  <xi:include href="swamid-2.0/ids.mau.se-.xml"/>
-  <xi:include href="swamid-2.0/id.statenssc.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/ids-test.mau.se-.xml"/>
-  <xi:include href="swamid-2.0/id-test.du.se-saml2.xml"/>
+  <xi:include href="swamid-2.0/ids.mau.se-.xml"/>
   <xi:include href="swamid-2.0/indico.test.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml"/>
   <xi:include href="swamid-2.0/int-admin.selma7.its.uu.se-Shibboleth.sso.xml"/>
@@ -171,23 +171,23 @@
   <xi:include href="swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml"/>
   <xi:include href="swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml"/>
   <xi:include href="swamid-2.0/jira-dev.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/jira.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira-next.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira-stage.its.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/jira.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jss.kau.se-8443-saml-metadata.xml"/>
-  <xi:include href="swamid-2.0/kaucat.sai.kau.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/kau-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/kau.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kau.instructure.com-saml2.xml"/>
+  <xi:include href="swamid-2.0/kaucat.sai.kau.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kauplay.kau.se.xml"/>
-  <xi:include href="swamid-2.0/kau-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/kb-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/keystone.cloud.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml"/>
-  <xi:include href="swamid-2.0/kib-shib.hosted.exlibrisgroup.com-shib.xml"/>
-  <xi:include href="swamid-2.0/kib-stage2.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ki.elements.symplectic.org.xml"/>
   <xi:include href="swamid-2.0/ki.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml"/>
+  <xi:include href="swamid-2.0/kib-shib.hosted.exlibrisgroup.com-shib.xml"/>
+  <xi:include href="swamid-2.0/kib-stage2.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/klara.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kmh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/konto.bth.se-sp.xml"/>
@@ -207,9 +207,9 @@
   <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml"/>
   <xi:include href="swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml"/>
+  <xi:include href="swamid-2.0/ladok3.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lis.ladok.se-shibboleth.xml"/>
@@ -255,8 +255,8 @@
   <xi:include href="swamid-2.0/mica.cohorts.medsci.test.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/mica.cohorts.medsci.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/mintentateknat.kvk.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/misp.cert.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/misp-saas-idp-proxy.sunet.se-sp.xml"/>
+  <xi:include href="swamid-2.0/misp.cert.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mittkau.sae.kau.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/miunid.miun.se-saml-miun-metadata.xml"/>
   <xi:include href="swamid-2.0/monitor.drive.sunet.se.xml"/>
@@ -264,12 +264,12 @@
   <xi:include href="swamid-2.0/monitor.social.sunet.se.xml"/>
   <xi:include href="swamid-2.0/monitor.swamid.se.xml"/>
   <xi:include href="swamid-2.0/monitor.test.swamid.se.xml"/>
+  <xi:include href="swamid-2.0/moodle.med.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/moodlealfa.omv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/moodle.med.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-2.0/myaccount.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/my.ilabsolutions.com.xml"/>
+  <xi:include href="swamid-2.0/myaccount.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/mystery.cs.lth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nagios.nordu.net-8087-sp.xml"/>
   <xi:include href="swamid-2.0/nagios.nordu.net-shibboleth.xml"/>
@@ -279,11 +279,11 @@
   <xi:include href="swamid-2.0/ni.nordu.net-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/ni.sunet.se-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/noec.release-check.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nyainloggning.hv.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nya-tools.its.umu.se-444-proxy-sp-metadata.xml.xml"/>
+  <xi:include href="swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/nyainloggning.hv.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/outscan.outpost24.com-opi-XMLAPI-ACTION-SHOWSPMETADATA.xml"/>
   <xi:include href="swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml"/>
@@ -306,8 +306,8 @@
   <xi:include href="swamid-2.0/play.ltu.se.xml"/>
   <xi:include href="swamid-2.0/play.mdh.se.xml"/>
   <xi:include href="swamid-2.0/play.miun.se.xml"/>
-  <xi:include href="swamid-2.0/play.shh.se.xml"/>
   <xi:include href="swamid-2.0/play.sh.se.xml"/>
+  <xi:include href="swamid-2.0/play.shh.se.xml"/>
   <xi:include href="swamid-2.0/play.sunet.se.xml"/>
   <xi:include href="swamid-2.0/play.umu.se.xml"/>
   <xi:include href="swamid-2.0/portalfhs.onricoh.se-shibboleth.xml"/>
@@ -335,23 +335,18 @@
   <xi:include href="swamid-2.0/release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/reset.hig.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rps.kau.se.xml"/>
-  <xi:include href="swamid-2.0/rt.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rt-test.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/rt.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sam.control.lth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sam.cs.lth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sandbox03-eu.alma.exlibrisgroup.com-mng-login.xml"/>
   <xi:include href="swamid-2.0/sandbox03-eu.primo.exlibrisgroup.com-mng-login.xml"/>
   <xi:include href="swamid-2.0/sd0312.sigma.dev-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sdauth.sciencedirect.com-.xml"/>
-  <xi:include href="swamid-2.0/search.ub.uu.se-mng-login.xml"/>
-  <xi:include href="swamid-2.0/secure.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se-hh-shibboleth.moveon4.de-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/selfservice.hb.se-Shibboleth.xml"/>
-  <xi:include href="swamid-2.0/service4mobility.su.se-mobility_test.xml"/>
-  <xi:include href="swamid-2.0/service.projectplace.com-saml-metadata.xml"/>
-  <xi:include href="swamid-2.0/sesam.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-chalmers-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-fhs-staff.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-fhs-stud.xml"/>
@@ -374,28 +369,33 @@
   <xi:include href="swamid-2.0/se.timeedit.net-su-student-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-umu-employee-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-umu-student-sp.xml"/>
-  <xi:include href="swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/search.ub.uu.se-mng-login.xml"/>
+  <xi:include href="swamid-2.0/secure.port.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/selfservice.hb.se-Shibboleth.xml"/>
+  <xi:include href="swamid-2.0/service.projectplace.com-saml-metadata.xml"/>
+  <xi:include href="swamid-2.0/service4mobility.su.se-mobility_test.xml"/>
+  <xi:include href="swamid-2.0/sesam.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sgw.africa-grid.org-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib1.oru.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibboleth.ebscohost.com.xml"/>
   <xi:include href="swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/shibboleth.turnitin.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibdev.rsc.org-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/shiny.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shiny-stage.kib.ki.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/shiny.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sig.idsec.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sig.idsec.se-sigservice-dev.xml"/>
   <xi:include href="swamid-2.0/solid-proxy.sunet.se-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/sp-01.oru.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/sp-utv.ldc.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.haikom.com-saml.xml"/>
   <xi:include href="swamid-2.0/sp.it.gu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml"/>
   <xi:include href="swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/sp.tshhosting.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sp-utv.ldc.lu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml"/>
+  <xi:include href="swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/sse.instructure.com-saml2.xml"/>
   <xi:include href="swamid-2.0/stage.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/staging.cloudmore.com-shibboleth.xml"/>
@@ -411,9 +411,9 @@
   <xi:include href="swamid-2.0/student.utbildning.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/su-graylog.cnaas.sunet.se.xml"/>
   <xi:include href="swamid-2.0/su-nav.cnaas.sunet.se.xml"/>
-  <xi:include href="swamid-2.0/sunet.instructure.com-saml2.xml"/>
-  <xi:include href="swamid-2.0/sunet-office-ni.cnaas.sunet.se.xml"/>
   <xi:include href="swamid-2.0/su-ni.cnaas.sunet.se.xml"/>
+  <xi:include href="swamid-2.0/sunet-office-ni.cnaas.sunet.se.xml"/>
+  <xi:include href="swamid-2.0/sunet.instructure.com-saml2.xml"/>
   <xi:include href="swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/supr.snic.se.xml"/>
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml"/>
@@ -422,29 +422,29 @@
   <xi:include href="swamid-2.0/tds.test.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/tentaadmintest.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tentaadmin.uhr.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/tentaadmintest.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-admin.selma7.its.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/test-du.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-edusign.ed-integrations.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/test.edusign.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml"/>
-  <xi:include href="swamid-2.0/test.gdb.vr.se.xml"/>
   <xi:include href="swamid-2.0/test-hb.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-hh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-isp.sae.kau.se-isptest.xml"/>
   <xi:include href="swamid-2.0/test-kau.hr.evry.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/test.ki.elements.symplectic.org-.xml"/>
   <xi:include href="swamid-2.0/test-ki.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-nais.i.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-oru.hr.evry.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/test.edusign.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/test.gdb.vr.se.xml"/>
+  <xi:include href="swamid-2.0/test.ki.elements.symplectic.org-.xml"/>
   <xi:include href="swamid-2.0/test.play.gu.se.xml"/>
-  <xi:include href="swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/test.valda.i.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test.valda.uhr.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/ths.instructure.com-saml2.xml"/>
   <xi:include href="swamid-2.0/tse-uu.sitevision.se.xml"/>
   <xi:include href="swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml"/>
@@ -455,21 +455,21 @@
   <xi:include href="swamid-2.0/uraccess.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/urn-auth0-safarijv-uppsala-university.xml"/>
   <xi:include href="swamid-2.0/utmanande.math.su.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/uu-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/uub.alma.exlibrisgroup.com-mng-login.xml"/>
   <xi:include href="swamid-2.0/uub.primo.exlibrisgroup.com-mng-login.xml"/>
-  <xi:include href="swamid-2.0/uu-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/valda.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/verify.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/vfu-dev2.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/vfu-dev3.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/vfu.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/vfusyd.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/vfusyd.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/vgrgu.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/video.su.se.xml"/>
   <xi:include href="swamid-2.0/visp-demo.humlab.umu.se.xml"/>
@@ -482,17 +482,11 @@
   <xi:include href="swamid-2.0/weblogon.ltu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weos406t.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/wg-onboard.lan.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/wiki2.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/wiki.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/wiki.pdc.kth.se.xml"/>
+  <xi:include href="swamid-2.0/wiki2.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/wikiu.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/wireguard.lan.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/www2.uu.se.xml"/>
-  <xi:include href="swamid-2.0/www3.genuinetext.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/www3.kau.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/www4.genuinetext.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/www4.kau.se-isp.xml"/>
-  <xi:include href="swamid-2.0/www7.kau.se-.xml"/>
   <xi:include href="swamid-2.0/www.alvin-portal.org-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/www.cambro.umu.se-shibboleth.xml"/>
@@ -512,6 +506,12 @@
   <xi:include href="swamid-2.0/www.universityadmissions.se-aws-sp-en.xml"/>
   <xi:include href="swamid-2.0/www.utbildning.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/www.wisum.its.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/www2.uu.se.xml"/>
+  <xi:include href="swamid-2.0/www3.genuinetext.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/www3.kau.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/www4.genuinetext.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/www4.kau.se-isp.xml"/>
+  <xi:include href="swamid-2.0/www7.kau.se-.xml"/>
   <xi:include href="swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml"/>
   <xi:include href="swamid-2.0/zeus.slu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index d8096534..8cd6f5e2 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -10,33 +10,33 @@
   <xi:include href="swamid-testing/fs.test.ad.liu.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-testing/fs.test.bth.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-testing/hbidp-test.test.hb.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-testing/idp02.gih.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-testing/idp2.it.gu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-testing/idp.dev.eduid.se-idp.xml.xml"/>
-  <xi:include href="swamid-testing/idpproxy.dev.eduid.se-idp.xml"/>
   <xi:include href="swamid-testing/idp-shibtest.slu.se-idp.xml"/>
-  <xi:include href="swamid-testing/idp.test.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-testing/idp-test.it.su.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-testing/idp-test.nordu.net-idp-shibboleth.xml"/>
   <xi:include href="swamid-testing/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-testing/idp.test.sunet.se-idp.xml"/>
   <xi:include href="swamid-testing/idp-test.suni.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-testing/idp.dev.eduid.se-idp.xml.xml"/>
+  <xi:include href="swamid-testing/idp.test.antagning.se-aws-idp.xml"/>
+  <xi:include href="swamid-testing/idp.test.sunet.se-idp.xml"/>
   <xi:include href="swamid-testing/idp.uhr.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-testing/idp02.gih.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-testing/idp2.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-testing/idpproxy.dev.eduid.se-idp.xml"/>
   <xi:include href="swamid-testing/login-dev.du.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-testing/login.tst.ki.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-testing/miunidptest.miun.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-testing/nya-00.its.umu.se-aws-idp.xml"/>
   <xi:include href="swamid-testing/openidp.feide.no.xml"/>
   <xi:include href="swamid-testing/referens-idp.skolfederation.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-testing/shibbo3test.ltu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-testing/shib-test01.skolfederation.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-testing/shib-test02.skolfederation.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-testing/shibbo3test.ltu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-testing/stslab.mah.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-testing/testidpv4.lu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-testing/weblogin-test-v4.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-testing/weblogin-test.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-testing/weblogin-test-v4.kau.se-idp-shibboleth.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 02aa86a4..94de3f97 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -4,8 +4,8 @@
   <xi:include href="swamid-testing/aqtest.port.se-shibboleth.xml"/>
   <xi:include href="swamid-testing/castest.weblogin.uu.se-cas.xml"/>
   <xi:include href="swamid-testing/devrb.lbic.lu.se.xml"/>
-  <xi:include href="swamid-testing/idp-proxy.test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-testing/id.test.easyvote.se-saml2.xml"/>
+  <xi:include href="swamid-testing/idp-proxy.test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-testing/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-testing/konto-test.test.hb.se-Shibboleth.xml"/>
   <xi:include href="swamid-testing/konto.test.uu.se-shibboleth.xml"/>
-- 
cgit v1.2.3