swamid-1.0* removed

nya-1.0* removed
non-used metadata moved to swamid-2.0-obsolete
swamid-1.0/* moved to swamid-2.0/
nya-1.0/* moved to swamid-2.0/
mxml cleaned from swamid-1.0 data
Makefile cleaned from nya-1.0 and swamid-1.0 data

1 files changed, 139 insertions, 139 deletions

diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index a88d63fb..3d97e2d0 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -1,152 +1,152 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-testing-idp-1.0.xml">
-  <xi:include href="swamid-1.0/flax.nettst.chalmers.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shib-idp-test.oru.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/coip-test.sunet.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/openidp.feide.no.xml"/>
-  <xi:include href="swamid-1.0/ab11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/login-dev.du.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shibbo-test.ltu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/testshib.user.uu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/dwidp.testb.antagning.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/idp-test.kau.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/openidp.feide.no.xml"/>
+  <xi:include href="swamid-2.0/ab11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/ab11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/at11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/at11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/dwidp.testc.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/dwidp.testd.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/ft11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/ft11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/it11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/it11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nb11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nb11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/wb11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/wb11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/dwidp.testa.antagning.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/login-dev.du.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/shibbo-test.ltu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dwidp.testb.antagning.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/shibboleth.testb.antagning.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/idp-test.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-externals-2.0/elegitimation2-test.inloggning.se.xml"/>
-  <xi:include href="swamid-1.0/referens-idp.skolfederation.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/minastudier.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/ladok3test.its.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-33.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-21.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-22.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-23.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-24.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-25.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-26.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-27.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-28.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-29.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-30.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-31.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-32.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-34.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-35.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/bhb-00.its.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/minastudier.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/ladok3test.its.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/bhb-00.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-1.0/ecsidp.testa.antagning.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/ecsidp.testa.antagning.se-ecs-idp.xml"/>
   <xi:include href="swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/ecsidp.testb.antagning.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/ecsidp.testb.antagning.se-ecs-idp.xml"/>
   <xi:include href="swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-1.0/idp-fre-1.eduid.se-idp.xml"/>
-  <xi:include href="swamid-1.0/selfservice.test.hb.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/ladok3.its.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/idp-fre-1.eduid.se-idp.xml"/>
+  <xi:include href="swamid-2.0/selfservice.test.hb.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/ladok3.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/swamid2.shh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp3.hv.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp3.hv.se-idp-shibboleth.xml"/>
 </EntitiesDescriptor>