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, 41 insertions, 41 deletions

diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 21265d19..e6509100 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -49,7 +49,7 @@
   <xi:include href="swamid-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/hubbletest.ladok.umu.se.xml"/>
+  <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml"/>
@@ -61,8 +61,8 @@
   <xi:include href="swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se.xml"/>
-  <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml"/>
   <xi:include href="swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml"/>
@@ -103,14 +103,14 @@
   <xi:include href="swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml"/>
   <xi:include href="swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/luigi.umdc.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/luigi.umdc.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/luigi.umdc.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/luigi.umdc.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/www.studera.testa.antagning.se.xml"/>
-  <xi:include href="nya-1.0/vhs-dev01.dyndns.org.xml"/>
-  <xi:include href="swamid-1.0/smultron.catalogix.se.xml"/>
-  <xi:include href="swamid-1.0/e5.onthehub.com.xml"/>
+  <xi:include href="swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/www.studera.nyautb.its.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml"/>
+  <xi:include href="nya-1.0/www.studera.testa.antagning.se-aws-sp.xml"/>
+  <xi:include href="nya-1.0/vhs-dev01.dyndns.org-shibboleth-sp.xml"/>
+  <xi:include href="swamid-1.0/smultron.catalogix.se-8090-sp.xml"/>
+  <xi:include href="swamid-2.0/e5.onthehub.com.xml"/>
   <xi:include href="swamid-1.0/nya-31.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/nya-31.ladok.umu.se-dw-idp.xml"/>
   <xi:include href="swamid-1.0/nya-31.ladok.umu.se-ecs-sp.xml"/>
@@ -131,7 +131,7 @@
   <xi:include href="swamid-1.0/nya-35.ladok.umu.se-dw-idp.xml"/>
   <xi:include href="swamid-1.0/nya-35.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-1.0/nya-35.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/vmfront.lan.kth.se.xml"/>
+  <xi:include href="swamid-1.0/vmfront.lan.kth.se-shibboleth.xml"/>
   <xi:include href="swamid-1.0/www.testb.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml"/>
   <xi:include href="swamid-1.0/expert.testb.antagning.se-ecs-sp.xml"/>
@@ -189,7 +189,7 @@
   <xi:include href="swamid-1.0/www.nyautb.its.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/www.testc.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/www.testd.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/www.testa.universityadmissions.se.xml"/>
+  <xi:include href="swamid-1.0/www.testa.universityadmissions.se-aws-sp-en.xml"/>
   <xi:include href="swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml"/>
   <xi:include href="swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml"/>
@@ -265,44 +265,44 @@
   <xi:include href="swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml"/>
   <xi:include href="swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/test-chalmers.pingpong.net.xml"/>
-  <xi:include href="swamid-1.0/minastudier.ladok.umu.se.xml"/>
-  <xi:include href="swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-1.0/test-chalmers.pingpong.net-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/minasidor.ladok.umu.se-shib-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-01.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-02.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-02.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-03.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-03.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-04.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-05.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-05.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-06.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-06.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-07.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-07.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-08.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-08.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-09.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-09.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-10.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-10.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/nidev-consumer.nordu.net.xml"/>
-  <xi:include href="swamid-1.0/ladok3test.its.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-1.0/nidev-consumer.nordu.net-saml2-metadata-.xml"/>
+  <xi:include href="swamid-2.0/ladok3test.its.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/at11_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/ecsidp.testc.ladok.umu.se_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/ecsidp.testd.ladok.umu.se_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/ft11_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/hubbletest_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/it11_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nb11_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nya-00_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/nyautb_idp-metadata.xml"/>
-  <xi:include href="swamid-1.0/wb11_idp-metadata.xml"/>
+  <xi:include href="swamid-1.0/at11.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-1.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-1.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-1.0/ft11.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-1.0/it11.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-1.0/nb11.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-1.0/nyautb.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-1.0/wb11.ladok.umu.se-ecs-idp.xml"/>
   <xi:include href="swamid-1.0/bhb-00.its.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/portalservicesutv.miun.se.xml"/>
-  <xi:include href="swamid-1.0/sp.swamid.se.xml"/>
+  <xi:include href="swamid-1.0/portalservicesutv.miun.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
 </EntitiesDescriptor>