1 files changed, 30 insertions, 43 deletions
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 7dcbed43..6072f4e4 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -12,7 +12,7 @@
 <xi:include href="swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai.insel.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-login.hsr.ch-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml"/>
@@ -25,6 +25,7 @@
 <xi:include href="swamid-interfederations-2.0/aai-logon.hcmr.gr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-logon.psi.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml"/>
@@ -47,6 +48,7 @@
 <xi:include href="swamid-interfederations-2.0/access.wigan-leigh.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/acesso.ufabc.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aci-bookings.sisoshibboleth.co.uk-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/acm.jordanpublishing.co.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/activation.glew.org.uk.xml"/>
 <xi:include href="swamid-interfederations-2.0/adfs01.kempel.nl-adfs-services-trust.xml"/>
@@ -249,7 +251,6 @@
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml"/>
@@ -320,6 +321,7 @@
 <xi:include href="swamid-interfederations-2.0/cafe.ufcspa.edu.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/cafe.ufpa.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ufpel.edu.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml"/>
@@ -341,7 +343,6 @@
 <xi:include href="swamid-interfederations-2.0/cascade.accessiblelearning.com-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/cas.cgcent.miami.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/cas.conncoll.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/cassiopee.ac-nice.fr-idp-shibboleth.xml"/>
@@ -452,7 +453,6 @@
 <xi:include href="swamid-interfederations-2.0/digital-library.theiet.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/dl.acm.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/dldev.acm.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml"/>
@@ -500,15 +500,14 @@
 <xi:include href="swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/edulidp01.hants.gov.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/ed.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/eduroam.frizerska.si.xml"/>
 <xi:include href="swamid-interfederations-2.0/eduspot.crous-amiens.fr-authsaml2-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/eduspot-n.oca.eu-authsaml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml"/>
 <xi:include href="swamid-interfederations-2.0/edu.xtremeinformation.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/efoyer.glam.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/eka-idp.lanet.lv.xml"/>
@@ -558,7 +557,6 @@
 <xi:include href="swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/federacao.uvanet.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/federatedaccess.hrc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml"/>
@@ -574,7 +572,6 @@
 <xi:include href="swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml"/>
 <xi:include href="swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml"/>
 <xi:include href="swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml"/>
@@ -596,7 +593,6 @@
 <xi:include href="swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fed-interop-wg.ligo.org-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/fed.nusextra.co.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml"/>
@@ -610,11 +606,9 @@
 <xi:include href="swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fiuidp.fiu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fod.geant.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml"/>
 <xi:include href="swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/fsdev.iceruganda.org-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml"/>
@@ -693,6 +687,7 @@
 <xi:include href="swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml"/>
@@ -756,7 +751,6 @@
 <xi:include href="swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp3.cereq.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp3-test.is.ed.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml"/>
@@ -787,10 +781,6 @@
 <xi:include href="swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.aspete.gr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.aua.gr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml"/>
@@ -971,6 +961,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ehesp.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml"/>
@@ -1090,6 +1081,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.ifs.org.uk-openathens.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml"/>
@@ -1191,7 +1183,6 @@
 <xi:include href="swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.millersville.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml"/>
@@ -1250,6 +1241,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.parliament.uk-openaccess.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml"/>
@@ -1259,6 +1251,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.plumpton.ac.uk-openathens.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.port.ac.uk-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml"/>
@@ -1314,7 +1307,6 @@
 <xi:include href="swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml"/>
@@ -1334,7 +1326,6 @@
 <xi:include href="swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.slcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml"/>
@@ -1448,6 +1439,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.udc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.uel.ac.uk-shibboleth.xml"/>
@@ -1641,7 +1633,6 @@
 <xi:include href="swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/janus.cnrs.fr-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/jidp.jlab.org-idp-shibboleth.xml"/>
@@ -1650,7 +1641,6 @@
 <xi:include href="swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/judge.wcu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml"/>
@@ -1680,7 +1670,6 @@
 <xi:include href="swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/ldp.esc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/library-test.lancs.ac.uk-idp-shibboleth.xml"/>
@@ -1712,14 +1701,12 @@
 <xi:include href="swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.emerson.edu-idp.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.fhv.at-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.figshare.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.figsh.com-shibboleth.xml"/>
@@ -1731,6 +1718,7 @@
 <xi:include href="swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.justis.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml"/>
@@ -1859,7 +1847,6 @@
 <xi:include href="swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml"/>
 <xi:include href="swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml"/>
@@ -1875,8 +1862,6 @@
 <xi:include href="swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml"/>
@@ -1887,7 +1872,6 @@
 <xi:include href="swamid-interfederations-2.0/osms.maps-ict.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/ousu.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml"/>
@@ -1910,6 +1894,7 @@
 <xi:include href="swamid-interfederations-2.0/portal.edu-host.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/ppms.eu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml"/>
@@ -1997,6 +1982,7 @@
 <xi:include href="swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.lynda.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/saml.nelnet.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/saml.psui.geant.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml"/>
@@ -2055,9 +2041,7 @@
 <xi:include href="swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib4.rowan.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml"/>
@@ -2112,6 +2096,7 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml"/>
@@ -2121,7 +2106,6 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml"/>
@@ -2190,7 +2174,6 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml"/>
@@ -2208,7 +2191,6 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.riversidecollege.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml"/>
@@ -2318,7 +2300,6 @@
 <xi:include href="swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml"/>
@@ -2336,11 +2317,9 @@
 <xi:include href="swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.lexisnexis.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml"/>
@@ -2368,7 +2347,6 @@
 <xi:include href="swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib-sp.mediacore.tv.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml"/>
@@ -2526,6 +2504,7 @@
 <xi:include href="swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.artstor.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml"/>
@@ -2536,7 +2515,6 @@
 <xi:include href="swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.ecu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.educause.edu-sp.xml"/>
@@ -2606,6 +2584,7 @@
 <xi:include href="swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/sts.uidaho.edu-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml"/>
 <xi:include href="swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml"/>
@@ -2628,6 +2607,8 @@
 <xi:include href="swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/terena.org-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-auth.galegroup.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/testbed.tier.internet2.edu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml"/>
@@ -2644,9 +2625,10 @@
 <xi:include href="swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.j2e.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.rpharms.com-entity.xml"/>
@@ -2654,14 +2636,22 @@
 <xi:include href="swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-sp.ihs.com-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.ufit.onecampus.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/teton.accessiblelearning.com-sp.xml"/>
@@ -2752,7 +2742,6 @@
 <xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml"/>
@@ -2782,7 +2771,6 @@
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml"/>
@@ -2951,7 +2939,6 @@
 <xi:include href="swamid-interfederations-2.0/www.cartoons.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.childlink.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml"/>