sp:s copied from swamid-1.0.xml to swamid-sp-2.0.mxml, swamid-sp-1.0.xml removed from swamid-2.0.mxml

duplicate entry for swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml removed

2 files changed, 179 insertions, 2 deletions

diff --git a/swamid-2.0.mxml b/swamid-2.0.mxml
index 3d7fd633..c28ed836 100644
--- a/swamid-2.0.mxml
+++ b/swamid-2.0.mxml
@@ -27,5 +27,4 @@ If You do not accept these Terms, then You must not continue to use this Metadat
   <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-externals-sp-2.0.xml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-interfederations-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
-  <xi:include href="swamid-sp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
 </EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index e9eab4ff..ac39f807 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -78,7 +78,6 @@
    <xi:include href="swamid-2.0/kilwtest.it.ki.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/lpwtest.it.ki.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
-   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
    <xi:include href="swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
    <xi:include href="swamid-2.0/wiki.edugain.org-shibboleth.xml"/>
    <xi:include href="swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml"/>
@@ -88,4 +87,183 @@
    <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/scalear-saml.herokuapp.com.xml"/>
+   <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/shib-sp.kau.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/public.it.secure.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/shib1.oru.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/sp-nya.bth.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/akino.hh.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/accountcheckout.lnu.se.xml"/>
+   <xi:include href="swamid-1.0/umdac-stdout.umdc.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/account-test.unit.liu.se-shibboleth-sp.xml"/>
+   <xi:include href="swamid-1.0/registrera.hb.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/aktivering.db.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/nacho.adm.gu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml"/>
+   <xi:include href="swamid-1.0/webapp-utv.ita.mdh.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/portal.mdh.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/sp.it.gu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/umdac-strike.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="nya-1.0/www.antagning.se-ecs-sp.xml"/>
+   <xi:include href="nya-1.0/aktivera-test.su.se-shibboleth.sso.xml"/>
+   <xi:include href="nya-1.0/aktivera.su.se-shibboleth.sso.xml"/>
+   <xi:include href="nya-1.0/www.servicedesk.umdac.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/account.mdh.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/order.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/dedserv79.levonline.com-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/mondo.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/mondo-test.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/ensky.lhs.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/www.wisum.umdac.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/beta.augustus.se.xml"/>
+   <xi:include href="swamid-1.0/dspace.it.su.se.xml"/>
+   <xi:include href="swamid-1.0/lists.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/pp-komm-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/www.sub.su.se.xml"/>
+   <xi:include href="swamid-1.0/samsok.libris.kb.se-shibboleth.xml"/>
+   <xi:include href="swamid-externals-1.0/downloads.channel8.msdn.com.xml"/>
+   <xi:include href="swamid-1.0/mondo-web.it.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/cbs-vylvatest.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/labs.swami.se.xml"/>
+   <xi:include href="swamid-1.0/shibboleth.ebscohost.com.xml"/>
+   <xi:include href="swamid-1.0/www3.genuinetext.com-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/xfire.mimas.ac.uk-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/umdac-humpdac.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/sp.lhs.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/moodle.lhs.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml"/>
+   <xi:include href="swamid-1.0/www.cambro.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/cambro-utv1.umdc.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/kurser.math.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/kurser3.math.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/webwork.math.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/webwork2.math.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/etenta.math.su.se"/>
+   <xi:include href="swamid-1.0/connect.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/connect-test.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/converis.info-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/sp.wavelan.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/samadhi.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/tcs-test.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-1.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-1.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-1.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-1.0/bibliometrics.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/uu.test.diva-portal.org-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/www4.genuinetext.com-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/beta.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/su.avedas.com-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/www.diva-portal.org-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/pp-edu-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/minastudier-test.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/ladok-test.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/cambro-tst1.umdc.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/login.proxy.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/nordushare-dev.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/pp-migr-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/pp-test-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/mail.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/sp.tools.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/publications.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/pp-prod-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/brainstorm.swami.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/beta.lobber.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/www07test.sub.su.se.xml"/>
+   <xi:include href="swamid-1.0/sp.kau.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/fordrop.irt.kth.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/minastudier.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/ladok.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/bardo.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/mailfilter-test.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/unitcf.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/crowd.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/rt-test-app1.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/confluence.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/jira.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/confluence-test.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/mailfilter.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/jira-test.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/rt.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/ilearn.dsv.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/connect.uninett.no-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/nagios.dev.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/dev.lobber.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/ws3.bmc.uu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/sp-test.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/smd-dev.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/vlab-chemsub.explizit.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/monitor.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/coip-test.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/betafoo.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/crowdtest.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/sp-test.swamid.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/lingon.ladok.umu.se-8087-sp.xml"/>
+   <xi:include href="swamid-1.0/ni.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/jabber.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/epc.ub.uu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/its-pd0001.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/www.servicedesk.its.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/umdac-olho0001.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/www.wisum.its.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/lpw.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/nordunet.tv-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/mailfilter.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/www2.student.teol.uu.se.xml"/>
+   <xi:include href="swamid-1.0/www.student.teol.uu.se.xml"/>
+   <xi:include href="swamid-1.0/sutest.dsv.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/mds.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/meta.eduroam.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/meetingtools.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/play.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/smd.du.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/mds.lan.kth.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/mds-test.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/play.liu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/account.liu.se-shibboleth-sp.xml"/>
+   <xi:include href="swamid-1.0/nagios-vm.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/amiga.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/its-pd0030.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/nagios.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml"/>
+   <xi:include href="swamid-1.0/its-pd0062.ad.umu.se-shibboleth-sp.xml"/>
+   <xi:include href="swamid-1.0/captivelan-test.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/pingpong.chalmers.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/cambro-test-26.umdc.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/vfu-gemdev.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/alpha.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/www.play.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
+   <xi:include href="swamid-1.0/play.hig.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/maps.slu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/play.hb.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/betafoo.nordu.net-saml2-metadata.xml"/>
+   <xi:include href="swamid-1.0/vfu-test.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/vfu.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/captivelan.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-1.0/nidev-consumer.nordu.net-saml2-metadata.xml"/>
+   <xi:include href="swamid-1.0/mds2.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/cdn.nordunet.tv-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/gallus.scilifelab.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/play.mah.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/ni.nordu.net-saml2-metadata.xml"/>
+   <xi:include href="swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml"/>
+   <xi:include href="swamid-1.0/play.mdh.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/play.lu.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/connect-beta.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/connect-stable.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/testakt.it.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/testgag.it.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/download.portal.chalmers.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/portalservicesutv.miun.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/lpwdev.it.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/kilwdev.it.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/test-ki.pingpong.net-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/egiswamid.egi.kth.se-shibboleth.xml"/>
+   <xi:include href="swamid-1.0/hr.su.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>