metadata files renamed to <entityid>.xml

nya-08.ladok.umu.se duplicated, removed
idp.kau.se.xml duplicate, removed
luigi.umdc.umu.se-dw-idp.xml duplicate, removed
luigi.umdc.umu.se-shibboleth-idp.xml duplicate, removed
swamid-1.0/ladok3-*gui-sp* duplicates, removed
old e5.onthehub.com in swamid-testing-1.0.xml replaced by swamid-2.0 metadata
www.bmcmediatek.uu.se.xml duplicate of ws3.bmc.uu.se-shibboleth.xml, removed
bad entityid of www2.teol.uu.se.xml, removed
bad entityid of dev.teol.uu.se.xml (sp.example.org-shibboleth.xml), removed

1 files changed, 69 insertions, 69 deletions

diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 2d1b0806..ff4ca9a8 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -1,9 +1,9 @@
 <?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.xml"/>
-  <xi:include href="swamid-1.0/idp-test.nordu.net.xml"/>
-  <xi:include href="swamid-1.0/shib-idp-test.oru.se.xml"/>
-  <xi:include href="swamid-1.0/coip-test.sunet.se.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"/>
@@ -56,8 +56,8 @@
   <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.xml"/>
-  <xi:include href="swamid-1.0/login-dev.du.se.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"/>
@@ -68,78 +68,78 @@
   <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.xml"/>
-  <xi:include href="swamid-1.0/shibbo-test.ltu.se.xml"/>
-  <xi:include href="swamid-1.0/idptest.test.it.gu.se.xml"/>
-  <xi:include href="swamid-1.0/testshib.user.uu.se.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.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.xml"/>
-  <xi:include href="swamid-2.0/box-idp.sunet.se-idp.xml"/>
+  <xi:include href="swamid-1.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-externals-2.0/elegitimation2-test.inloggning.se.xml"/>
-  <xi:include href="swamid-1.0/referens-idp.skolfederation.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.xml"/>
-  <xi:include href="swamid-1.0/nya-01_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-02_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-03_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-04_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-05_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-06_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-07_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-08_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-09_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-10_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-11_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-12_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-13_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-14_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-15_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-16_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-17_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-18_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-19_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-20_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-21_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-22_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-23_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-24_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-25_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-26_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-27_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-28_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-29_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-30_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-31_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-32_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-34_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-35_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-36_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-37_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-38_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-39_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-40_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-41_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-42_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-43_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-44_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-45_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-46_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-47_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-48_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-49_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-50_idp-metadata.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/idp-test.nordu.net-ssp-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/idp2-test.slu.se.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/idp2.test.umu.se-saml2-idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/idp-fre-1.eduid.se.xml"/>
-  <xi:include href="swamid-2.0/uninett-box-idp.nordu.net-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-2.0/uninett-box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
 </EntitiesDescriptor>