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

diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 8f7cce93..0e302f25 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
    <xi:include href="swamid-2.0/e5.onthehub.com.xml"/>
-   <xi:include href="swamid-2.0/shibboleth.turnitin.com.xml"/>
-   <xi:include href="swamid-2.0/gidp.geant.net-sp.xml"/>
-   <xi:include href="swamid-2.0/connect.funet.fi.xml"/>
-   <xi:include href="swamid-2.0/wp.nordu.net.xml"/>
+   <xi:include href="swamid-2.0/shibboleth.turnitin.com-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/gidp.geant.net-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-2.0/connect.funet.fi-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/wp.nordu.net-shibboleth.xml"/>
    <xi:include href="swamid-2.0/box.net.xml"/>
-   <xi:include href="swamid-2.0/box-idp.sunet.se.xml"/>
-   <xi:include href="swamid-2.0/mynetworkglobal.com.xml"/>
-   <xi:include href="swamid-2.0/secure.urkund.com.xml"/>
-   <xi:include href="swamid-2.0/shibdev.rsc.org.xml"/>
-   <xi:include href="swamid-2.0/www.ifmsa.se.xml"/>
-   <xi:include href="swamid-2.0/meetingtools-dev.app.nordu.net.xml"/>
-   <xi:include href="swamid-2.0/webinar.nordu.net.xml"/>
-   <xi:include href="swamid-2.0/akka-anv.uu.se.xml"/>
-   <xi:include href="swamid-2.0/akkatest.its.uu.se.xml"/>
-   <xi:include href="swamid-2.0/idp-test.nordu.net-sp.xml"/>
-   <xi:include href="swamid-2.0/artisan-idp.sunet.se.xml"/>
-   <xi:include href="swamid-2.0/hades.slu.se.xml"/>
-   <xi:include href="swamid-2.0/services.ibistic.net.xml"/>
-   <xi:include href="swamid-2.0/uraccess.se.xml"/>
+   <xi:include href="swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-2.0/mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml"/>
+   <xi:include href="swamid-2.0/urn-urkund-shibboleth-sp.xml"/>
+   <xi:include href="swamid-2.0/shibdev.rsc.org-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/www.ifmsa.se-sp.xml"/>
+   <xi:include href="swamid-2.0/meetingtools-dev.app.nordu.net-saml2-sp-metadata.xml"/>
+   <xi:include href="swamid-2.0/webinar.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/akka-anv.uu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/akkatest.its.uu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-2.0/hades.slu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/urn-ibistic-prod-services.ibistic.net.xml"/>
+   <xi:include href="swamid-2.0/uraccess.se-shibboleth-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-2.0/ladok3-02.ladok.umu.se-gui-sp.xml"/>
@@ -39,38 +39,38 @@
    <xi:include href="swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml"/>
    <xi:include href="swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml"/>
    <xi:include href="swamid-2.0/ladok3test.its.umu.se-gui-sp.xml"/>
-   <xi:include href="swamid-2.0/ci.nordu.net.xml"/>
-   <xi:include href="swamid-2.0/www.akademiskahogtider.se.xml"/>
-   <xi:include href="swamid-2.0/testshib.msacademicverify.com.xml"/>
+   <xi:include href="swamid-2.0/ci.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/www.akademiskahogtider.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml"/>
    <xi:include href="swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/www.mit.ladok.se-gui-sp.xml"/>
    <xi:include href="swamid-2.0/rems.csc.fi.xml"/>
-   <xi:include href="swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml"/>
-   <xi:include href="swamid-2.0/ugit.se.xml"/>
+   <xi:include href="swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/ugit.se-sp.xml"/>
    <xi:include href="swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml"/>
    <xi:include href="swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml"/>
-   <xi:include href="swamid-2.0/sgw.africa-grid.org.xml"/>
-   <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-coc-sp.xml"/>
-   <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-nren-sp.xml"/>
-   <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-re-sp.xml"/>
-   <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-re_eu-sp.xml"/>
-   <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-re_hei-sp.xml"/>
-   <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-re_nren-sp.xml"/>
-   <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-re_sfs_hei-sp.xml"/>
-   <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-sfs-sp.xml"/>
-   <xi:include href="swamid-2.0/xenosmilus.umdc.umu.se-8086-sp.xml"/>
-   <xi:include href="swamid-2.0/uninett-box-idp.nordu.net.xml"/>
+   <xi:include href="swamid-2.0/sgw.africa-grid.org-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-coc-sp.xml"/>
+   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-nren-sp.xml"/>
+   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml"/>
+   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml"/>
+   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml"/>
+   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml"/>
+   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml"/>
+   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-sfs-sp.xml"/>
+   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-sp.xml"/>
+   <xi:include href="swamid-2.0/uninett-box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
    <xi:include href="swamid-2.0/aktivera.ki.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/portalservices.miun.se-shibboleth.xml"/>
-   <xi:include href="swamid-2.0/hashog.umdc.umu.se-8087-HTH.xml"/>
-   <xi:include href="swamid-2.0/problem.math.su.se-shilsbboleth.xml"/>
+   <xi:include href="swamid-2.0/hashog.umdc.umu.se-8087-hth.xml"/>
+   <xi:include href="swamid-2.0/problem.math.su.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/kilw.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/expert.antagning.se.xml"/>
+   <xi:include href="swamid-1.0/expert.antagning.se-ecs-sp.xml"/>
    <xi:include href="swamid-1.0/www.antagning.se-aws-sp.xml"/>
    <xi:include href="swamid-1.0/www.universityadmissions.se-aws-sp-en.xml"/>
    <xi:include href="swamid-1.0/expert.testa.antagning.se-ecs-sp.xml"/>
    <xi:include href="swamid-1.0/www.testa.antagning.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/expert.testb.antagning.se-ecs-sp.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"/>