summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-interfederations-1.0/.xml2
-rw-r--r--swamid-interfederations-2.0.mxml184
-rw-r--r--swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml153
-rw-r--r--swamid-interfederations-2.0/adudeviis.ncl.ac.uk-shibboleth-metadata.xml95
-rw-r--r--swamid-interfederations-2.0/adudeviis75.ncl.ac.uk-shibboleth-metadata.xml65
-rw-r--r--swamid-interfederations-2.0/adudevlinux.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/apps.ncl.ac.uk-shibboleth-metadata.xml66
-rw-r--r--swamid-interfederations-2.0/assets.cs.ncl.ac.uk-shibboleth-metadata.xml84
-rw-r--r--swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml34
-rw-r--r--swamid-interfederations-2.0/avsdadmin.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/aws.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/biro.ncl.ac.uk-shibboleth-metadata.xml81
-rw-r--r--swamid-interfederations-2.0/blackboard.ncl.ac.uk-shibboleth-metadata.xml65
-rw-r--r--swamid-interfederations-2.0/blackboardtest.ncl.ac.uk-shibboleth-metadata.xml65
-rw-r--r--swamid-interfederations-2.0/bloghost-dev.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/blogs.ncl.ac.uk-shibboleth-metadata.xml92
-rw-r--r--swamid-interfederations-2.0/bos2-demo.ilrt.bris.ac.uk-entity.xml74
-rw-r--r--swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml70
-rw-r--r--swamid-interfederations-2.0/cat-ams.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml51
-rw-r--r--swamid-interfederations-2.0/cf-bsd.ncl.ac.uk-shibboleth-metadata.xml65
-rw-r--r--swamid-interfederations-2.0/cms.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/community.ja.net-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/community.staging.company.ja.net-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/crypt.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml (renamed from swamid-interfederations-2.0/ecls1.ncl.ac.uk-shibboleth-metadata.xml)84
-rw-r--r--swamid-interfederations-2.0/dash2.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/dds.ncl.ac.uk-shibboleth-metadata.xml92
-rw-r--r--swamid-interfederations-2.0/directory.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/dropbox.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/dropoff-dev.ncl.ac.uk-shibboleth-metadata.xml74
-rw-r--r--swamid-interfederations-2.0/dropoff.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/drupal.dev.ja.net-shibboleth.xml93
-rw-r--r--swamid-interfederations-2.0/eka-idp.lanet.lv.xml2
-rw-r--r--swamid-interfederations-2.0/elmo.ncl.ac.uk-shibboleth-metadata.xml73
-rw-r--r--swamid-interfederations-2.0/esc-serv.ncl.ac.uk-shibboleth-metadata.xml82
-rw-r--r--swamid-interfederations-2.0/ezproxy-2.rgu.ac.uk-shibboleth.xml67
-rw-r--r--swamid-interfederations-2.0/fedtools.cf.ac.uk-shibboleth-sp.xml92
-rw-r--r--swamid-interfederations-2.0/fedtools.cf.ac.uk-simplesamlphp-sp.xml97
-rw-r--r--swamid-interfederations-2.0/fieldtrial.webfiltering.ja.net-shibboleth-sp.xml92
-rw-r--r--swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml1
-rw-r--r--swamid-interfederations-2.0/foreman.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/forms-dev.ncl.ac.uk-shibboleth-metadata.xml74
-rw-r--r--swamid-interfederations-2.0/forms.ncl.ac.uk-shibboleth-metadata.xml93
-rw-r--r--swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml1
-rw-r--r--swamid-interfederations-2.0/groups-dev.ncl.ac.uk-shibboleth-metadata.xml74
-rw-r--r--swamid-interfederations-2.0/groups.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml1
-rw-r--r--swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml1
-rw-r--r--swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml1
-rw-r--r--swamid-interfederations-2.0/halists.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/heinonline.org-entity.xml26
-rw-r--r--swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml3
-rw-r--r--swamid-interfederations-2.0/idp.approval.glowscotland.org.uk-idp-shibboleth.xml127
-rw-r--r--swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml71
-rw-r--r--swamid-interfederations-2.0/idp.learningfutures.org.uk-idp-shibboleth.xml118
-rw-r--r--swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml54
-rw-r--r--swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml181
-rw-r--r--swamid-interfederations-2.0/idp.sbc.ac.uk-idp-shibboleth.xml110
-rw-r--r--swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml12
-rw-r--r--swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml61
-rw-r--r--swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml6
-rw-r--r--swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml68
-rw-r--r--swamid-interfederations-2.0/internal.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/ir-ckan.ncl.ac.uk-shibboleth-metadata.xml85
-rw-r--r--swamid-interfederations-2.0/isis.ncl.ac.uk-shibboleth-metadata.xml73
-rw-r--r--swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml133
-rw-r--r--swamid-interfederations-2.0/itsmweb-dev.ncl.ac.uk-shibboleth-metadata.xml90
-rw-r--r--swamid-interfederations-2.0/itsmweb-test.ncl.ac.uk-shibboleth-metadata.xml90
-rw-r--r--swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml (renamed from swamid-interfederations-2.0/rcnpublishing.com-shibboleth.xml)25
-rw-r--r--swamid-interfederations-2.0/lectopia.ncl.ac.uk-shibboleth-metadata.xml90
-rw-r--r--swamid-interfederations-2.0/lesson.cs.ncl.ac.uk-shibboleth-metadata.xml75
-rw-r--r--swamid-interfederations-2.0/libbookings.ncl.ac.uk-shibboleth-metadata.xml92
-rw-r--r--swamid-interfederations-2.0/libproxy.ncl.ac.uk-shibboleth-metadata.xml60
-rw-r--r--swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml1
-rw-r--r--swamid-interfederations-2.0/lists.ncl.ac.uk-shibboleth-metadata.xml90
-rw-r--r--swamid-interfederations-2.0/m.ncl.ac.uk-shibboleth-metadata.xml73
-rw-r--r--swamid-interfederations-2.0/manchester.hosted.exlibrisgroup.com-shib.xml69
-rw-r--r--swamid-interfederations-2.0/mathsupport.mas.ncl.ac.uk-shibboleth-metadata.xml73
-rw-r--r--swamid-interfederations-2.0/media.heanet.ie-shibboleth.xml79
-rw-r--r--swamid-interfederations-2.0/metadata.lst1
-rw-r--r--swamid-interfederations-2.0/midev.ncl.ac.uk-shibboleth-metadata.xml66
-rw-r--r--swamid-interfederations-2.0/mistage.ncl.ac.uk-shibboleth-metadata.xml66
-rw-r--r--swamid-interfederations-2.0/mobdev.ncl.ac.uk-shibboleth-metadata.xml74
-rw-r--r--swamid-interfederations-2.0/mobhost2.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/moodleshare-hw.ac.uk-shibboleth.xml63
-rw-r--r--swamid-interfederations-2.0/my-dev.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/my.ncl.ac.uk-shibboleth-metadata.xml90
-rw-r--r--swamid-interfederations-2.0/myimpact.ncl.ac.uk-shibboleth-metadata.xml66
-rw-r--r--swamid-interfederations-2.0/myprocfuat.ncl.ac.uk-shibboleth-metadata.xml67
-rw-r--r--swamid-interfederations-2.0/myprodev.ncl.ac.uk-shibboleth-metadata.xml67
-rw-r--r--swamid-interfederations-2.0/myprouat.ncl.ac.uk-shibboleth-metadata.xml65
-rw-r--r--swamid-interfederations-2.0/nbtr.ncl.ac.uk-shibboleth-metadata.xml73
-rw-r--r--swamid-interfederations-2.0/ness-dev.ncl.ac.uk-shibboleth-metadata.xml81
-rw-r--r--swamid-interfederations-2.0/ness-qa.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/ness.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/nicrctr.ncl.ac.uk-shibboleth-metadata.xml73
-rw-r--r--swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml52
-rw-r--r--swamid-interfederations-2.0/numbas-editor.mas.ncl.ac.uk-shibboleth-metadata.xml96
-rw-r--r--swamid-interfederations-2.0/oalar.bexhillcollege.ac.uk-oala-metadata.xml85
-rw-r--r--swamid-interfederations-2.0/oauth.ncl.ac.uk-shibboleth-metadata.xml88
-rw-r--r--swamid-interfederations-2.0/olaf.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/opal.ncl.ac.uk-shibboleth-metadata.xml90
-rw-r--r--swamid-interfederations-2.0/ossdrtp.bsp.ox.ac.uk-shibboleth.xml114
-rw-r--r--swamid-interfederations-2.0/ossdrtpreg.bsp.ox.ac.uk-shibboleth.xml114
-rw-r--r--swamid-interfederations-2.0/ossdrts.bsp.ox.ac.uk-shibboleth.xml114
-rw-r--r--swamid-interfederations-2.0/ossdrtsreg.bsp.ox.ac.uk-shibboleth.xml114
-rw-r--r--swamid-interfederations-2.0/pds-login.ncl.ac.uk-shibboleth-metadata.xml68
-rw-r--r--swamid-interfederations-2.0/pencil.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/ppub.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/pre-register-ci.nii.ac.jp-shibboleth-sp.xml91
-rw-r--r--swamid-interfederations-2.0/printing.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/pss-teamweb.ncl.ac.uk-shibboleth-metadata.xml74
-rw-r--r--swamid-interfederations-2.0/rattler-new.ncl.ac.uk-shibboleth-metadata.xml65
-rw-r--r--swamid-interfederations-2.0/rattler.ncl.ac.uk-shibboleth-metadata.xml53
-rw-r--r--swamid-interfederations-2.0/recap-dev.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/requester-login.ncl.ac.uk-shibboleth-metadata.xml69
-rw-r--r--swamid-interfederations-2.0/research.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/rlo.ncl.ac.uk-shibboleth-metadata.xml92
-rw-r--r--swamid-interfederations-2.0/rt.idp.stanmore.ac.uk-oala-metadata.xml92
-rw-r--r--swamid-interfederations-2.0/rummage-dev.ncl.ac.uk-shibboleth-metadata.xml68
-rw-r--r--swamid-interfederations-2.0/safety.ncl.ac.uk-shibboleth-metadata.xml73
-rw-r--r--swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml146
-rw-r--r--swamid-interfederations-2.0/scitationnew.aip.org-shibboleth.xml55
-rw-r--r--swamid-interfederations-2.0/shib-test.cup.cam.ac.uk-shibboleth-sp.xml97
-rw-r--r--swamid-interfederations-2.0/shib.fusiondev.co.uk-sp-shibboleth.xml94
-rw-r--r--swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/signage.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-idp-simplesamlphp.xml103
-rw-r--r--swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-simplesamlphp-sp.xml97
-rw-r--r--swamid-interfederations-2.0/smartam-login.ncl.ac.uk-shibboleth-metadata.xml60
-rw-r--r--swamid-interfederations-2.0/solo2.bodleian.ox.ac.uk-shib.xml96
-rw-r--r--swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml70
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-jiscelcat.xml83
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-neocar.xml65
-rw-r--r--swamid-interfederations-2.0/sp.moodle-pp.ucl.ac.uk-shibboleth.xml102
-rw-r--r--swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml (renamed from swamid-interfederations-2.0/nuservice.ncl.ac.uk-shibboleth-metadata.xml)83
-rw-r--r--swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml1
-rw-r--r--swamid-interfederations-2.0/sso.u-psud.fr-idp.xml59
-rw-r--r--swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml (renamed from swamid-interfederations-2.0/di.ncl.ac.uk-shibboleth-metadata.xml)86
-rw-r--r--swamid-interfederations-2.0/teaching.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/test.rpharms.com-entity.xml91
-rw-r--r--swamid-interfederations-2.0/timetables.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/timetableservices.ncl.ac.uk-shibboleth-metadata.xml94
-rw-r--r--swamid-interfederations-2.0/tizer.tannerritchie.com-shibboleth-sp.xml94
-rw-r--r--swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml155
-rw-r--r--swamid-interfederations-2.0/unixcf-dashboard.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/unixcf3.ncl.ac.uk-shibboleth-metadata.xml81
-rw-r--r--swamid-interfederations-2.0/unixmon.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/unixwiki.ncl.ac.uk-shibboleth-metadata.xml92
-rw-r--r--swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml33
-rw-r--r--swamid-interfederations-2.0/urn-ibistic-prod-services.ibistic.net.xml33
-rw-r--r--swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml52
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml94
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml155
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml64
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml174
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml55
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml144
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml85
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml94
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml95
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml97
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml169
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml155
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml58
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml90
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml102
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml94
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml92
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml89
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml89
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml84
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml55
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml54
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml151
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml92
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml83
-rw-r--r--swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml13
-rw-r--r--swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml23
-rw-r--r--swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml108
-rw-r--r--swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml97
-rw-r--r--swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml161
-rw-r--r--swamid-interfederations-2.0/vre3.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/waesidp.overtsoftware.com-idp-shibboleth.xml103
-rw-r--r--swamid-interfederations-2.0/wiki.cam.ac.uk-shibboleth.xml69
-rw-r--r--swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml1
-rw-r--r--swamid-interfederations-2.0/wiki.mas.ncl.ac.uk-shibboleth-metadata.xml96
-rw-r--r--swamid-interfederations-2.0/www.canvas-lts.co.uk-shibboleth.xml106
-rw-r--r--swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml (renamed from swamid-interfederations-2.0/resviz.ncl.ac.uk-shibboleth-metadata.xml)93
-rw-r--r--swamid-interfederations-2.0/www.cpcc.group.cam.ac.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml45
-rw-r--r--swamid-interfederations-2.0/www.mas.ncl.ac.uk-shibboleth-metadata.xml95
-rw-r--r--swamid-interfederations-2.0/www.myprojects.ncl.ac.uk-shibboleth-metadata.xml66
-rw-r--r--swamid-interfederations-2.0/www.ncl.ac.uk-shibboleth-metadata.xml66
-rw-r--r--swamid-interfederations-2.0/www.nedtc.ac.uk-shibboleth-metadata.xml66
-rw-r--r--swamid-interfederations-2.0/www.netskills.ac.uk-federation-entity-metadata.xml90
-rw-r--r--swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml62
-rw-r--r--swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml31
-rw-r--r--swamid-interfederations-2.0/www.secure-project.org-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/www.societies.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/www.staff.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/www.students.ncl.ac.uk-shibboleth-metadata.xml83
-rw-r--r--swamid-interfederations-2.0/www.translationalmicro.medschl.cam.ac.uk-shibboleth.xml70
206 files changed, 681 insertions, 15348 deletions
diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index c1e73660..740f12c7 100644
--- a/swamid-interfederations-1.0/.xml
+++ b/swamid-interfederations-1.0/.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2015-03-09T14:17:02Z" cacheDuration="PT345600S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2015-03-14T09:17:01Z" cacheDuration="PT345600S">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
<ds:KeyInfo>
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 8ed0c893..5d7294f1 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -6,7 +6,6 @@
<xi:include href="swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml"/>
<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-integration.dfn.de-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.ph-gr.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml"/>
@@ -47,9 +46,6 @@
<xi:include href="swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/adudeviis75.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/adudeviis.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/adudevlinux.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/afbi-shib.ads.qub.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml"/>
@@ -74,7 +70,6 @@
<xi:include href="swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/appraisal.qmul.ac.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/apps.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/app.staging.goodpractice.net.xml"/>
<xi:include href="swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml"/>
@@ -85,7 +80,6 @@
<xi:include href="swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/arts.idm.oclc.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/assets.cs.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/astonsu-voting.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/athens.bruford.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/athens.gcc.ac.uk-oala-metadata.xml"/>
@@ -122,8 +116,6 @@
<xi:include href="swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/avbmth.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/avsdadmin.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/aws.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml"/>
@@ -151,15 +143,10 @@
<xi:include href="swamid-interfederations-2.0/bham-primo-stg.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/biro.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/blackboard.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/blackboardtest.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/bloghost-dev.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/blogs.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bmcidp.brooksbymelton.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bm.stars.manchester.ac.uk-shibboleth.xml"/>
@@ -174,7 +161,6 @@
<xi:include href="swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/booksandjournals.brillonline.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bos2-demo.ilrt.bris.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/brad.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/bristol-shib.hosted.exlibrisgroup.com-shib.xml"/>
@@ -228,12 +214,10 @@
<xi:include href="swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml"/>
-<xi:include href="swamid-interfederations-2.0/cat-ams.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/cavle.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/census.mimas.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cern.ch-login.xml"/>
-<xi:include href="swamid-interfederations-2.0/cf-bsd.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/chronicle.bufvc.ac.uk-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml"/>
@@ -242,7 +226,6 @@
<xi:include href="swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/cloudstandards.cesnet.cz-sp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cms.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml"/>
<xi:include href="swamid-interfederations-2.0/community.ja.net-shibboleth.xml"/>
@@ -261,18 +244,16 @@
<xi:include href="swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/coventry.ac.uk-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/crypt.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/csbmth.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/ct0.cirqahosting.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cts-dev.ngs.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/cts.ngs.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/c.yz.yamagata-u.ac.jp-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/darlfam.darlington.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dash2.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/data.deic.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/dds.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/decbmth.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dep.s2dv.co.uk-shibboleth.xml"/>
@@ -298,8 +279,6 @@
<xi:include href="swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml"/>
<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/di.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/directory.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml"/>
@@ -322,10 +301,6 @@
<xi:include href="swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/dropbox.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/dropoff-dev.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/dropoff.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/drupal.dev.ja.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dspace.jorum.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/duck-dev.bournemouth.ac.uk-oala-metadata.xml"/>
@@ -335,7 +310,6 @@
<xi:include href="swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ec1.educationcity.com-sso-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ecls1.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/edi.izum.si-idp-20100722.xml"/>
@@ -360,7 +334,6 @@
<xi:include href="swamid-interfederations-2.0/elibrary.worldbank.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/elixir.mf.uni-lj.si-20140918.xml"/>
-<xi:include href="swamid-interfederations-2.0/elmo.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/e-localcourses.unibo.it.xml"/>
<xi:include href="swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml"/>
@@ -374,7 +347,6 @@
<xi:include href="swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/equinoxjournals.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/esc-serv.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/esds80.mcc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/esdsdev01.ds.man.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/esdswp01.ds.man.ac.uk-shibboleth.xml"/>
@@ -385,7 +357,6 @@
<xi:include href="swamid-interfederations-2.0/eu.alma.exlibrisgroup.com-mng-login.xml"/>
<xi:include href="swamid-interfederations-2.0/events.ucl.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ezproxy-2.rgu.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/ezproxy.rgu.ac.uk-shibboleth.xml"/>
@@ -418,11 +389,8 @@
<xi:include href="swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fedtools.cf.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/fedtools.cf.ac.uk-simplesamlphp-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/fid.mnhn.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/fieldtrial.webfiltering.ja.net-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/filesender.funet.fi.xml"/>
@@ -432,10 +400,7 @@
<xi:include href="swamid-interfederations-2.0/fire.rettorato.unito.it-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/foreman.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/forms-dev.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/forms.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
@@ -466,8 +431,6 @@
<xi:include href="swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml"/>
-<xi:include href="swamid-interfederations-2.0/groups-dev.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/groups.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/gteavirtual.org.xml"/>
<xi:include href="swamid-interfederations-2.0/guardian.otl.lstest.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml"/>
@@ -476,7 +439,6 @@
<xi:include href="swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/haka.saimia.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml"/>
-<xi:include href="swamid-interfederations-2.0/halists.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/harper-adams.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml"/>
@@ -569,7 +531,6 @@
<xi:include href="swamid-interfederations-2.0/idp.amersham.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.approval.glowscotland.org.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml"/>
@@ -702,7 +663,6 @@
<xi:include href="swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml"/>
@@ -735,6 +695,7 @@
<xi:include href="swamid-interfederations-2.0/idp.godalming.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml"/>
@@ -815,7 +776,6 @@
<xi:include href="swamid-interfederations-2.0/idp.lapinamk.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.le.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.learningfutures.org.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml"/>
@@ -850,7 +810,6 @@
<xi:include href="swamid-interfederations-2.0/idp.midchesh.ac.uk-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.mmu.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.moulton.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml"/>
@@ -897,7 +856,6 @@
<xi:include href="swamid-interfederations-2.0/idp.racc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml"/>
@@ -911,7 +869,6 @@
<xi:include href="swamid-interfederations-2.0/idp.rvc.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sandwell.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sanger.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sbc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sccb.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml"/>
@@ -1004,7 +961,6 @@
<xi:include href="swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml"/>
@@ -1131,7 +1087,6 @@
<xi:include href="swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/internal.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml"/>
@@ -1140,15 +1095,12 @@
<xi:include href="swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/ir-ckan.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/isis.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/isls-shibsp1.wmin.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/itsmweb-dev.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/itsmweb-test.ncl.ac.uk-shibboleth-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.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"/>
@@ -1164,6 +1116,7 @@
<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/katalog.svkos.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/kbplus.k-int.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/kclidp.kcl.ac.uk-idp-shibboleth.xml"/>
@@ -1183,17 +1136,12 @@
<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/lectopia.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/lesson.cs.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/libbookings.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/libproxy.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/liepu-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/lists.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/lists.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/lma-idp.lanet.lv.xml"/>
@@ -1237,18 +1185,15 @@
<xi:include href="swamid-interfederations-2.0/lu-idp.lu.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/manchester.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/mathsupport.mas.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml"/>
<xi:include href="swamid-interfederations-2.0/mccall.henley-cov.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/meals.oriel.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/media.heanet.ie-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/member.goodpractice.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml"/>
@@ -1257,56 +1202,35 @@
<xi:include href="swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/metalib01vapp2.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/midev.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/mistage.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/m.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/mobdev.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/mobhost2.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/moodle.fsp.uni-lj.si-sp-201411192359.xml"/>
<xi:include href="swamid-interfederations-2.0/moodle.helsinki.fi-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/moodleshare-hw.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/my-dev.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/myimpact.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/my.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/myprocfuat.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/myprodev.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/myprouat.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/nbtr.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ness-dev.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/ness.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/ness-qa.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml"/>
<xi:include href="swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/nicrctr.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/numbas-editor.mas.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/nuservice.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oalar.bexhillcollege.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.xml"/>
@@ -1315,9 +1239,7 @@
<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/oauth.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/olaf.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml"/>
<xi:include href="swamid-interfederations-2.0/o-las.net-simplesaml.xml"/>
<xi:include href="swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml"/>
@@ -1327,7 +1249,6 @@
<xi:include href="swamid-interfederations-2.0/online.wadham.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml"/>
-<xi:include href="swamid-interfederations-2.0/opal.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml"/>
@@ -1341,10 +1262,6 @@
<xi:include href="swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/osms.maps-ict.com.xml"/>
<xi:include href="swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ossdrtp.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ossdrtpreg.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ossdrts.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ossdrtsreg.bsp.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml"/>
@@ -1363,8 +1280,6 @@
<xi:include href="swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pds-login.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/pencil.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml"/>
@@ -1377,18 +1292,14 @@
<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-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ppub.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pre-register-ci.nii.ac.jp-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/primo.abdn.ac.uk-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/printing.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pss-teamweb.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/pubs.aeaweb.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/pubs.ama-assn.org-shibboleth.xml"/>
@@ -1406,15 +1317,11 @@
<xi:include href="swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml"/>
<xi:include href="swamid-interfederations-2.0/ra-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rattler.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/rattler-new.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/rcnpublishing.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/recap-dev.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml"/>
@@ -1425,31 +1332,23 @@
<xi:include href="swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/repository.abertay.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/requester-login.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/research.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/resviz.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/rja-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/rlo.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/royalsocietypublishing.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml"/>
<xi:include href="swamid-interfederations-2.0/rs.eqa.ggtest.com-AthensWeb-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/rt.idp.stanmore.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rummage-dev.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/rutcathens.rutc.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/sa1.nimr.mrc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/safe.epcc.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/safety.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/saml-delegation.data.kit.edu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml"/>
<xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml"/>
@@ -1469,7 +1368,6 @@
<xi:include href="swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/scitationnew.aip.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/scsh.scran.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml"/>
<xi:include href="swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml"/>
@@ -1665,7 +1563,6 @@
<xi:include href="swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.dur.ac.uk:444-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.fusiondev.co.uk-sp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.hope.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.hopwood.ac.uk-idp-shibboleth.xml"/>
@@ -1713,7 +1610,6 @@
<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/shibtest.copac.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-test.cup.cam.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibtest.idp.mimas.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml"/>
@@ -1734,20 +1630,15 @@
<xi:include href="swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sid.kent.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/signage.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-idp-simplesamlphp.xml"/>
-<xi:include href="swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-simplesamlphp-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/skmms-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/smartam-login.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/soasunion.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/software.msdnaa.dk-.xml"/>
-<xi:include href="swamid-interfederations-2.0/solo2.bodleian.ox.ac.uk-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/solo-dev.bodleian.ox.ac.uk-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml"/>
@@ -1770,7 +1661,6 @@
<xi:include href="swamid-interfederations-2.0/sp.cliowebhost.co.uk-Patron-Stirling-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.eblib.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml"/>
@@ -1778,11 +1668,9 @@
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-depot.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digischools.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-jiscelcat.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-kbplus.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-neocar.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.xml"/>
@@ -1795,7 +1683,6 @@
<xi:include href="swamid-interfederations-2.0/sp.lat.csc.fi.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.lux17.mpi.nl.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.moodledo.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.moodle-pp.ucl.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.owncloud.gla.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.primaryblogger.co.uk-shibboleth.xml"/>
@@ -1818,6 +1705,7 @@
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-production-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-staging-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-spie-development-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-spie-production-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-spie-qa-shibboleth.xml"/>
@@ -1867,7 +1755,6 @@
<xi:include href="swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.sunderland.ac.uk-auth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.u-psud.fr-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml"/>
@@ -1885,6 +1772,7 @@
<xi:include href="swamid-interfederations-2.0/staging-secure.palgrave-journals.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/st-andrews.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/store.lu.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml"/>
@@ -1909,7 +1797,6 @@
<xi:include href="swamid-interfederations-2.0/tc-web-02.groupgti.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/tc-web-03.groupgti.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/teaching.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.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"/>
@@ -1932,6 +1819,7 @@
<xi:include href="swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.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"/>
<xi:include href="swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml"/>
<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"/>
@@ -1951,9 +1839,6 @@
<xi:include href="swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/timetableservices.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/timetables.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/tizer.tannerritchie.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml"/>
@@ -1966,7 +1851,6 @@
<xi:include href="swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml"/>
<xi:include href="swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/uat-nsuk.elsevieremea.com-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml"/>
@@ -1994,48 +1878,11 @@
<xi:include href="swamid-interfederations-2.0/ulster.unidesk.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/umbrella.psi.ch-.xml"/>
<xi:include href="swamid-interfederations-2.0/unigepass.unige.it-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/unixcf3.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/unixcf-dashboard.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/unixmon.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/unixwiki.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-ibistic-prod-services.ibistic.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml"/>
-<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-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.hpc.lap.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml"/>
<xi:include href="swamid-interfederations-2.0/urn.nbi.ku.dk-saml-sp-wayf.xml"/>
<xi:include href="swamid-interfederations-2.0/usertest.sciquest.com.xml"/>
<xi:include href="swamid-interfederations-2.0/utwente.nl-.xml"/>
@@ -2056,12 +1903,10 @@
<xi:include href="swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vre3.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/vwww.itslearning.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/waesidp.overtsoftware.com-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml"/>
@@ -2080,11 +1925,9 @@
<xi:include href="swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.mas.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml"/>
@@ -2117,7 +1960,6 @@
<xi:include href="swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.callforparticipants.com-institutional-login-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/www.cans.org.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.canvas-lts.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.cardiffmetsu.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-shibboleth.xml"/>
@@ -2127,10 +1969,10 @@
<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.climatescience.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.cnn.group.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.communistpartyarchive.org.uk-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.cpcc.group.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.creativeclub.co.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www-cvdc.eng.cam.ac.uk-shibboleth.xml"/>
@@ -2211,7 +2053,6 @@
<xi:include href="swamid-interfederations-2.0/www.luu.org.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.maneyonline.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.mas.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.mecenat.eu-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml"/>
@@ -2220,12 +2061,8 @@
<xi:include href="swamid-interfederations-2.0/www.mmunion.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.myinterfase.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.myprojects.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.nedtc.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.nejm.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.netskills.ac.uk-federation-entity-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.numeriquepremium.com-shibboleth.xml"/>
@@ -2268,18 +2105,14 @@
<xi:include href="swamid-interfederations-2.0/www.scl.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sdeo.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.secure-project.org-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.service4mobility.com-europe.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.societies.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sss.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.staff.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.students.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml"/>
@@ -2298,7 +2131,6 @@
<xi:include href="swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.translationalmicro.medschl.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www-trg.eng.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www-trn.portal.ted.is.ed.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.twigonglow.com-shibboleth-sp.xml"/>
diff --git a/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
deleted file mode 100644
index f211dc89..00000000
--- a/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-integration.dfn.de/idp/shibboleth">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T13:52:03Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
- <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="de">DFN AAI Integration + Test IdP</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">DFN AAI Integration + Test IdP</mdui:DisplayName>
- <mdui:Description xml:lang="de">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
- <mdui:Description xml:lang="en">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
- <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
- <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SLO"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-integration.dfn.de/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de/idp/profile/SAML2/SOAP/ECP"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="de">e15</OrganizationName>
- <OrganizationName xml:lang="en">e15</OrganizationName>
- <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</OrganizationDisplayName>
- <OrganizationURL xml:lang="de">http://www.dfn.de</OrganizationURL>
- <OrganizationURL xml:lang="en">http://www.dfn.de/en/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <GivenName>Wolfgang</GivenName>
- <SurName>Pempe</SurName>
- <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>DFN-AAI</GivenName>
- <SurName>Hotline</SurName>
- <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adudeviis.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/adudeviis.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index f4e40dec..00000000
--- a/swamid-interfederations-2.0/adudeviis.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adudeviis.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an "Application Development Unit" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-05T14:56:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAKMClWjhlxC1MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmFkdWRldmlpcy5jYW1wdXMubmNsLmFjLnVrMB4XDTA5MTAwMTEzMDk0MloX
- DTE5MDkyOTEzMDk0MlowJTEjMCEGA1UEAxMaYWR1ZGV2aWlzLmNhbXB1cy5uY2wu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFMox8o0/cLe6f
- ZdGJKJk/Z4BVRGzfQUZvlGK2gkEAYdycrDKigCyfjSoekGKXaUyvY9h5sytpvbjj
- XKK0FwAz8dfdsEiHDawkMsfR3QlW7INKfi83Gm2WcbsI/KgvcX7eQaZdjG+4/XeA
- yKc5/hAuXIRG6UTNlt84lsvSF1R4kSuhR4TqH+3YfCgFuQCat+pJCsOIjeTRfxWK
- Elb7eBv3+xh+c2L73UW9X7y+YUffxlaZrQ3yr9uuyqe1b5SLkLI4dcPVRNLXzdxs
- ic0JzZw3uj6NUdbaH2V7XN1syk5diEv5GbQuuhQAb3Bqbv8nijkxDVkmWVy5O0oI
- vixKzWm5AgMBAAGjSDBGMCUGA1UdEQQeMByCGmFkdWRldmlpcy5jYW1wdXMubmNs
- LmFjLnVrMB0GA1UdDgQWBBQfGmjCLJ5SsU/JH4ePkKyHdBvonDANBgkqhkiG9w0B
- AQUFAAOCAQEAZMuwd4EFIokbnzjdtGKSWRzPLZfgFf+Y7e1Yc99nE8hFFZ3mYygz
- 1Qa0i0r1P1vd6e5Ej7MVJd6VyBHeyE+vTW9gp9vl83HVV8EllO3oHLbPL93Rt+qo
- lX1THe/o4BDdBlK89P7Nq6pF6w0EWsudoUubiy1IzcdzTCID+c16XAPS7p8jjBjN
- btDDlNaGRgY1YnAZoEfljcVLidP58ngHB/IIMh+9I2UNacAtbQhOJShDEVBsUoIZ
- kQ7wE7CjiiUoIKkQkl9A9Osera+q1MgBZXcuKpqHwTWvY/i63YXKWitFnbt/xE9V
- ymx3hjaZAkB7BHwv2kxw0+9/+ONln9xu/Q==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAKMClWjhlxC1MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmFkdWRldmlpcy5jYW1wdXMubmNsLmFjLnVrMB4XDTA5MTAwMTEzMDk0MloX
- DTE5MDkyOTEzMDk0MlowJTEjMCEGA1UEAxMaYWR1ZGV2aWlzLmNhbXB1cy5uY2wu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFMox8o0/cLe6f
- ZdGJKJk/Z4BVRGzfQUZvlGK2gkEAYdycrDKigCyfjSoekGKXaUyvY9h5sytpvbjj
- XKK0FwAz8dfdsEiHDawkMsfR3QlW7INKfi83Gm2WcbsI/KgvcX7eQaZdjG+4/XeA
- yKc5/hAuXIRG6UTNlt84lsvSF1R4kSuhR4TqH+3YfCgFuQCat+pJCsOIjeTRfxWK
- Elb7eBv3+xh+c2L73UW9X7y+YUffxlaZrQ3yr9uuyqe1b5SLkLI4dcPVRNLXzdxs
- ic0JzZw3uj6NUdbaH2V7XN1syk5diEv5GbQuuhQAb3Bqbv8nijkxDVkmWVy5O0oI
- vixKzWm5AgMBAAGjSDBGMCUGA1UdEQQeMByCGmFkdWRldmlpcy5jYW1wdXMubmNs
- LmFjLnVrMB0GA1UdDgQWBBQfGmjCLJ5SsU/JH4ePkKyHdBvonDANBgkqhkiG9w0B
- AQUFAAOCAQEAZMuwd4EFIokbnzjdtGKSWRzPLZfgFf+Y7e1Yc99nE8hFFZ3mYygz
- 1Qa0i0r1P1vd6e5Ej7MVJd6VyBHeyE+vTW9gp9vl83HVV8EllO3oHLbPL93Rt+qo
- lX1THe/o4BDdBlK89P7Nq6pF6w0EWsudoUubiy1IzcdzTCID+c16XAPS7p8jjBjN
- btDDlNaGRgY1YnAZoEfljcVLidP58ngHB/IIMh+9I2UNacAtbQhOJShDEVBsUoIZ
- kQ7wE7CjiiUoIKkQkl9A9Osera+q1MgBZXcuKpqHwTWvY/i63YXKWitFnbt/xE9V
- ymx3hjaZAkB7BHwv2kxw0+9/+ONln9xu/Q==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adudeviis.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Application Development Unit Shib 2 SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adudeviis75.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/adudeviis75.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 8fdb5ea9..00000000
--- a/swamid-interfederations-2.0/adudeviis75.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adudeviis75.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth "Dev IIS 7.5 Server" SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-04T15:52:55Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGzCCAgOgAwIBAgIJAIBtWFIibWHtMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
- BAMTHGFkdWRldmlpczc1LmNhbXB1cy5uY2wuYWMudWswHhcNMTEwODA4MTQxNDQx
- WhcNMjEwODA1MTQxNDQxWjAnMSUwIwYDVQQDExxhZHVkZXZpaXM3NS5jYW1wdXMu
- bmNsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwo7ViZel
- N5hMeVpWSIi/Y+LGs7IsRKUTYGrgQPKge5shCHXEaEnO2xULfkv02fAnUUVjgSnH
- j0rqbxZaXk15klWT2rnBIKzZ/K23yTZZa2jnD5zWQBQk4Ic/UlDPi9R4rPqrjM3Y
- qAVolS/iP8zxCjDuTfp4uxuwoLYu4g6DHV5bVD7hZcl7sbS73z3qcJAg8orqADTu
- jRrLzst9lngAjCCW7V4L9vbyWdPkJvgnJZ1nr5oZM/yIt/P3+sBfql3RNXnRiN6Y
- SBvqu2NWglkbd6vwpiCqDn1Ta8A0gWzoswZs0ktd7HMtRmqgIkytul0R6eXEKkrI
- Dl+x+LRMoMfm1wIDAQABo0owSDAnBgNVHREEIDAeghxhZHVkZXZpaXM3NS5jYW1w
- dXMubmNsLmFjLnVrMB0GA1UdDgQWBBSKlwMIim+dC+jlAmD3DDM7cja8rzANBgkq
- hkiG9w0BAQUFAAOCAQEAFUgqMmXdg2VMzEphBGG8Scb+l5LTNf07zIDquEJsXSth
- ZbghOC5Sx9nBneKWBTUWkWBLdkdBc4B962qaSkKkxJy/QyyNPzTnJdg4bEf2uzue
- FxVJme4atDq8KMVrfippo1S4mCXdMFLogEqHyyen1OBBjtKH7DXAm9zHd9yiU7PH
- GIzIrvFR98T3rOoTgGDE+bn+zHZDBMRLGLPiS/Q0AyoN+EoNYVhEqEPIFxNoDrDx
- Ayhwjri7spY4DPdgt8RuntpqyYpct0ADNo8E8mXigPIxboCkyD9SpN9QqmR2SUns
- G5oYq3D4daqsaYKj3KbEsw+sr6rfobahKST0hQfEgg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adudeviis75.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Dev IIS 7.5 Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adudevlinux.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/adudevlinux.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index b8ec6c91..00000000
--- a/swamid-interfederations-2.0/adudevlinux.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adudevlinux.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC6DCCAdCgAwIBAgIJANMzFnAWl3iBMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
- BAMTC2FkdWRldmxpbnV4MB4XDTEwMTEyNjA5MDk1MloXDTIwMTEyMzA5MDk1Mlow
- FjEUMBIGA1UEAxMLYWR1ZGV2bGludXgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
- ggEKAoIBAQDMYDU5JkAalErXZ213nJ/SGYlsB5614YNS5jZECzmG4+gcaQTDaFXW
- PEBBC4uGrDQO1clM8rSpAXAHgEnflOYvBMQJSzyM594iim8VwFAJjLJyDI1huxcr
- n02KAcui2wRZShRPblkMTL9gAaB29iFWI8b+JqhB20OHFpaIpz2/TG9iTSJac1aT
- WjZlKsAzcFe021NMwp01VeLCeKZ0pe1tU2asxBZbgjTW+BEsJZDqO6YIYImQbewW
- X+LUvwJjsCUyZW1DHRlheVy/8t7LM4HTATUiQNEQMHBKXR24+9kOxkBknBP2hQq3
- QNmwc3/IMMT5OBiM9EeP7UFyWFkjVPdnAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2Fk
- dWRldmxpbnV4MB0GA1UdDgQWBBQnMWXpsyxGYclNzFdav7ew5YEa+DANBgkqhkiG
- 9w0BAQUFAAOCAQEAdduXUptpEWgakCfEUtuiIZEQ+tBx9vqY9uDOgUyQF3//Kaa2
- WVQNd/EwyWzlqVJT8l+aToRtP7Fi1AdTkRZGuV6+iGhJQYg/Um83CDnNzgQTa7V1
- vY9siqrnJ+Tz46Qp7GmkGI2uhY8GeuqluJ7hdJiHOHPuzsqhGPBX7EO0ERpBiVyz
- Tf6kfJHUqq7ssPEpL/nBrdiQmFgjuF6eSAmE/KLqptS7D7/qOhgHmqMHDmWWW8el
- bKf/RoXJmRBlv8KdWKuaLO8M6mfH7p5L6WUY+NENRum3urIwV9/Nm1FQFPZZuU7G
- pIcMNMa4QwuyFoy3ocYf9l78l3abbwRJHuNKzg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC6DCCAdCgAwIBAgIJANMzFnAWl3iBMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
- BAMTC2FkdWRldmxpbnV4MB4XDTEwMTEyNjA5MDk1MloXDTIwMTEyMzA5MDk1Mlow
- FjEUMBIGA1UEAxMLYWR1ZGV2bGludXgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
- ggEKAoIBAQDMYDU5JkAalErXZ213nJ/SGYlsB5614YNS5jZECzmG4+gcaQTDaFXW
- PEBBC4uGrDQO1clM8rSpAXAHgEnflOYvBMQJSzyM594iim8VwFAJjLJyDI1huxcr
- n02KAcui2wRZShRPblkMTL9gAaB29iFWI8b+JqhB20OHFpaIpz2/TG9iTSJac1aT
- WjZlKsAzcFe021NMwp01VeLCeKZ0pe1tU2asxBZbgjTW+BEsJZDqO6YIYImQbewW
- X+LUvwJjsCUyZW1DHRlheVy/8t7LM4HTATUiQNEQMHBKXR24+9kOxkBknBP2hQq3
- QNmwc3/IMMT5OBiM9EeP7UFyWFkjVPdnAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2Fk
- dWRldmxpbnV4MB0GA1UdDgQWBBQnMWXpsyxGYclNzFdav7ew5YEa+DANBgkqhkiG
- 9w0BAQUFAAOCAQEAdduXUptpEWgakCfEUtuiIZEQ+tBx9vqY9uDOgUyQF3//Kaa2
- WVQNd/EwyWzlqVJT8l+aToRtP7Fi1AdTkRZGuV6+iGhJQYg/Um83CDnNzgQTa7V1
- vY9siqrnJ+Tz46Qp7GmkGI2uhY8GeuqluJ7hdJiHOHPuzsqhGPBX7EO0ERpBiVyz
- Tf6kfJHUqq7ssPEpL/nBrdiQmFgjuF6eSAmE/KLqptS7D7/qOhgHmqMHDmWWW8el
- bKf/RoXJmRBlv8KdWKuaLO8M6mfH7p5L6WUY+NENRum3urIwV9/Nm1FQFPZZuU7G
- pIcMNMa4QwuyFoy3ocYf9l78l3abbwRJHuNKzg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adudevlinux.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: ADU Linux Development server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/apps.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/apps.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index c3909523..00000000
--- a/swamid-interfederations-2.0/apps.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://apps.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an IIS Application Server Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-03T15:59:23Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://apps.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://apps.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAP2gLdgHSWHTMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmRhbnRvb2luZS5jYW1wdXMubmNsLmFjLnVrMB4XDTEwMTIxMDE1MjMxMloX
- DTIwMTIwNzE1MjMxMlowJTEjMCEGA1UEAxMaZGFudG9vaW5lLmNhbXB1cy5uY2wu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC96j7lMubJp+aX
- DqwLGDzxcrm2bxvKU3WjWK91L5rD0P0HYle7yr2VcuXsChz7jyFrMNZ+tCUhfvlA
- gRuhiKjXC9PRDf18NRx43UhPlRnwrvjN5OFhOH1Mvq4QFkpnTtqPHQ5RM7T3+U0l
- /lacgZtzhmXiCbY9KLOF0Qc5iLjD+ISwErSd6N1ovhIyNsZ4/44Cquz0fcFyV1PN
- BIzj1toMubMqStVY98OnKCVIDccOsKeZW7RPevLP4T5uglP88hgiFhN5auJDWy2B
- fm/AA9pjD/u9BsAggdVfrAE0WvatR+a6cpxngNTFjht9UUoxBlUq844RFZBqXf/v
- xLmipJUlAgMBAAGjSDBGMCUGA1UdEQQeMByCGmRhbnRvb2luZS5jYW1wdXMubmNs
- LmFjLnVrMB0GA1UdDgQWBBTHyeqX+oU3dzZx3e1+nYbV7evjejANBgkqhkiG9w0B
- AQUFAAOCAQEAIzxIXH09GMjE+nIpbGIACTI9ERepMQMzNnO+M8JugkhEhrLWXWvu
- XoswtdvxBH3rKMKZp1tJIk7T1toLDn3vCvn60S/6AjzQbyYzQ+qfDBij7X7kBU71
- jlfFn8dFGGcYNdPkl2EjrtWQ/pOTJiJAqal0rPQTcqmrFmi3UeDw+gtncRDIBEGx
- JvjufLt4NSdyg7ZHLLjLv2ntSGPk4ZFLjw0ihpigI6LLzhNv3zxuH/x/y1pIyolC
- MQHLbJL5+WUpb/syt6lRETX5WxKuJHTirlgkjz1edzAPDZ8SIKD3O/TcnKXB/rpF
- HitJuYtcRIR/YxPrydq4GCsFy99FLz336A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apps.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://apps.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://apps.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://apps.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://apps.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: IIS Application Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/assets.cs.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/assets.cs.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 809b0bef..00000000
--- a/swamid-interfederations-2.0/assets.cs.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://assets.cs.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Computing Science Assets" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-30T14:30:22Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDADCCAeigAwIBAgIJAIw1Az6evlhqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
- BAMTE2NzLWFzc2V0cy5uY2wuYWMudWswHhcNMTQwNTMwMTQxMTUyWhcNMjQwNTI3
- MTQxMTUyWjAeMRwwGgYDVQQDExNjcy1hc3NldHMubmNsLmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8eQ6w18c2O4CWkZiirUBUqbrqpUj6VDC
- L/sbXsxfaHaVUaQCVmLF9HCmPmF9zaJQv69DeqMfZG9BrFQxxzZeKNWZZWFYmlMg
- 6vmbRFfP9x+j71k3kP6bAV4RdnqNVUvRKGtgsb6pEwSDH4qyGzoUuqlvDgOCqEL0
- SoCDJ5T2lz/YnZ0JYVYPWTxXJ+orIXj+7gJLw621CbDFLc/x1QF/gCxkj+BDRHYD
- C5WuHXXJHxrXvz2uFxRiGFV6+tpjaY4218PUAFM2BCHCris23Htlps1m4S9ttIzT
- cEiE2HiHP/YUcJlCgRPRGx9Z3m7+muyT9BWJ1B5QM2cQ3hH0ljXPvwIDAQABo0Ew
- PzAeBgNVHREEFzAVghNjcy1hc3NldHMubmNsLmFjLnVrMB0GA1UdDgQWBBTqN0BY
- BGSccv6MbPZDnyb8YVE5dzANBgkqhkiG9w0BAQUFAAOCAQEAGKTrDpLQStF2UbOq
- XhcGOb6hNIrm6rsJlQpmT0hQmpLWpNiCoWhQJPmEap+saHlmuGZ7yqi9i8e/9zCx
- lhD8YA9C6Mo1uRbTGjjztFo8AV+GYLTGwmzT40Td1AoxPFw4LzS3Qzg5tm4wPLJC
- K1JoM5pgJpidzzkcdG7NxOOjnowlByF1qOXlHmext26CH15DAvPt4pqwQbMf2AFF
- BtFhRs8hRb8QDjryU2wHiJ9w3b0EGhMwvAftvZ3UyHq4/nW58NEGc61DNNDRGpvA
- HwefMAjLzauauEKkc2i/rb7XaN0Hhku9MYj9pBR5RBPLhu96Z2BMAMIVe5yO+RFf
- Y328mw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://assets.cs.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Computing Science Assets SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/computing/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Jon</GivenName>
- <SurName>Dowland</SurName>
- <EmailAddress>mailto:jon.dowland@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Jon</GivenName>
- <SurName>Dowland</SurName>
- <EmailAddress>mailto:jon.dowland@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml
index d0b4c80e..a0e5dc4f 100644
--- a/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml
+++ b/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml
@@ -33,22 +33,24 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- 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
+ 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
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/avsdadmin.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/avsdadmin.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index fb5e1bc5..00000000
--- a/swamid-interfederations-2.0/avsdadmin.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://avsdadmin.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2.1.1 AVS Application SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://avsdadmin.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: AVS Application</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aws.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/aws.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 8f83fc9f..00000000
--- a/swamid-interfederations-2.0/aws.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aws.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "AWS" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-27T11:20:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aws.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC9zCCAd+gAwIBAgIJAJ0CYOgcJ/cEMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEGlwLTE3Mi0zMS0yNC0yMzEwHhcNMTQwNTIxMTUzMjUyWhcNMjQwNTE4MTUz
- MjUyWjAbMRkwFwYDVQQDExBpcC0xNzItMzEtMjQtMjMxMIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAunyJ12iuSRvGhuunrtxMXAP2v/SiIYRSpn+myDdQ
- o0MJdYDIcYRbzDppv6TezyHnp37EWH/O/L+tRsexK86ucOawgKR+Fxm7whnlji3z
- Nm6NKaAp80lbL7r0GZ7lVlacfkFBcmf5mVSJWfV+sCsXNDtfboXB5Vn5/izMYRNo
- KrmFEUYTOMTz4988ri/dpKk9o47gn8sVO3m37zv4zzNCt1vy9E2NHiCfIsi8rv3h
- PsvAIvBmwrKTN1n9R0MdS9pGn5+/lfadrfzZDkBgvYtBIPYIzHnmDnkNp8dQIlj7
- s7votNmn3as6OLfj2J2zeu9oqytA3eLiLED4MAqaUdb5FQIDAQABoz4wPDAbBgNV
- HREEFDASghBpcC0xNzItMzEtMjQtMjMxMB0GA1UdDgQWBBThO3VVHx3ZmGk5gD6Y
- euZ8UeF4rjANBgkqhkiG9w0BAQUFAAOCAQEAf2Clt5qgULyQ+xFrusj9FMsiuiHu
- CS2BkQ+WrruybEA4YOUQaicavTdCG3sZut/qPA6j/rrIQ4Yg4JK5ErX0TW4KPi2i
- m1LCklQniwBxqGIWg5EfGM3HsjMOVm4J2kfAAao2v4m9O1nqRjZClnHADmW2Cp43
- 5vwErjn3z+3BFiX3V6VHHM8I3zMjqVbNh9wU7z57SyTEvdcvDq7wAIeniWYi2vBJ
- zPf3JhvXrsAQ07e/+8bqam9jL3Ofxu595R7VVzSRfT1qfuCMCrDdIoAjregeUCZX
- LcWiG7InpdZlbjBVs/1Zx58H/arPHmHBq+eANg3Y5DOx0+tzMxFtBiKWEA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aws.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aws.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aws.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aws.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aws.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aws.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aws.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aws.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aws.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aws.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aws.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University AWS SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Caleb</GivenName>
- <SurName>Racey</SurName>
- <EmailAddress>mailto:caleb.racey@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Caleb</GivenName>
- <SurName>Racey</SurName>
- <EmailAddress>mailto:caleb.racey@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/biro.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/biro.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index a83f8762..00000000
--- a/swamid-interfederations-2.0/biro.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://biro.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "PHP Development Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-01T15:35:48Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://biro.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0zCCAbugAwIBAgIJAL7vgmq1gwsvMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
- BAMTBGJpcm8wHhcNMTMwNzI5MDkzOTE5WhcNMjMwNzI3MDkzOTE5WjAPMQ0wCwYD
- VQQDEwRiaXJvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAni9B0e+H
- o4/GNpd8D2KcRPqabo3bhV04gAi5uNT458DfO9GLTutZ9MP5dv+hepY9kWArW5p0
- fPYdk6kkEgz1oAMzl8wOojAc+PSI2UDSVAolpTRq3/JmvxUfEfjMVnKTUQ2Yrl1J
- Q5XOSHAu+5YlXR+2FrPLtDjQTRe10VtbAvIpueJlIeGMSCNaV8ZCMzLAogJIm2ow
- pyo4S0LhI5yIi9v/Zi4CukoRD4N5DA6TkvTEffV62OmFfxhZbS96UlQyyW1jrAmo
- p/BbOGN78D8/5JKMzBJeiN6eoy/4AqkSsKDpXXLC7kwdtzp6y+seSYRaJ2VyoP8H
- bp1b9ovr1Jvf3QIDAQABozIwMDAPBgNVHREECDAGggRiaXJvMB0GA1UdDgQWBBT+
- U+fYWN6cjRy1lwdhGy51TD9cPDANBgkqhkiG9w0BAQUFAAOCAQEAJTABvSAiWkPi
- f8YX9BFhv8ftIIriqrd+zw1dlgLc68EFDGDoZTKWooDusN4ii1OPYi3AFJJWK1w2
- UGJRdQGwXGhCwloxbMsRRj7ORidTfXrEQvWyET/RgCtPAu0a3huSWyylMHXJqGdM
- yxvHeC/Uo2fiZ4FNA4OK0PjBNYT5qKZugDNSINADCXNZpwH9oceAP/Dg63q2hRkm
- aFO6uZxs9IZrtrd6kgrpe/WzdVxbpJhHdecoZcUDqx26tdeMa7VUZFz7DBQvTeA3
- wHo96uT2EFpJUGvv+p11rIBrIDZZQAdOXbHoFtND+bSJNPrpydg3zuTCR+p7gtCh
- JgjDTx/K1w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://biro.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://biro.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://biro.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://biro.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://biro.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://biro.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://biro.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://biro.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://biro.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://biro.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://biro.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University PHP Development Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/blackboard.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/blackboard.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index de692e9f..00000000
--- a/swamid-interfederations-2.0/blackboard.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blackboard.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth Blackboard Server SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-11T12:46:29Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bb2vmfront5.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGzCCAgOgAwIBAgIJAIozEQOAWfM7MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
- BAMTHGJiMnZtZnJvbnQ1LmNhbXB1cy5uY2wuYWMudWswHhcNMTIwNjExMTE0MjEx
- WhcNMjIwNjA5MTE0MjExWjAnMSUwIwYDVQQDExxiYjJ2bWZyb250NS5jYW1wdXMu
- bmNsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvnVTVeme
- WIw/1Utf4VmzJLhhCJdkrdmvX3eq0aTwQA/xaCSoPn31mcxZ7Gy54R49E/06QB3m
- hBxopmh9wD2iySZzzQZLM52y/HPCyyhxCEBoUr+5A5kVehcBC1W4WPMivlpYx66e
- CfEVgq7dZC3Xa7rQu0hbVHJlt7jV23c0aCwezn6lhgTZ4MdO1132jLgCJVyEnhFO
- Y1/NLjb7X5QirHjFdP9OnP0aw8lrK0Qh9U7YJ/GXmjnHkeXi7A0tdHbA4tFUwp5h
- czBJi0eKGMlHDLRC9IthTxIS3zK6unbvS1c/CU98L6tOSra35s0mMZpjif234kkH
- fYfXC+PdjpW/QwIDAQABo0owSDAnBgNVHREEIDAeghxiYjJ2bWZyb250NS5jYW1w
- dXMubmNsLmFjLnVrMB0GA1UdDgQWBBQdeKBQn84MxriXHLcLU/di44I5LjANBgkq
- hkiG9w0BAQUFAAOCAQEANx3AGIv5lSnIasDzxvVdJOZKASjKkh17XXxnpiTQhk9g
- RAh6wSl1I+xuOaY7T/Fqg3U6I313XPK+0wco1nAPfvUL/MWQ8ML5qK4fLHAPBoJ2
- MJmdK2cod3DNKr0rG87CBCPBHBRltrCIxhurgNOlDN8lRubxkrl+gp16UvpVu1+q
- Gd/7aZICxZmncPtBdlYLbKNWWD+/cFjXaudgVTJx1hovjsGh+br5snx3DIw0bc3a
- FLnJhPPeejdH/UaS2EbrJJMYRPM0V3y8+EuEmkem0kZtDqbupODxFZJWQKV+2cT8
- YiEqQyVWXN6u3iDxmoe7tlE5tYtp4/imd8OTNSvhKQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blackboard.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blackboard.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blackboard.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blackboard.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blackboard.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blackboard.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blackboard.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blackboard.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blackboard.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blackboard.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blackboard.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Blackboard Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/blackboardtest.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/blackboardtest.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index f9d00927..00000000
--- a/swamid-interfederations-2.0/blackboardtest.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blackboardtest.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 Blackboard test SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-03T14:24:38Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGzCCAgOgAwIBAgIJAKhIyr2H1JGFMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
- BAMTHGJiM3ZtZnJvbnQyLmNhbXB1cy5uY2wuYWMudWswHhcNMTIwMjEwMDkyOTI3
- WhcNMjIwMjA3MDkyOTI3WjAnMSUwIwYDVQQDExxiYjN2bWZyb250Mi5jYW1wdXMu
- bmNsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoRlEdOVU
- 7onwi3O+Qxax4fak2EOTb7esN0tb60Wxx2fiNWMatmxdwpdnI5DYKGoiyt4eduyD
- HRY1a4s4JrDN+zxvVJaX5pri1XeTtrHe3A7PeIWxCZk84eryBl58B8Bdj1diL2Xx
- bVY3HdjXs0wibFL8c83NeyvxBLLTz51Nhmaboa4D+vrFEBI736InxbzX9jLtRMN8
- lrP4MSQNXjhk7SjYmbAdZMX3bUIgGuIW2AVwMztwMxAH+XNt6FBZkMeRcNqQN0g9
- wpDhLK3VZfkmnqDhZqTtAAXxn9B8E7W5652KdJh6I+06EKAFwyri4lrwbxxubfFu
- nv9ExIv7eS5bAwIDAQABo0owSDAnBgNVHREEIDAeghxiYjN2bWZyb250Mi5jYW1w
- dXMubmNsLmFjLnVrMB0GA1UdDgQWBBRYmBDxtyrlNTYLdoFl8E6M5wzLijANBgkq
- hkiG9w0BAQUFAAOCAQEAn1ATNyj3aAVj4HltObKp90ovr7hAbBusCRw1NHw+9EY8
- /xaFx0h2ecy50XFtOITxHQKzqIdRn1NV/R0SU/baN7jfl7hJlZCTT4zcAkg9HtKW
- RfiZ93lctb180oOZVg/6kGxw8MNugy9wtTPilJOa9S17SHQURM96l3v4PBI32wu3
- CMnnOkS2b5KOgx9jADf7/tz0adDp9d+8//KV/NJGSNRQF9dOcUqelfOl5suzkAk5
- XDwuij6LN10FteNNT4p9XXVUB5f6mwFGW+InFxV2e/d3CUqzEujm7aA/r3rMqhun
- ARuB1sigrSQWfpCXRKHGvM6tWGg+Xo5q3JbSAdiUYA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blackboardtest.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Newcastle upon Tyne: Blackboard test SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bloghost-dev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/bloghost-dev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 23eab5cf..00000000
--- a/swamid-interfederations-2.0/bloghost-dev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bloghost-dev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Blogs Development Server" Shibboleth SP for University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-05T12:08:27Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC7jCCAdagAwIBAgIJAP8MwGHKVxuHMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
- BAMTDWJsb2dzaG9zdC1kZXYwHhcNMTQwMjA0MTAxMjMyWhcNMjQwMjAyMTAxMjMy
- WjAYMRYwFAYDVQQDEw1ibG9nc2hvc3QtZGV2MIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEAzoW8hw6sus5rwONSGO7q/TeOeQBMf+J3+nddRL2dMUQ15Laf
- K2BzIqjbY7E/Tl56yOCqEkHbwQdd6cUGyOeThPFuCh69cnonBDFTAMTiT+S9hsif
- QfUbcouDdMmcbTJXLMiXcWMgRV3PJuDCrQomFAl5VmmnV/pVZaOmebs8y5DzqQ4a
- JzBgLBkkoHurzmvrpHkABSSdgoXcMtWhi2ybezT6GEWIplzGbqQqSJ2LeKx5Wf7v
- ANzpfqVRyNuBiwSlJwlotQFl3oZymGoNsqOlUY7kdd9sXSKtAIZnAqoXVi9DCoy0
- uJsN96uLNmh5ySbakoBpvj2RlulS8G+wW44w5QIDAQABozswOTAYBgNVHREEETAP
- gg1ibG9nc2hvc3QtZGV2MB0GA1UdDgQWBBS3ABY0Nf34HW6gk2xWLXGoIxnL4jAN
- BgkqhkiG9w0BAQUFAAOCAQEANelLLRVugrdEgTlAsSi3MH7R22Di51TuPWPNRIPl
- Fsj2ldV8xxygzd0j0rGJBjmaS0ouh/q1SPtEzqqypYOomsBM0AVvrECEgoCAKs9x
- uZwl8UInX0WykDfQvhEHuDw8JeRyazMHFoSnwr26poeu4FlRLQNjvhbLPZE/xhW4
- CMgs1EncjSQWwH2+CeGhWBTEoC2+k8Xu1zyJ9hzwxjBU11Pgl/suTt5o3FsUDNCe
- XpiIQTcNvxbXn5nYar4fc0haZdnY1QbwWtsFBQ/6bOJ8U03dVpVSIMoaZe4JAaNm
- E+23bgoKNELCYBp8pAPVZNP3TB17/S/8dDXyL0pM8TaTkg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blogshost-dev.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Blogs Development Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/blogs.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/blogs.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index af418f74..00000000
--- a/swamid-interfederations-2.0/blogs.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blogs.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Newcastle University Blogging Server Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T09:08:32Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC8TCCAdmgAwIBAgIJAOvh30pIHRmyMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
- BAMTDmJsb2dzaG9zdC1saXZlMB4XDTExMTEwODE1MTUzNVoXDTIxMTEwNTE1MTUz
- NVowGTEXMBUGA1UEAxMOYmxvZ3Nob3N0LWxpdmUwggEiMA0GCSqGSIb3DQEBAQUA
- A4IBDwAwggEKAoIBAQC1K083pCB76lrE+QEVloKpPcVg8n/m2WIZsoOp5AuHOwZL
- Bs2d/AN7NZZr59ksIY1hr2JxocFt41nVaTGuA2k1GMe2MW8QIG4Yfnqekl0I9dDC
- +EUlFIqAMAuYQ79KjoE8LU0VTKEJp1mY2fUEg0v5DP4ihjtcbfigb5FQTZqTCNCH
- fqJ2VL2yeGurfA1CLwzxZ4VNqcgbFoesCj12Egci6qXKBHnyHcq0jNCjnaFff9HG
- SWwyuFj+Zwem/ySFBm76BbOM/dAox2gc8MAxo1IP3ZWEUi7+6K3lWVmvorevLRd4
- 7f++DnzXuWm9yLdlGRslIAgBiQu5uZcRBqllT70jAgMBAAGjPDA6MBkGA1UdEQQS
- MBCCDmJsb2dzaG9zdC1saXZlMB0GA1UdDgQWBBTkFblPCpVTKCyQSp/7ucv5uAPV
- kjANBgkqhkiG9w0BAQUFAAOCAQEAUEDp+zNw7fEtG7JutHw4X0+iSxBvVXT1j7RP
- DSRb8L4gztLIkQoxxJoxCri4aU3ZYMBU7jOOLZ5pk1ICzInjxzm3HM0hiDGQ/owy
- EUFofS0Ry8EjzxFlbuMve5Y3n58tr583ii7HlcztT6bLNEEExy5gyc8F1DY5EK+8
- +NDhCj268LrrHEczL4KHPs8M41rXwqILcCEENYERVBMpoEhidCfVTFohVKwl991B
- 1eEILEWbDcWlTHFv+uEX9RGZ6xfkUGtRSTTPZud778ZxZzU+35/OJs5rRgODAM5g
- tS+Sk8imh7RGkOXrMoOw9hwBOncIWrw0yc6mMwVsR2sNbJNZmg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC8TCCAdmgAwIBAgIJAOvh30pIHRmyMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
- BAMTDmJsb2dzaG9zdC1saXZlMB4XDTExMTEwODE1MTUzNVoXDTIxMTEwNTE1MTUz
- NVowGTEXMBUGA1UEAxMOYmxvZ3Nob3N0LWxpdmUwggEiMA0GCSqGSIb3DQEBAQUA
- A4IBDwAwggEKAoIBAQC1K083pCB76lrE+QEVloKpPcVg8n/m2WIZsoOp5AuHOwZL
- Bs2d/AN7NZZr59ksIY1hr2JxocFt41nVaTGuA2k1GMe2MW8QIG4Yfnqekl0I9dDC
- +EUlFIqAMAuYQ79KjoE8LU0VTKEJp1mY2fUEg0v5DP4ihjtcbfigb5FQTZqTCNCH
- fqJ2VL2yeGurfA1CLwzxZ4VNqcgbFoesCj12Egci6qXKBHnyHcq0jNCjnaFff9HG
- SWwyuFj+Zwem/ySFBm76BbOM/dAox2gc8MAxo1IP3ZWEUi7+6K3lWVmvorevLRd4
- 7f++DnzXuWm9yLdlGRslIAgBiQu5uZcRBqllT70jAgMBAAGjPDA6MBkGA1UdEQQS
- MBCCDmJsb2dzaG9zdC1saXZlMB0GA1UdDgQWBBTkFblPCpVTKCyQSp/7ucv5uAPV
- kjANBgkqhkiG9w0BAQUFAAOCAQEAUEDp+zNw7fEtG7JutHw4X0+iSxBvVXT1j7RP
- DSRb8L4gztLIkQoxxJoxCri4aU3ZYMBU7jOOLZ5pk1ICzInjxzm3HM0hiDGQ/owy
- EUFofS0Ry8EjzxFlbuMve5Y3n58tr583ii7HlcztT6bLNEEExy5gyc8F1DY5EK+8
- +NDhCj268LrrHEczL4KHPs8M41rXwqILcCEENYERVBMpoEhidCfVTFohVKwl991B
- 1eEILEWbDcWlTHFv+uEX9RGZ6xfkUGtRSTTPZud778ZxZzU+35/OJs5rRgODAM5g
- tS+Sk8imh7RGkOXrMoOw9hwBOncIWrw0yc6mMwVsR2sNbJNZmg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blogs.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Blogging Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bos2-demo.ilrt.bris.ac.uk-entity.xml b/swamid-interfederations-2.0/bos2-demo.ilrt.bris.ac.uk-entity.xml
deleted file mode 100644
index efac3f96..00000000
--- a/swamid-interfederations-2.0/bos2-demo.ilrt.bris.ac.uk-entity.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bos2-demo.ilrt.bris.ac.uk/entity">
- <!--
- This is a "Bristol Online Surveys Demo" Authentic2 SP for the University of Bristol.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-10T11:06:58Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Bristol Online Surveys Demo service</mdui:DisplayName>
- <mdui:Description xml:lang="en">BOS is an easy-to-use service that allows you to develop, deploy, and
- analyse surveys via the Web. Extensively used in UK HE.</mdui:Description>
- <mdui:Logo height="80" width="185">https://www.survey.bris.ac.uk/graphics/bos-logo.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEujCCA6KgAwIBAgIQN+Teq1Hb0/8iFr3JDSA3CTANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMDMyODAwMDAwMFoXDTE1MDMyODIzNTk1OVowgYsxCzAJBgNV
- BAYTAkdCMRAwDgYDVQQIEwdCcmlzdG9sMRAwDgYDVQQHEwdCcmlzdG9sMR4wHAYD
- VQQKExVVbml2ZXJzaXR5IG9mIEJyaXN0b2wxFDASBgNVBAsTC0lUIFNlcnZpY2Vz
- MSIwIAYDVQQDExlib3MyLWRlbW8uaWxydC5icmlzLmFjLnVrMIIBIjANBgkqhkiG
- 9w0BAQEFAAOCAQ8AMIIBCgKCAQEA16MgcClHM70Su62UQLSkm41+W6Vz+0iysbac
- OPvRg7I5Rd8a4O67lo4UVXhjU9a9R2GrZjgCKypRk17LgzgAFaaufikaUbNikAdV
- 7BWpyblwUhkykBggi30y225n4qILKk3h6IvA3FdJdxpQny5zf0NKenh5zoT+esaX
- dsIE44qWswHau+XAm68fBtDShYGYfM6jnChtVe1IH/sUPMqtcEgF7zGyg2fX2QhF
- pXkZbBfYPRi6dRKW3TTJXrQstCY4S34FkKhfGiSEDiXkDIF4DFhGBOlPwE0LgKuV
- mskH+H6QKyRGJ31byyGWA60jXLUvRCYTUC0X1QecDpzsYWuY+wIDAQABo4IBbDCC
- AWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFF/C
- zSaqft8zb8wsXk+4P6lKLrzWMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
- MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
- AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
- YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
- AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
- KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCQGA1UdEQQdMBuC
- GWJvczItZGVtby5pbHJ0LmJyaXMuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAGFr
- tqku6nCg+Za0LBlPhiVs3aFcI58uyTIII3g12W5xV2YMCXe210kTO34AlhOxVqiU
- zWm016KPdfENw7mJ8FvbrknnfOd2iH4ab10VVDm01kzf51t0oyWXrJa0aOhuXVzG
- SP0hF+1KbPohnZgaSyAWAr1IeK/VwHfXdE00OLjncTQiSJLIh5ueHyj555hsrgbb
- bspduV3b3K35rlMaP1NQH2gOk912eke4j5xbXWC4ekuOwoFD+hngC1lMmKlyyvfB
- 02jDUy56RLSgVQoQko6Mrjsv9s6GHynvHL5y+eYYCCtuKdwwxJemE3l8DJWHyAu2
- OhHgA/aNafJH12DpBSE=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleLogout" ResponseLocation="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleLogoutReturn"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleLogoutSOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/manageNameIdSOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/manageNameId" ResponseLocation="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/manageNameIdReturn"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleSignOnArtifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleSignOnPost" index="2"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Bristol</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Bristol Online Surveys Demo service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.survey.bris.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ed</GivenName>
- <SurName>Crewe</SurName>
- <EmailAddress>mailto:ed.crewe@bris.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ed</GivenName>
- <SurName>Crewe</SurName>
- <EmailAddress>mailto:ed.crewe@bris.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml
index 02b5bead..c8d73b19 100644
--- a/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml
@@ -23,25 +23,22 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDfDCCAmQCAQAwDQYJKoZIhvcNAQEFBQAwgYMxLjAsBgNVBAoTJVVGRiAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIEZsdW1pbmVuc2UxNTAzBgNVBAsTLFN1cGVyaW50
-ZW5kZW5jaWEgZGUgdGVjbm9sb2dpYSBkYSBpbmZvcm1hY2FvMQswCQYDVQQGEwJC
-UjENMAsGA1UEAxMEY2FmZTAeFw0xMjA1MzAxOTAwMzJaFw0xNTA1MzAxOTAwMzJa
-MIGDMS4wLAYDVQQKEyVVRkYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBGbHVtaW5l
-bnNlMTUwMwYDVQQLEyxTdXBlcmludGVuZGVuY2lhIGRlIHRlY25vbG9naWEgZGEg
-aW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXvhof7zm8y1QIVmLEpVVqC080Hx0Ow5nL
-XJ+gG23l2hBtMn3jSwR9lqpXtmx5lTLDOSLnLBdvV7E9ZUhFx9ybgxerRb0Brj45
-tLj4ycHbisfMA5MH2CoPa+2vnTRptHuQqaiP8N6WKcZnfJCay9M4sWfQ71Mf52xW
-4l4XscaQaGqZfvs8ZIGSKLb6U7VlUFqno1Npy7wfsYQr1yLlCOXjFdhoMKrxJezQ
-yzSmxLMb77CnLLI9X1arao2YsZXHFd36FbBDAKJ4thzc+4T2N4ORYl7xrbkC+PBO
-agiiHJhyI7DY/7ea43g+jOfpMzegVXDxybjWNOK5AmxTLGMUMDJPAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAGdHVzV4ZXlOL3dxQOoE001RPT4o15E2I4yOmU7819wG
-l4knZ6JQGYNU3uXfoGyaBB8465GH/9k8xJNn2lZyTTy2+R3nDmzFlPFkYvbs59Sl
-wHibg8abfHxRZx+eK551Ivw0Jnr5j7x1LHVDLAfzvuNPIBNpAhOIsaDoaitF49/x
-qIVZUFdkyoVjbeop384xKzfA3hFv4D5YS068QWCTsKrFXtcMCEBkL/dW0ywTlQK5
-Z/ihA7LfMSqo2t4kV+EBk1/AWTefxu107RBwojV9NHfgIVV3oVjgX/o0Le5wDKef
-KKWuTj9blE41waKTWtJSzqXi4LjSHeH+VhSn9b+8Llg=
+ MIIC3jCCAcYCAQAwDQYJKoZIhvcNAQEFBQAwNTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEYMBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMB4XDTE1MDMwNjEzMjYz
+MloXDTIwMDMwNDEzMjYzMlowNTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEY
+MBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA174aH+85vMtUCFZixKVVagtPNB8dDsOZy1yfoBtt5doQbTJ940sE
+fZaqV7ZseZUywzki5ywXb1exPWVIRcfcm4MXq0W9Aa4+ObS4+MnB24rHzAOTB9gq
+D2vtr500abR7kKmoj/DelinGZ3yQmsvTOLFn0O9TH+dsVuJeF7HGkGhqmX77PGSB
+kii2+lO1ZVBap6NTacu8H7GEK9ci5Qjl4xXYaDCq8SXs0Ms0psSzG++wpyyyPV9W
+q2qNmLGVxxXd+hWwQwCieLYc3PuE9jeDkWJe8a25AvjwTmoIohyYciOw2P+3muN4
+Pozn6TM3oFVw8cm41jTiuQJsUyxjFDAyTwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBkp0lu/zIeWo4OHVVhqTbPxcoMQ7UnBUJuku12ZmIfDb6FDiHlQitwTuBrep87
+A3oEmVN9BTLr/r8iw58Bfze/kYGQW9P7QOObOWaBDVuWPN2DLvBO2uvMSuOEZoI0
+3NCuLr5mi+Ahkwg+3Skgxa/LoT9ata18j2g11Jpa1z609buu7LJ2BBZ0etaxG6M9
+5zCCsP9j3MJ90/gsPT+dv/c2F3zOBq1hH7zzU2D16+wPX75vEd6ZQWzRacaUhaCu
+XBWbFnTZT9kXDNGoyyO5IgDXwprECJG1PeeqgD/j7iNWqeynNxuOQY7bKFMx8sjj
+noYKknCKZFy1OZxKXL8q2O1w
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -64,25 +61,22 @@ KKWuTj9blE41waKTWtJSzqXi4LjSHeH+VhSn9b+8Llg=
<ds:X509Data>
<ds:X509Certificate>
-MIIDfDCCAmQCAQAwDQYJKoZIhvcNAQEFBQAwgYMxLjAsBgNVBAoTJVVGRiAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIEZsdW1pbmVuc2UxNTAzBgNVBAsTLFN1cGVyaW50
-ZW5kZW5jaWEgZGUgdGVjbm9sb2dpYSBkYSBpbmZvcm1hY2FvMQswCQYDVQQGEwJC
-UjENMAsGA1UEAxMEY2FmZTAeFw0xMjA1MzAxOTAwMzJaFw0xNTA1MzAxOTAwMzJa
-MIGDMS4wLAYDVQQKEyVVRkYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBGbHVtaW5l
-bnNlMTUwMwYDVQQLEyxTdXBlcmludGVuZGVuY2lhIGRlIHRlY25vbG9naWEgZGEg
-aW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXvhof7zm8y1QIVmLEpVVqC080Hx0Ow5nL
-XJ+gG23l2hBtMn3jSwR9lqpXtmx5lTLDOSLnLBdvV7E9ZUhFx9ybgxerRb0Brj45
-tLj4ycHbisfMA5MH2CoPa+2vnTRptHuQqaiP8N6WKcZnfJCay9M4sWfQ71Mf52xW
-4l4XscaQaGqZfvs8ZIGSKLb6U7VlUFqno1Npy7wfsYQr1yLlCOXjFdhoMKrxJezQ
-yzSmxLMb77CnLLI9X1arao2YsZXHFd36FbBDAKJ4thzc+4T2N4ORYl7xrbkC+PBO
-agiiHJhyI7DY/7ea43g+jOfpMzegVXDxybjWNOK5AmxTLGMUMDJPAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAGdHVzV4ZXlOL3dxQOoE001RPT4o15E2I4yOmU7819wG
-l4knZ6JQGYNU3uXfoGyaBB8465GH/9k8xJNn2lZyTTy2+R3nDmzFlPFkYvbs59Sl
-wHibg8abfHxRZx+eK551Ivw0Jnr5j7x1LHVDLAfzvuNPIBNpAhOIsaDoaitF49/x
-qIVZUFdkyoVjbeop384xKzfA3hFv4D5YS068QWCTsKrFXtcMCEBkL/dW0ywTlQK5
-Z/ihA7LfMSqo2t4kV+EBk1/AWTefxu107RBwojV9NHfgIVV3oVjgX/o0Le5wDKef
-KKWuTj9blE41waKTWtJSzqXi4LjSHeH+VhSn9b+8Llg=
+MIIC3jCCAcYCAQAwDQYJKoZIhvcNAQEFBQAwNTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEYMBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMB4XDTE1MDMwNjEzMjYz
+MloXDTIwMDMwNDEzMjYzMlowNTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEY
+MBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA174aH+85vMtUCFZixKVVagtPNB8dDsOZy1yfoBtt5doQbTJ940sE
+fZaqV7ZseZUywzki5ywXb1exPWVIRcfcm4MXq0W9Aa4+ObS4+MnB24rHzAOTB9gq
+D2vtr500abR7kKmoj/DelinGZ3yQmsvTOLFn0O9TH+dsVuJeF7HGkGhqmX77PGSB
+kii2+lO1ZVBap6NTacu8H7GEK9ci5Qjl4xXYaDCq8SXs0Ms0psSzG++wpyyyPV9W
+q2qNmLGVxxXd+hWwQwCieLYc3PuE9jeDkWJe8a25AvjwTmoIohyYciOw2P+3muN4
+Pozn6TM3oFVw8cm41jTiuQJsUyxjFDAyTwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBkp0lu/zIeWo4OHVVhqTbPxcoMQ7UnBUJuku12ZmIfDb6FDiHlQitwTuBrep87
+A3oEmVN9BTLr/r8iw58Bfze/kYGQW9P7QOObOWaBDVuWPN2DLvBO2uvMSuOEZoI0
+3NCuLr5mi+Ahkwg+3Skgxa/LoT9ata18j2g11Jpa1z609buu7LJ2BBZ0etaxG6M9
+5zCCsP9j3MJ90/gsPT+dv/c2F3zOBq1hH7zzU2D16+wPX75vEd6ZQWzRacaUhaCu
+XBWbFnTZT9kXDNGoyyO5IgDXwprECJG1PeeqgD/j7iNWqeynNxuOQY7bKFMx8sjj
+noYKknCKZFy1OZxKXL8q2O1w
</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-interfederations-2.0/cat-ams.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/cat-ams.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 48f5cb66..00000000
--- a/swamid-interfederations-2.0/cat-ams.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cat-ams.eduroam.org/sp/module.php/saml/sp/metadata.php/default-sp">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQfEbAgU+uJP9CpVZzY/IcaDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDExNjAwMDAwMFoXDTE2MDExNjIzNTk1OVowSzELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTERMA8GA1UECxMISW50ZXJuZXQxGDAWBgNVBAMTD2NhdC5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWU/vfSCXSCtsHYAGX8Jd04wJFNCyRAlkjT0N5yPGR+LYXfZQFzK8g8UMTYn9ioIrJxOAagb7DDJa1yMrdT78IvtmWUqgFo6gS705d9TZUouvKvAfbWjit7unqcULLyL0ZTTRbU8afmrcZ0AgAoGfdt5rghBj4BFpjZyGKzXJVzIzpsySudtpn9Tk/Kd60oE5XVmw1oZDuYnEhcvisA4JfJkrHXm0G/3Rt7K43LdYvU5ivryRUQADfqvZ396M4SW7B8D128HWCQyaJZ9ELDRUTypyBhYmobV+KsXJ5MiaDZOHrKLaGfiCttvP4CZGs4guhpszj5LZaMWcsRzFc1e28CAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT4vtNccPufiR0gDV/oy/shZYTm+TAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9jYXQuZWR1cm9hbS5vcmcwDQYJKoZIhvcNAQEFBQADggEBAHSLuKF5XJ1SZbYbC9BQIkNgt51RQUeoa93JCB3EaabCzsJDvKxBQKv/gh0g3mv654I4+X3+APZKb/vhBhxBid+Wo6W13ddTfkB+lpxZJVncaEbs19PAc+0eoEP60Q4wwEhZ8yDsJgqdnF64KVYjI8kmreAAU0ExTveoSVpCjS0dTXYyv8IHTwUGTDSTImIQgFL2HE59/ffXQGVl6rXBz/Ti8Gxcik87P52iz1aYr3JZDDoiGBMdQWOmTnjySx4EyYt1nhoO+i1ZKyxKaRb2RDGPoV+Lv+7CuyKwTVxH9RGYuGBYFBrkkU8KWu9rN9pRzv9Zg+3QmJnFF/VlRFSdrKE=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQfEbAgU+uJP9CpVZzY/IcaDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDExNjAwMDAwMFoXDTE2MDExNjIzNTk1OVowSzELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTERMA8GA1UECxMISW50ZXJuZXQxGDAWBgNVBAMTD2NhdC5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWU/vfSCXSCtsHYAGX8Jd04wJFNCyRAlkjT0N5yPGR+LYXfZQFzK8g8UMTYn9ioIrJxOAagb7DDJa1yMrdT78IvtmWUqgFo6gS705d9TZUouvKvAfbWjit7unqcULLyL0ZTTRbU8afmrcZ0AgAoGfdt5rghBj4BFpjZyGKzXJVzIzpsySudtpn9Tk/Kd60oE5XVmw1oZDuYnEhcvisA4JfJkrHXm0G/3Rt7K43LdYvU5ivryRUQADfqvZ396M4SW7B8D128HWCQyaJZ9ELDRUTypyBhYmobV+KsXJ5MiaDZOHrKLaGfiCttvP4CZGs4guhpszj5LZaMWcsRzFc1e28CAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT4vtNccPufiR0gDV/oy/shZYTm+TAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9jYXQuZWR1cm9hbS5vcmcwDQYJKoZIhvcNAQEFBQADggEBAHSLuKF5XJ1SZbYbC9BQIkNgt51RQUeoa93JCB3EaabCzsJDvKxBQKv/gh0g3mv654I4+X3+APZKb/vhBhxBid+Wo6W13ddTfkB+lpxZJVncaEbs19PAc+0eoEP60Q4wwEhZ8yDsJgqdnF64KVYjI8kmreAAU0ExTveoSVpCjS0dTXYyv8IHTwUGTDSTImIQgFL2HE59/ffXQGVl6rXBz/Ti8Gxcik87P52iz1aYr3JZDDoiGBMdQWOmTnjySx4EyYt1nhoO+i1ZKyxKaRb2RDGPoV+Lv+7CuyKwTVxH9RGYuGBYFBrkkU8KWu9rN9pRzv9Zg+3QmJnFF/VlRFSdrKE=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cat-ams.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cat-ams.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cat-ams.eduroam.org/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cat-ams.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cat-ams.eduroam.org/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cat-ams.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">eduroam CAT (new pre production machine)</md:ServiceName>
- <md:ServiceDescription xml:lang="en">eduroam Configuration Assistant Tool</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">eduroam</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">eduroam</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.eduroam.org</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Dubravko</md:GivenName>
- <md:SurName>Voncina</md:SurName>
- <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:Company>eduroam operations team</md:Company>
- <md:EmailAddress>eduroam-ot@geant.net</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cf-bsd.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/cf-bsd.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 6c564314..00000000
--- a/swamid-interfederations-2.0/cf-bsd.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cf-bsd.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a ColdFusion Development Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-06T13:35:48Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAMqKL2nA8HPjMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF2NmLWJzZC5jYW1wdXMubmNsLmFjLnVrMB4XDTEyMDgwNjExMzEwMVoXDTIy
- MDgwNDExMzEwMVowIjEgMB4GA1UEAxMXY2YtYnNkLmNhbXB1cy5uY2wuYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx/ZtyavqVTHW9ZEAZXQ2i
- zQaYbRM9jnh+TSqKQKaAALB+4kk2pVuXvyALu3mYJJjNXptgzzgqHSnTGS4djmQb
- VF2PgfgOm5bPvki1Bak2E0cGY9lbJKa0dveOvsSqwkJXBh3AtdcASNWinp+Yxhn7
- iJdpts3QgIeOo57ez1dbvLZFXljz9CSMJG6t+hUcTxuPE0nJGg4fHsyuVc51E7C9
- fUVERx/JIUbk6rS48t6SCzhc3VjzqLvU845BPHgsneurrPaFHadiYxaYs58nK0zT
- l/hWLnzCZ/XYVmMVvHDeT27QBtKt8cSnbYJHFILjdj9Qsacr0D4Dy/9mgt6xLB9z
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2NmLWJzZC5jYW1wdXMubmNsLmFjLnVrMB0G
- A1UdDgQWBBTh/r6bTDwgDsUoMp+zEVcg4kxSpzANBgkqhkiG9w0BAQUFAAOCAQEA
- iZi/s+MHesqMvh+yzE9OtTwNDbnhZvEX5Ujn65Y70rb0/Wnv46vzPyP17vYIVCwa
- yJOxW5RbqHmnSbHcOeJeUN9wthBkmjs1BvU35jDf5DaVwX8yyoOIjkPpXmTYDljC
- 7uwSRlz2grH3eq6xzabfLk6z6L5WHV0m9z2evKiI3TrrIF/YjBwITHmqSARPnLMM
- AJzicq+x7qEV57WmOe+4mZxxItI/rW1HlTTKEPyXQuwLh+KReouWcBqCINrqs28j
- lXyjLjBMkKBxa1FHAs9AwLBu+UKsV/QuuQ9wlXbxrYBBCTk6uQe4y7Cvvm1Ui4yZ
- TuU4y4D8onBtuTaSAqaS0Q==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cf-bsd.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University ColdFusion Development SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cms.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/cms.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 413923cd..00000000
--- a/swamid-interfederations-2.0/cms.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cms.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 CMS Application Server SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cms.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC7jCCAdagAwIBAgIJANrfWHk04AJiMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
- BAMTDWNtcy5uY2wuYWMudWswHhcNMTAxMTEwMDgyNzIzWhcNMjAxMTA3MDgyNzIz
- WjAYMRYwFAYDVQQDEw1jbXMubmNsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEAx945yQ7OPJYoGUIBKBFi07CZrWUKTi8lOS9aLEdFL4BymY2A
- V4KtCg4EJ2zPrPppk41TAPCe1Ffme04f/bwI0n5Qxz3A3mKq4vQMlW8HWoUTURjs
- z1X8dTh3sBOyd/zutf6g7wWZERHx/NFd8moBRhJYMz87dwINoBAkMMz+a6aOB7mD
- LkNs4Wi5pzJRsOlp4WC1fyVv8+vG0RUVpiYXKtwuzEIoDqvayzR01Xn/Ssie6mtd
- qab2qOCBK33z5OIykQzmUeTAxhE1uz88ModTebJd2zYORtGHyuD/jaEg92tTqt+k
- zXHdnDh95ly8ppU/tgqYN6sGcNqYbcl6Jj8e9wIDAQABozswOTAYBgNVHREEETAP
- gg1jbXMubmNsLmFjLnVrMB0GA1UdDgQWBBTG5/cQhGWDyKSlvXMz4zykq/IH7jAN
- BgkqhkiG9w0BAQUFAAOCAQEABud/mxatSiFS/NmX2Er9olO7pwnEI8D3S3xVhNrn
- 6oGwRTvNSeifs2aEh8tNBOSyNe4drzHnH2OCa8UxNuqXmxEFkKk5KUNEliR5e3we
- 3eAIGJpksW9bolAlSg1HuHOL7sOCv9VgkOZaCcPC03Fq5k0Qz8EoTcY+0stLn9y1
- J0Wd7YL6mH7d8CbY/HRqLPs4LBsUh912B1LzyY6DrjGEgen0myJVGLEOK18oh0jX
- XrA1HCd/A8sYo/uG+NxmWUVwpzE70F2in5LxccCT+fLkqpHxj+nUYzTndbSbQrqz
- 8HXI0cOuOL+xZrjbDONzFREpr/2mKAuxYc9rNfyMGrHvjQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC7jCCAdagAwIBAgIJANrfWHk04AJiMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
- BAMTDWNtcy5uY2wuYWMudWswHhcNMTAxMTEwMDgyNzIzWhcNMjAxMTA3MDgyNzIz
- WjAYMRYwFAYDVQQDEw1jbXMubmNsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEAx945yQ7OPJYoGUIBKBFi07CZrWUKTi8lOS9aLEdFL4BymY2A
- V4KtCg4EJ2zPrPppk41TAPCe1Ffme04f/bwI0n5Qxz3A3mKq4vQMlW8HWoUTURjs
- z1X8dTh3sBOyd/zutf6g7wWZERHx/NFd8moBRhJYMz87dwINoBAkMMz+a6aOB7mD
- LkNs4Wi5pzJRsOlp4WC1fyVv8+vG0RUVpiYXKtwuzEIoDqvayzR01Xn/Ssie6mtd
- qab2qOCBK33z5OIykQzmUeTAxhE1uz88ModTebJd2zYORtGHyuD/jaEg92tTqt+k
- zXHdnDh95ly8ppU/tgqYN6sGcNqYbcl6Jj8e9wIDAQABozswOTAYBgNVHREEETAP
- gg1jbXMubmNsLmFjLnVrMB0GA1UdDgQWBBTG5/cQhGWDyKSlvXMz4zykq/IH7jAN
- BgkqhkiG9w0BAQUFAAOCAQEABud/mxatSiFS/NmX2Er9olO7pwnEI8D3S3xVhNrn
- 6oGwRTvNSeifs2aEh8tNBOSyNe4drzHnH2OCa8UxNuqXmxEFkKk5KUNEliR5e3we
- 3eAIGJpksW9bolAlSg1HuHOL7sOCv9VgkOZaCcPC03Fq5k0Qz8EoTcY+0stLn9y1
- J0Wd7YL6mH7d8CbY/HRqLPs4LBsUh912B1LzyY6DrjGEgen0myJVGLEOK18oh0jX
- XrA1HCd/A8sYo/uG+NxmWUVwpzE70F2in5LxccCT+fLkqpHxj+nUYzTndbSbQrqz
- 8HXI0cOuOL+xZrjbDONzFREpr/2mKAuxYc9rNfyMGrHvjQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cms.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cms.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cms.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cms.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cms.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cms.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cms.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cms.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cms.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cms.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cms.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cms.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cms.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cms.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University CMS Application Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/community.ja.net-shibboleth.xml b/swamid-interfederations-2.0/community.ja.net-shibboleth.xml
index 1bd9eebb..126a79db 100644
--- a/swamid-interfederations-2.0/community.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/community.ja.net-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://community.ja.net/shibboleth">
<!--
- This is a Janet Community Shibboleth 2 SP for JISC Collections and Janet Limited.
+ This is "The Janet Community" Shibboleth SP for JISC Collections and Janet Limited.
-->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-14T17:37:40Z">
diff --git a/swamid-interfederations-2.0/community.staging.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/community.staging.company.ja.net-shibboleth.xml
index 78ff1b30..8e11ae6f 100644
--- a/swamid-interfederations-2.0/community.staging.company.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/community.staging.company.ja.net-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://community.staging.company.ja.net/shibboleth">
<!--
- This is a Janet Community Shibboleth 2 'Staging' SP for JISC Collections and Janet Limited.
+ This is "The Janet Community (Staging)" Shibboleth SP for JISC Collections and Janet Limited.
-->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-25T19:22:17Z">
diff --git a/swamid-interfederations-2.0/crypt.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/crypt.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 98872129..00000000
--- a/swamid-interfederations-2.0/crypt.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crypt.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-07T14:34:56Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC5TCCAc2gAwIBAgIJAL1hZwGEFc1mMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
- BAMTCm1hZ25ldC1uZXcwHhcNMTMwNjE3MTI1NTU1WhcNMjMwNjE1MTI1NTU1WjAV
- MRMwEQYDVQQDEwptYWduZXQtbmV3MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEA4bQfiCOOpUsZ/RHQO75PCmH0apyLOBjv8pHdyVPwL8oAnmKdZjZS/4AY
- E5QidQL5ObiqioVqlSIqNjbsc46gh/gvsqk/KFbxyTas2v+2FOQFAs7VlfmTXgPx
- T+ra01pnLfDP6mSiXKILsU+613uKeoPFQBSTDnQxvhTrDEr/asyt3PyDMeYr1Mzi
- MftWYQ8HUMYBHSI8aHqRMVV7PSi067+1INvF9ZbQPXWSztZY1bTcn0iuPb8HyLba
- KsrfhtQnX+EDrdxS/NGXzS6lT0cJLhLemW+UudnZ4UG/k6z4tHGYAML8mOYLedcN
- xPGMPAWw54NEei4B2TgtRCu6YrZsuwIDAQABozgwNjAVBgNVHREEDjAMggptYWdu
- ZXQtbmV3MB0GA1UdDgQWBBQTzSvoSYMVz16eM9zqTMUzyzzzGTANBgkqhkiG9w0B
- AQUFAAOCAQEAUgFsdxLdIE+pqZS2Bwpc5LsJuEKccR1JanEE9502weYfZhm5QXqo
- +zg4qQ78nInv97Q2DCRGor0YO674GMq6DlaCDpHpJyiwJLWwMbb+1e5OCP70231T
- zYomLxXy3opMzl76udbXxNVgjLkp4/Kdyqa7qBaEcxD8gEljGIvFotOP45EgxsOn
- 4ZCleHzYHbueMGUHQvLfX+87Zlkt5bvOZZoJBOwMc6Xs2DmPgH1b/rjC730TmAfe
- sxX61eaqGeNpki2+3romVz5PnJVC/Cx9Co06SqGugCmxa013O8Op3JIDXbQa+ozP
- FXuOh6hD2tW+rIs78pc3lPT4ewiKAyiYrQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC5TCCAc2gAwIBAgIJAL1hZwGEFc1mMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
- BAMTCm1hZ25ldC1uZXcwHhcNMTMwNjE3MTI1NTU1WhcNMjMwNjE1MTI1NTU1WjAV
- MRMwEQYDVQQDEwptYWduZXQtbmV3MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEA4bQfiCOOpUsZ/RHQO75PCmH0apyLOBjv8pHdyVPwL8oAnmKdZjZS/4AY
- E5QidQL5ObiqioVqlSIqNjbsc46gh/gvsqk/KFbxyTas2v+2FOQFAs7VlfmTXgPx
- T+ra01pnLfDP6mSiXKILsU+613uKeoPFQBSTDnQxvhTrDEr/asyt3PyDMeYr1Mzi
- MftWYQ8HUMYBHSI8aHqRMVV7PSi067+1INvF9ZbQPXWSztZY1bTcn0iuPb8HyLba
- KsrfhtQnX+EDrdxS/NGXzS6lT0cJLhLemW+UudnZ4UG/k6z4tHGYAML8mOYLedcN
- xPGMPAWw54NEei4B2TgtRCu6YrZsuwIDAQABozgwNjAVBgNVHREEDjAMggptYWdu
- ZXQtbmV3MB0GA1UdDgQWBBQTzSvoSYMVz16eM9zqTMUzyzzzGTANBgkqhkiG9w0B
- AQUFAAOCAQEAUgFsdxLdIE+pqZS2Bwpc5LsJuEKccR1JanEE9502weYfZhm5QXqo
- +zg4qQ78nInv97Q2DCRGor0YO674GMq6DlaCDpHpJyiwJLWwMbb+1e5OCP70231T
- zYomLxXy3opMzl76udbXxNVgjLkp4/Kdyqa7qBaEcxD8gEljGIvFotOP45EgxsOn
- 4ZCleHzYHbueMGUHQvLfX+87Zlkt5bvOZZoJBOwMc6Xs2DmPgH1b/rjC730TmAfe
- sxX61eaqGeNpki2+3romVz5PnJVC/Cx9Co06SqGugCmxa013O8Op3JIDXbQa+ozP
- FXuOh6hD2tW+rIs78pc3lPT4ewiKAyiYrQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: crypt</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Helpline</GivenName>
- <EmailAddress>mailto:webmaster@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Caleb</GivenName>
- <SurName>Racey</SurName>
- <EmailAddress>mailto:Caleb.Racey@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ecls1.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml
index b0790993..c893d108 100644
--- a/swamid-interfederations-2.0/ecls1.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ecls1.ncl.ac.uk/shibboleth/metadata">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dadotsdev02.essex.ac.uk/shibboleth">
<!--
- This is an "Education Communication and Language Sciences" Shibboleth SP for the University of Newcastle upon Tyne.
+ This is a "UK Data Service Dotstat Development Server 02" Shibboleth SP for the University of Essex.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -20,35 +20,35 @@
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-28T10:31:11Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-06T10:05:46Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/Login"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAN5vVEIKDWwiMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFnZlbm9tLmNhbXB1cy5uY2wuYWMudWswHhcNMTQxMTIwMTA0NzI1WhcNMjQx
- MTE3MTA0NzI1WjAhMR8wHQYDVQQDExZ2ZW5vbS5jYW1wdXMubmNsLmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvYodTUmxih7mbLEKNvsNJY8J
- p18NXggKW+HEaSQUFWpISC2xgOmAI7+/tV0UxgfdBYSqHQg3XR3eqg33lWJBSiSn
- mkdZBxVbwhrgCRadGeHg8FNmgLXzzwO3TKVSax5xtRLogYn/GAPXsFt3jET1yiy+
- JchbSEXNyZ0TjVjyQkoadQX5Dl74qO069HrQ9ZKDniaAM6IRc9kIe2f1pwT8T46a
- a/neDR04nFZYiZ5O+FIaKn/8v1qfQ1RkCSGjyFhcHPW2A+HIqu7bwI/9SDgLx0OZ
- gMYJi7/XUNHlMDfVYaMO4h+pTOHHxFtKyLsJiZVqDglvZOMeolkBIE0WZTnUzwID
- AQABo0QwQjAhBgNVHREEGjAYghZ2ZW5vbS5jYW1wdXMubmNsLmFjLnVrMB0GA1Ud
- DgQWBBRSw/Aa2kCc7CFcJrXEfYNOq3yoETANBgkqhkiG9w0BAQUFAAOCAQEArmUT
- woBY9dHaVjwX+TiALRenOdScikF59054xVn+i72P4aMIAjxPLrukk7VIifx9+9N+
- 87RHogUOjFFiBE12AuIz1/46+aVRaT57hSdJmjPiCAaYUEYbYKMspHbG8JUa/a0Z
- qNrTuOErnUrGO0tylheNqZDydFzMsOS3lYz6wFPA5j18ugW1+b1eKOY83AAeHZQj
- 1OtqcD2B5+Lp88AJZ9HhX9kRwuouG5XaTyEQFsNmCACGRjVx5buTz1DywI5H6znH
- 88+OdzoTYDXhghz9kZO7duht76cEw6wwbz+7OhUUxs//nf/zHPNgp6/OJmTlS3HW
- sjNBSTqk7/tnQbeZuw==
+ MIIDDDCCAfSgAwIBAgIJAILDhwjr7ZN4MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+ BAMTF2RhZG90c2RldjAyLmVzc2V4LmFjLnVrMB4XDTE1MDIyNTE2MTUwM1oXDTI1
+ MDIyMjE2MTUwM1owIjEgMB4GA1UEAxMXZGFkb3RzZGV2MDIuZXNzZXguYWMudWsw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlsK18Tb2IK838pdwwylTu
+ HiF86/nYePu9WhXOBNHq+2LGaA73+j+RVMQnZIvLOWEFDmUtPUZQCALEAy9cVWEy
+ v+clmkXG+yrRB2u2rxMRydNZvPWRyAyceYJtnHUtd6WGqh5P5YzK/h7z8aedHsOe
+ /pINhgmqQowunjXpKPRcVGvd3H5WVzILM9mqROfIJ6sV8I7a0eBBJN2lDLgeUzMO
+ bIYITWKnnVYnzouQU1UDRDCrO3hhuhX21fLE6Lt4BrQJrNMrkSCxDAYuYaHZP2n7
+ c7K4q1A5haGXN9H32eIqCqUcYp/mtf2mQ0Mqm88eDc2IItbs36kUQG9gfUHJp5p9
+ AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RhZG90c2RldjAyLmVzc2V4LmFjLnVrMB0G
+ A1UdDgQWBBS7fh8aeRB64R+kY5/JJpy41IP9WjANBgkqhkiG9w0BAQUFAAOCAQEA
+ FmsAVt9WPTgZ1bHRZcs9q4CqtIGGRJiRsWbSXIi9rOvt3ZeRYoP/rIF023z9vpEe
+ qEIJZNmXuGwYc9VDL+6qwPdLSNKqb3Zz5M9x7qYAB7VjqLf8lhkzv9HJJ1Cmpwlm
+ q5rJlWCPvdViJ44hMFwB6QEsvDHH34CDQgPegG2EY7Xkm7ugwnniTBqZYcyFU2SH
+ GO+cggiW6+7by2FTk33qTZaSTVMwKK5ZbesGjIriSgQVdHt4FWbE5pKhnNPTaPXH
+ QcjOIA/E0+h92TKhws2T4jj2gyoLE2+f3ah6zfItTKwJgB1yuTSpkVo2Hpnq8lak
+ c3GH0A8MBMfaHeUkrOsmgA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -62,31 +62,31 @@
<EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ecls1.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Education Communication and Language Sciences SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/ecls/</OrganizationURL>
+ <OrganizationName xml:lang="en">University of Essex</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">UK Data Service Dotstat Development Server 02</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://ukdataservice.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
+ <GivenName>Susan</GivenName>
+ <SurName>Noble</SurName>
+ <EmailAddress>mailto:Susan.Noble@manchester.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Dennis</GivenName>
- <SurName>Bates</SurName>
- <EmailAddress>mailto:dennis.bates@ncl.ac.uk</EmailAddress>
+ <GivenName>Nick</GivenName>
+ <SurName>Syrotiuk</SurName>
+ <EmailAddress>mailto:syrotiuk@manchester.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dash2.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/dash2.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 2ac299c0..00000000
--- a/swamid-interfederations-2.0/dash2.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dash2.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 dash2 Application Server SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash2.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: dash2 Application Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dds.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/dds.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 69969586..00000000
--- a/swamid-interfederations-2.0/dds.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dds.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an SP for Newcastle University's Library Downloads Server.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dds.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJANn+1TPCg8NhMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA3JsbzAeFw0xMDEwMDcxNDAxMjNaFw0yMDEwMDQxNDAxMjNaMA4xDDAKBgNV
- BAMTA3JsbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKM+sOTZU3QO
- vMtesG2jKSFdrmYesy8AOfswToTJZwbVzsImz1EpnipYC92uYW9YVBnzSBMI7LP6
- EtdzHI1Pu5X7HeJyVM8snBk1s0Blf+BFGEgSfv3jhvNILFHkJDVgONympFCnlpaA
- zJvIxTWzhowznkqnbwpKEtwyOW0+GtW8CvYgeKrE2SN5hzYy2YSrP+V5nyzTD5Wr
- 3i7SrQM/iAJma3LH+BAbANz5DQQWYIY66XuM9RGUWmMDj2B76ChaentbY0+3oglI
- qzw6YC1iWCM8+QDBVhOBQUB5oRHbceRxgVRDOl7zzfG1J1O7Tu92XGCga+o0fuv9
- i+lmTsZ5VrUCAwEAAaMxMC8wDgYDVR0RBAcwBYIDcmxvMB0GA1UdDgQWBBQogJZb
- M+uVgJw9DH9i7pXL0UMY2zANBgkqhkiG9w0BAQUFAAOCAQEAjbkKr4xUHZgzAt9c
- kYOrIimS9FCrn3Xav4L/3ezA8ECax83zx5AhkwkZydkRQ80K8mT1bwWvVxEAbz1t
- 2qQJdPgRZQinKCLuRYgUjetUarNZrIkOWgfyJ8Q+161tRQJSJouTT1dWMdJ0OpZ+
- tR5wgxPMsbh2UWvS68ER5ID7HWM2VLnlwVzMFBoKVdfUUfpMo0ge5MMez1x9vXjU
- zwieA3/Sv5zLVyItdnvE84qCzlwCj07EcR2tAeHvP8hyAjEaqFXHGSoIPeI3kqEZ
- pszwHe1tmKiY8JiYBmob6R81wi328l9F+pASF33F5SZ2A7m/6PApvBaXIi/MlIS2
- dOj6RA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJANn+1TPCg8NhMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA3JsbzAeFw0xMDEwMDcxNDAxMjNaFw0yMDEwMDQxNDAxMjNaMA4xDDAKBgNV
- BAMTA3JsbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKM+sOTZU3QO
- vMtesG2jKSFdrmYesy8AOfswToTJZwbVzsImz1EpnipYC92uYW9YVBnzSBMI7LP6
- EtdzHI1Pu5X7HeJyVM8snBk1s0Blf+BFGEgSfv3jhvNILFHkJDVgONympFCnlpaA
- zJvIxTWzhowznkqnbwpKEtwyOW0+GtW8CvYgeKrE2SN5hzYy2YSrP+V5nyzTD5Wr
- 3i7SrQM/iAJma3LH+BAbANz5DQQWYIY66XuM9RGUWmMDj2B76ChaentbY0+3oglI
- qzw6YC1iWCM8+QDBVhOBQUB5oRHbceRxgVRDOl7zzfG1J1O7Tu92XGCga+o0fuv9
- i+lmTsZ5VrUCAwEAAaMxMC8wDgYDVR0RBAcwBYIDcmxvMB0GA1UdDgQWBBQogJZb
- M+uVgJw9DH9i7pXL0UMY2zANBgkqhkiG9w0BAQUFAAOCAQEAjbkKr4xUHZgzAt9c
- kYOrIimS9FCrn3Xav4L/3ezA8ECax83zx5AhkwkZydkRQ80K8mT1bwWvVxEAbz1t
- 2qQJdPgRZQinKCLuRYgUjetUarNZrIkOWgfyJ8Q+161tRQJSJouTT1dWMdJ0OpZ+
- tR5wgxPMsbh2UWvS68ER5ID7HWM2VLnlwVzMFBoKVdfUUfpMo0ge5MMez1x9vXjU
- zwieA3/Sv5zLVyItdnvE84qCzlwCj07EcR2tAeHvP8hyAjEaqFXHGSoIPeI3kqEZ
- pszwHe1tmKiY8JiYBmob6R81wi328l9F+pASF33F5SZ2A7m/6PApvBaXIi/MlIS2
- dOj6RA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dds.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dds.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dds.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dds.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dds.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dds.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dds.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dds.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dds.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dds.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dds.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dds.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dds.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dds.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dds.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Library Downloads Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/directory.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/directory.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index aade9477..00000000
--- a/swamid-interfederations-2.0/directory.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://directory.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2.1.1 service provider for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://directory.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://directory.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://directory.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://directory.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://directory.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://directory.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://directory.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://directory.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://directory.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://directory.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://directory.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://directory.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://directory.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://directory.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://directory.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University People Search Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dropbox.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/dropbox.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 84443504..00000000
--- a/swamid-interfederations-2.0/dropbox.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dropbox.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2.2.1 SP for Newcastle University's Temporary Storage Server.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAL48+bQlkxoCMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB2Ryb3Bib3gwHhcNMTAwMTIwMTMzMjA0WhcNMjAwMTE4MTMzMjA0WjASMRAw
- DgYDVQQDEwdkcm9wYm94MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 4ob+tUOwHNPtBV+C+m2wcrwP5SZqpyQ7icinnBuHyf0L0pBC9HK46ntIy1ewIgNQ
- hRFOdRPWEVoluyEQPNWCSFYq/BmV1+BQskDZ3bJTUuNpeuBXal8Twqt1x1U7WrUe
- iXlXvwly0wneiMtM0pjIGTAzAzKQQaLOocXbUSBh+zopg9GrSgkP25jENW7UKcwa
- 66N5E5p2V/Wg+sabAUE5Kxb3Kh3GzfRr01cShv7hXb0vGAH5hcUp7yecc7mS0MSG
- c3bzDwCvTN0HRBcxwIjvA/F5UqTb6TzhopNeGgdy4l6yQsUwhBZ2+nDAXxPVcoQj
- yyokkbHOWtEOTNbXFg9uWwIDAQABozUwMzASBgNVHREECzAJggdkcm9wYm94MB0G
- A1UdDgQWBBRXokPk75wcuzbKzz3Lllv+RKy62zANBgkqhkiG9w0BAQUFAAOCAQEA
- EZV2UGQMYYMuJQELoqqVdyzdUQn6c+UEpurVt85d4bJw7QVygewoctwTS4EFBLnN
- US5BrlRYSZCQrxOM56w7f3xQlM2BxZHVR/oclE0Qq+ThnS9fSRi76wxiz7OeDU3C
- FprTeylrbrsvqPLmhqFe7JfOSYh+eOwfgbH5Q3uoFim13zqEavq2QpaX/9An0y5j
- +lskQCwv1xFCzj4chyBxwdTh9SoAxGHK9BjAtHeoFABHnFhZ1+IvCb2nU9zmbv6H
- CFnoZxzA0nlR5+hc3PM7WD61Xc6O5hhoyeDDB+9tI26TJ87b2B0Cs78nE+JJDwnq
- mNcNCxYluW1T3h3NSdyXkQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAL48+bQlkxoCMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB2Ryb3Bib3gwHhcNMTAwMTIwMTMzMjA0WhcNMjAwMTE4MTMzMjA0WjASMRAw
- DgYDVQQDEwdkcm9wYm94MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 4ob+tUOwHNPtBV+C+m2wcrwP5SZqpyQ7icinnBuHyf0L0pBC9HK46ntIy1ewIgNQ
- hRFOdRPWEVoluyEQPNWCSFYq/BmV1+BQskDZ3bJTUuNpeuBXal8Twqt1x1U7WrUe
- iXlXvwly0wneiMtM0pjIGTAzAzKQQaLOocXbUSBh+zopg9GrSgkP25jENW7UKcwa
- 66N5E5p2V/Wg+sabAUE5Kxb3Kh3GzfRr01cShv7hXb0vGAH5hcUp7yecc7mS0MSG
- c3bzDwCvTN0HRBcxwIjvA/F5UqTb6TzhopNeGgdy4l6yQsUwhBZ2+nDAXxPVcoQj
- yyokkbHOWtEOTNbXFg9uWwIDAQABozUwMzASBgNVHREECzAJggdkcm9wYm94MB0G
- A1UdDgQWBBRXokPk75wcuzbKzz3Lllv+RKy62zANBgkqhkiG9w0BAQUFAAOCAQEA
- EZV2UGQMYYMuJQELoqqVdyzdUQn6c+UEpurVt85d4bJw7QVygewoctwTS4EFBLnN
- US5BrlRYSZCQrxOM56w7f3xQlM2BxZHVR/oclE0Qq+ThnS9fSRi76wxiz7OeDU3C
- FprTeylrbrsvqPLmhqFe7JfOSYh+eOwfgbH5Q3uoFim13zqEavq2QpaX/9An0y5j
- +lskQCwv1xFCzj4chyBxwdTh9SoAxGHK9BjAtHeoFABHnFhZ1+IvCb2nU9zmbv6H
- CFnoZxzA0nlR5+hc3PM7WD61Xc6O5hhoyeDDB+9tI26TJ87b2B0Cs78nE+JJDwnq
- mNcNCxYluW1T3h3NSdyXkQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dropbox.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Temporary Storage Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dropoff-dev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/dropoff-dev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 244c1196..00000000
--- a/swamid-interfederations-2.0/dropoff-dev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dropoff-dev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth Dropoff Development Server SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-23T10:46:07Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/shibboleth-idp/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/DS"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC6DCCAdCgAwIBAgIJALz1xY2LbXZ5MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
- BAMTC2Ryb3BvZmYtZGV2MB4XDTEyMDcyMzA5MzIzOFoXDTIyMDcyMTA5MzIzOFow
- FjEUMBIGA1UEAxMLZHJvcG9mZi1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
- ggEKAoIBAQCgtL1Jx7KkfhrGIPzdZEQS1PUoxuyW96AaL3IhF8GPkr++Pv6pTnqG
- IdBEUtyKX0pWmvAk6k8NM8JEbes/bExUE6FTLV9AqG/kpKAjTxAzJNdGpPbgC69Q
- xxbF1pRd8lX+qSud/ShjEWqG776eR8/INoU0YDavFx8NOswOfyFVmAEYQRiH59bA
- dgAIhawamwQsveziGGmaZ2tZmxYbijnsSP8AYPrdQIySsnOHPphEtuFsdGPvrNIk
- 1+iu9IKe/0DsomhphKjM/vr3BThxInENfDcqqds710eRG5Iv7Dpp4QegY7c7iisP
- wWoQwD/hRkQBUJayIvVHIcGPhQ9D1dULAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2Ry
- b3BvZmYtZGV2MB0GA1UdDgQWBBRL93suzdcB02c3pJS94duesuPG0DANBgkqhkiG
- 9w0BAQUFAAOCAQEAkQwCBKpatdJy7QCk3P438OPSJClwrWkblOCHTSilUac0e30z
- +Yv28ZC9TxQ6zIQG7Z/VKcwFbGyBA/2ccyAvh87rV5QV9DAGWD6vUgxoW12kuv2f
- 3Z5mW2duCDiLn08QTL/+vWyne2ue4BB6VOFbGr8ENc86dq4JFx2TJrNAokiXz+rN
- ZOv/X8pMid0/He9xIWQI+ibmn8Jri222Toc1HL6RArewX7/lQU7se5wvaYFfY0cr
- IMTC7h20Ww8cN1M58SW72PsIuD4w4jSh+FzlR1duxaqieQrF5uEqx6vRpQEGsBwL
- cHYLTWhu6dmvzrK1ic2Symd9RxGO6YcuHCaOJQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dropoff-dev.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Dropoff Development Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dropoff.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/dropoff.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 14f8c983..00000000
--- a/swamid-interfederations-2.0/dropoff.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dropoff.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Dropbox-Dropoff Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-31T13:58:59Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAL48+bQlkxoCMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB2Ryb3Bib3gwHhcNMTAwMTIwMTMzMjA0WhcNMjAwMTE4MTMzMjA0WjASMRAw
- DgYDVQQDEwdkcm9wYm94MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 4ob+tUOwHNPtBV+C+m2wcrwP5SZqpyQ7icinnBuHyf0L0pBC9HK46ntIy1ewIgNQ
- hRFOdRPWEVoluyEQPNWCSFYq/BmV1+BQskDZ3bJTUuNpeuBXal8Twqt1x1U7WrUe
- iXlXvwly0wneiMtM0pjIGTAzAzKQQaLOocXbUSBh+zopg9GrSgkP25jENW7UKcwa
- 66N5E5p2V/Wg+sabAUE5Kxb3Kh3GzfRr01cShv7hXb0vGAH5hcUp7yecc7mS0MSG
- c3bzDwCvTN0HRBcxwIjvA/F5UqTb6TzhopNeGgdy4l6yQsUwhBZ2+nDAXxPVcoQj
- yyokkbHOWtEOTNbXFg9uWwIDAQABozUwMzASBgNVHREECzAJggdkcm9wYm94MB0G
- A1UdDgQWBBRXokPk75wcuzbKzz3Lllv+RKy62zANBgkqhkiG9w0BAQUFAAOCAQEA
- EZV2UGQMYYMuJQELoqqVdyzdUQn6c+UEpurVt85d4bJw7QVygewoctwTS4EFBLnN
- US5BrlRYSZCQrxOM56w7f3xQlM2BxZHVR/oclE0Qq+ThnS9fSRi76wxiz7OeDU3C
- FprTeylrbrsvqPLmhqFe7JfOSYh+eOwfgbH5Q3uoFim13zqEavq2QpaX/9An0y5j
- +lskQCwv1xFCzj4chyBxwdTh9SoAxGHK9BjAtHeoFABHnFhZ1+IvCb2nU9zmbv6H
- CFnoZxzA0nlR5+hc3PM7WD61Xc6O5hhoyeDDB+9tI26TJ87b2B0Cs78nE+JJDwnq
- mNcNCxYluW1T3h3NSdyXkQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAL48+bQlkxoCMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB2Ryb3Bib3gwHhcNMTAwMTIwMTMzMjA0WhcNMjAwMTE4MTMzMjA0WjASMRAw
- DgYDVQQDEwdkcm9wYm94MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 4ob+tUOwHNPtBV+C+m2wcrwP5SZqpyQ7icinnBuHyf0L0pBC9HK46ntIy1ewIgNQ
- hRFOdRPWEVoluyEQPNWCSFYq/BmV1+BQskDZ3bJTUuNpeuBXal8Twqt1x1U7WrUe
- iXlXvwly0wneiMtM0pjIGTAzAzKQQaLOocXbUSBh+zopg9GrSgkP25jENW7UKcwa
- 66N5E5p2V/Wg+sabAUE5Kxb3Kh3GzfRr01cShv7hXb0vGAH5hcUp7yecc7mS0MSG
- c3bzDwCvTN0HRBcxwIjvA/F5UqTb6TzhopNeGgdy4l6yQsUwhBZ2+nDAXxPVcoQj
- yyokkbHOWtEOTNbXFg9uWwIDAQABozUwMzASBgNVHREECzAJggdkcm9wYm94MB0G
- A1UdDgQWBBRXokPk75wcuzbKzz3Lllv+RKy62zANBgkqhkiG9w0BAQUFAAOCAQEA
- EZV2UGQMYYMuJQELoqqVdyzdUQn6c+UEpurVt85d4bJw7QVygewoctwTS4EFBLnN
- US5BrlRYSZCQrxOM56w7f3xQlM2BxZHVR/oclE0Qq+ThnS9fSRi76wxiz7OeDU3C
- FprTeylrbrsvqPLmhqFe7JfOSYh+eOwfgbH5Q3uoFim13zqEavq2QpaX/9An0y5j
- +lskQCwv1xFCzj4chyBxwdTh9SoAxGHK9BjAtHeoFABHnFhZ1+IvCb2nU9zmbv6H
- CFnoZxzA0nlR5+hc3PM7WD61Xc6O5hhoyeDDB+9tI26TJ87b2B0Cs78nE+JJDwnq
- mNcNCxYluW1T3h3NSdyXkQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dropoff.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Dropbox-Dropoff SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/drupal.dev.ja.net-shibboleth.xml b/swamid-interfederations-2.0/drupal.dev.ja.net-shibboleth.xml
deleted file mode 100644
index 04c54d5c..00000000
--- a/swamid-interfederations-2.0/drupal.dev.ja.net-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://drupal.dev.ja.net/shibboleth">
- <!--
- This is a Janet Community (Dev) Shibboleth 2 SP for JISC Collections and Janet Limited.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-21T16:21:20Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://drupal.dev.ja.net/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://drupal.dev.ja.net/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">The Janet Community (Dev)</mdui:DisplayName>
- <mdui:Description xml:lang="en">The community driven, social business, support, and information website for Janet products and services.</mdui:Description>
- <mdui:Logo height="95" width="191">https://drupal.dev.ja.net/sites/all/themes/jatech/logo.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC+jCCAeKgAwIBAgIJAJLxKkmELD9SMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWRydXBhbC5kZXYuamEubmV0MB4XDTEyMDIxMzEyMDUzNloXDTIyMDIxMDEy
- MDUzNlowHDEaMBgGA1UEAxMRZHJ1cGFsLmRldi5qYS5uZXQwggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDM2S2LJEEg63hCEPNFvKTAfSEp98KJ3iVqtThL
- AFRoTB9FYCWd8ShZZZKpuZbpCQfloGzwQpbY5Hk6GclryaJTOTyEZ/F2Ff0GJYbu
- vb1IJcKtb5gPezjOcxtlzSBchkNz0u123CdoaZ+kH43Gt+aLA+ahGcZNQIr+b6wL
- 1x23iT/+ZMrm+Tss9Ks799t8K49VwrHkXqy6mxFxVJx2uDXnXZD9figqw9qxq+MG
- pKGwWZe6/EDuWNrx5hEvyKOVJZUc3csZFZM4ofFUfCm7Uh/m+Ks4pYKURTvwMblT
- 905mzDd96EunYcZYG+tPSmW9wwSvPnkcnHoyWmbvMWZz9ZqNAgMBAAGjPzA9MBwG
- A1UdEQQVMBOCEWRydXBhbC5kZXYuamEubmV0MB0GA1UdDgQWBBQMvEwrHnK7foBe
- WRYluBhkzi5oJDANBgkqhkiG9w0BAQUFAAOCAQEAUq5613bVSWg2CNaRyo+q4+HX
- U1Kc6kiQ+hHviYULvY5HTnU9SUnJxnPREzGrKxWJomMM8l9NGB5h89AlBn5cNojd
- V2TS3eqjjmHFEckR/9y+j4l2DPkJCbhjsWcAnMYlEC7BTpoK4iQBLis3k4hjQQhw
- sSwbVe3gt8imwSKVOiv+OJWYKUOZ9g68xfS1tQpzNh165cO7hyyH7ORJainH1GbA
- fvrnkGdiK2/MXTNNwa9SIPUJyY3GDZmiz/04sIFABN9vhKN3p5JIFc7VCIFpX7Z4
- 84bxsorZWyjAMMmQTx6v0c/Z69SGAqwv6N+cQvwh/tgrbchVy0cL9IUJ813/kA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal.dev.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal.dev.ja.net/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal.dev.ja.net/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal.dev.ja.net/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal.dev.ja.net/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal.dev.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal.dev.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal.dev.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal.dev.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal.dev.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://drupal.dev.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssodev.dev.ja.net/Shibboleth.sso/SAML2/POST" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssodev.dev.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssodev.dev.ja.net/Shibboleth.sso/SAML2/Artifact" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssodev.dev.ja.net/Shibboleth.sso/SAML2/ECP" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssodev.dev.ja.net/Shibboleth.sso/SAML/POST" index="11"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://drupal.dev.ja.net/Shibboleth.sso/SAML/Artifact" index="12"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">The Janet Community (Dev)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Login Helpdesk</GivenName>
- <EmailAddress>mailto:web-submit@ja.net</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Technical Support</GivenName>
- <EmailAddress>mailto:web-submit@ja.net</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eka-idp.lanet.lv.xml b/swamid-interfederations-2.0/eka-idp.lanet.lv.xml
index e2597c5d..193fcf44 100644
--- a/swamid-interfederations-2.0/eka-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/eka-idp.lanet.lv.xml
@@ -11,7 +11,7 @@
<mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
</mdui:DiscoHints>
<mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Daugavpils University</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">The University College of Economics and Culture</mdui:DisplayName>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/elmo.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/elmo.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index bcd09b02..00000000
--- a/swamid-interfederations-2.0/elmo.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elmo.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Newcastle University English Language Materials Online" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-05T12:02:31Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/ncldur"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAP2gLdgHSWHTMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmRhbnRvb2luZS5jYW1wdXMubmNsLmFjLnVrMB4XDTEwMTIxMDE1MjMxMloX
- DTIwMTIwNzE1MjMxMlowJTEjMCEGA1UEAxMaZGFudG9vaW5lLmNhbXB1cy5uY2wu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC96j7lMubJp+aX
- DqwLGDzxcrm2bxvKU3WjWK91L5rD0P0HYle7yr2VcuXsChz7jyFrMNZ+tCUhfvlA
- gRuhiKjXC9PRDf18NRx43UhPlRnwrvjN5OFhOH1Mvq4QFkpnTtqPHQ5RM7T3+U0l
- /lacgZtzhmXiCbY9KLOF0Qc5iLjD+ISwErSd6N1ovhIyNsZ4/44Cquz0fcFyV1PN
- BIzj1toMubMqStVY98OnKCVIDccOsKeZW7RPevLP4T5uglP88hgiFhN5auJDWy2B
- fm/AA9pjD/u9BsAggdVfrAE0WvatR+a6cpxngNTFjht9UUoxBlUq844RFZBqXf/v
- xLmipJUlAgMBAAGjSDBGMCUGA1UdEQQeMByCGmRhbnRvb2luZS5jYW1wdXMubmNs
- LmFjLnVrMB0GA1UdDgQWBBTHyeqX+oU3dzZx3e1+nYbV7evjejANBgkqhkiG9w0B
- AQUFAAOCAQEAIzxIXH09GMjE+nIpbGIACTI9ERepMQMzNnO+M8JugkhEhrLWXWvu
- XoswtdvxBH3rKMKZp1tJIk7T1toLDn3vCvn60S/6AjzQbyYzQ+qfDBij7X7kBU71
- jlfFn8dFGGcYNdPkl2EjrtWQ/pOTJiJAqal0rPQTcqmrFmi3UeDw+gtncRDIBEGx
- JvjufLt4NSdyg7ZHLLjLv2ntSGPk4ZFLjw0ihpigI6LLzhNv3zxuH/x/y1pIyolC
- MQHLbJL5+WUpb/syt6lRETX5WxKuJHTirlgkjz1edzAPDZ8SIKD3O/TcnKXB/rpF
- HitJuYtcRIR/YxPrydq4GCsFy99FLz336A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elmo.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University English Language Materials Online</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/esc-serv.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/esc-serv.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 40a38a17..00000000
--- a/swamid-interfederations-2.0/esc-serv.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://esc-serv.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth "Newcastle University e-Science Server" SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-27T11:41:42Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3zCCAcegAwIBAgIJAMVIsJKnreSzMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
- BAMTCGVzYy1zZXJ2MB4XDTEyMDkyNTA5NDUzMloXDTIyMDkyMzA5NDUzMlowEzER
- MA8GA1UEAxMIZXNjLXNlcnYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQC+D8lcnkeSFf7hCLwU2f4mkWoeWgHC6zpsPKg7wnvCa/R2KfXRWW/OD5Wz9Q7G
- LMdcdTt9nMZ0AuAs6lUw4l1eCv3pWnjEcNE//Ac4tJby5vzLDK2t080yD8aggRRt
- oq1AuHzUSSkcmuOsrEs7cgKHXgcOdQqLuqcm1SKd065JKp2iQUkCJNzuOCrz2e9T
- XnhAKMyswY3pLpH5sUDiQWT1d4R8By1hlj19YmiLc1zsMwY6O9PnaTXMQzUYaAxy
- /U9d769hB3gIfLtsKtF2qqpPj7hvqDoGmaRUJq6TEqxxx0ehNA1EMlNNjasxaPtc
- fFpiQPtL9/OG7mYYvRNq87YLAgMBAAGjNjA0MBMGA1UdEQQMMAqCCGVzYy1zZXJ2
- MB0GA1UdDgQWBBScrsS2ZGoI41druzqP1facqrB1kDANBgkqhkiG9w0BAQUFAAOC
- AQEAl3t/4DPPmvZNPXStfBLTfYvZBWi3PN2YAxiUJRg+6kYt0mS0JU06nWnlBUc4
- l0hNxXuzOdvKQg+qslc+cM9umtoN9Ob6GqoZcHlQQI1bRNAEk5mPgG4mXAkRBSoi
- 106+qMx6W/L800ktXj8IW1cTEHZBnorlyHDdQOEbjRaPKfMeSwJ9gIhuYDg7Qb5B
- UQ1k7HPH2Ple/G1XnX8CYCMRzHFOem1EPkE9zl611KuK9GR22B/yJV8J+if1nhTB
- iC0S+DlYUSzPqnnFclxXh4T0thXlNuRt3QPG82BQ8XedO4DputK6WlkD3XhGTzgJ
- Z9ZZ9bWU4kfpUUchndkANtEpOQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://esc-serv.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University e-Science Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ezproxy-2.rgu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ezproxy-2.rgu.ac.uk-shibboleth.xml
deleted file mode 100644
index 85ce2435..00000000
--- a/swamid-interfederations-2.0/ezproxy-2.rgu.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ezproxy-2.rgu.ac.uk/shibboleth">
- <!--
- This is an EZproxy SP for The Robert Gordon University.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-26T10:31:15Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ezproxy-2.rgu.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEvTCCA6WgAwIBAgIRAMI6iiSgb2L2Cdwq9tU/hMwwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjAzMjEwMDAwMDBaFw0xNTAzMjEyMzU5NTlaMIGTMQswCQYD
- VQQGEwJHQjEWMBQGA1UECBMNQWJlcmRlZW5zaGlyZTERMA8GA1UEBxMIQWJlcmRl
- ZW4xJTAjBgNVBAoTHFRoZSBSb2JlcnQgR29yZG9uIFVuaXZlcnNpdHkxFDASBgNV
- BAsTC0lUIFNlcnZpY2VzMRwwGgYDVQQDExNlenByb3h5LTIucmd1LmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArY9QIEy5unA3KHTjLCFyPgI0
- 83AuXOUOQ/6Ob9OXk23ZquAI2Nw292WKPMEgAVmh6f8sqGaig7fvPsQikvIgp1+9
- ukensBloiapTma+eWK7AfKFJqJlCZhithnc9yT3YKkl9PLXO9UuMQg8FhRrIUpbV
- csAZkP+TBZn52REA6UexzcbpVf2EtKa+iHOerF1HwYpPbMYrc7zVZXYRUXRgPyQM
- ow/kJw5+/LYSV33a2SU55cSNhhTaUSPxBfYTUn6kwcb/XfYQBtqSNm2kOJnz6Xgm
- NvhceKpPgDjfMF6vm/t3oAsWt5IPusFCG3PcICQI29QdoQ4HHnI+mgLsu7HR2QID
- AQABo4IBZjCCAWIwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYD
- VR0OBBYEFPF+XDHQfeEQrbD/syD08FQmDeLFMA4GA1UdDwEB/wQEAwIFoDAMBgNV
- HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAE
- ETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
- dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1
- BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB4G
- A1UdEQQXMBWCE2V6cHJveHktMi5yZ3UuYWMudWswDQYJKoZIhvcNAQEFBQADggEB
- ALqVQjdOy41Eh+14GxW+1m5WjMAlul/iDpJ5z59XMQpAw08fEQfuc0KsnaTPxcP/
- 07xglpCl74yENorDOpizDxU9Q5AbT6VgaOPA6NzxcSwJ8IEO7QZRiQO45mYWXRMu
- Gj8yFjF0jUjF8aReYBrtlbdp2JcUeRdtMRy6gh8leQS3mNumkRrShn8UjSIJTfi9
- CrTqYRyyB6R73HQZlefLogJby041GJV1/BEfgHHabE4yOzsSbMEb/ESlVEgk9HIt
- 8VE1rUOpBXFaGyGWDbRS3m3FXQ9IaOPw0lLzBnBWCFdf8tgvq0zebq8EowCarUGc
- ceKFjZQfRmUcpaSlZteG+VE=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ezproxy-2.rgu.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ezproxy-2.rgu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ezproxy-2.rgu.ac.uk/Shibboleth.sso/SAML/POST" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ezproxy-2.rgu.ac.uk/Shibboleth.sso/SAML/Artifact" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">The Robert Gordon University</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Robert Gordon University Test ezproxy Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.rgu.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Edward</GivenName>
- <SurName>Alaszewski</SurName>
- <EmailAddress>mailto:e.alaszewski@rgu.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Michael</GivenName>
- <SurName>Cunningham</SurName>
- <EmailAddress>mailto:m.cunningham@rgu.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fedtools.cf.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/fedtools.cf.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index c9f96d29..00000000
--- a/swamid-interfederations-2.0/fedtools.cf.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fedtools.cf.ac.uk/shibboleth-sp">
- <!--
- This is a 'Federation Tools' Shibboleth 2 SP for Cardiff University.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3zCCAcegAwIBAgIJAM7JIonTnUD/MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
- BAMTCGZlZHRvb2xzMB4XDTEwMDkyNzE2MTg1N1oXDTIwMDkyNDE2MTg1N1owEzER
- MA8GA1UEAxMIZmVkdG9vbHMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQDBTpfbTYmveByH8KiblATeku3bT+b3EUzgZsXnBdWQE4xxMzAzlwPxNJ3uC+my
- RRYecSK67BNpJwiBOuPr+6eTEfqXzWff293m+06ID9yLUgsdpOX67O7f1g8UD91d
- AX4B80EYEXTQE4saSaDAQNxm0CuwU47WW00jS2tcU417UhC9MoeMAtlb/p+ECwny
- u0iFN9RoV/v6kZPlMuT5VZDwOFuLDVEb8Ll9s2KyjpUhGe00xUDBDHxt4Lm6O9Ad
- NFqDr5N9H0JO+qmeagoCaGtviMlbge+Q007bZ0KeM81zQxVT2Yq4Cwwxm7z4qSHl
- rc+WIUiK2DvdlZcYWTNX4s0BAgMBAAGjNjA0MBMGA1UdEQQMMAqCCGZlZHRvb2xz
- MB0GA1UdDgQWBBQjISCYWz+rWados9I6hRdv/JSrIzANBgkqhkiG9w0BAQUFAAOC
- AQEAfmvxqbE6efg5Ea4grtyzkialbBCxO7uxRdqlxcZ0zrdVmEVCPBiJ2rHEdYVM
- vI+Krfk6J0rWpAXTRE/9+nZUoVtfZu3lU0Y8mBZNPTiiBDGcJSfnfRdM3j2kT7py
- HGRte1eAVYOXqiSapv1qPG72DE6Q8tkK0XFmHoUQ6ZAuHpp/71CZ5FX7MIVIw15o
- 5Ft+07DPMdrf8AmJmot3Durqm/syDwJRVgShIRf9U423lZxKiheny5XUMfFI53rj
- dApJFiqYGBbYRlsJVDkYvokzrEsbJqqKrUk+M/ii5VGRiFwLHMcXExz4Vt1LfpOY
- Il3BKT36TIRcwrFZsRMxa2ImuQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3zCCAcegAwIBAgIJAM7JIonTnUD/MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
- BAMTCGZlZHRvb2xzMB4XDTEwMDkyNzE2MTg1N1oXDTIwMDkyNDE2MTg1N1owEzER
- MA8GA1UEAxMIZmVkdG9vbHMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQDBTpfbTYmveByH8KiblATeku3bT+b3EUzgZsXnBdWQE4xxMzAzlwPxNJ3uC+my
- RRYecSK67BNpJwiBOuPr+6eTEfqXzWff293m+06ID9yLUgsdpOX67O7f1g8UD91d
- AX4B80EYEXTQE4saSaDAQNxm0CuwU47WW00jS2tcU417UhC9MoeMAtlb/p+ECwny
- u0iFN9RoV/v6kZPlMuT5VZDwOFuLDVEb8Ll9s2KyjpUhGe00xUDBDHxt4Lm6O9Ad
- NFqDr5N9H0JO+qmeagoCaGtviMlbge+Q007bZ0KeM81zQxVT2Yq4Cwwxm7z4qSHl
- rc+WIUiK2DvdlZcYWTNX4s0BAgMBAAGjNjA0MBMGA1UdEQQMMAqCCGZlZHRvb2xz
- MB0GA1UdDgQWBBQjISCYWz+rWados9I6hRdv/JSrIzANBgkqhkiG9w0BAQUFAAOC
- AQEAfmvxqbE6efg5Ea4grtyzkialbBCxO7uxRdqlxcZ0zrdVmEVCPBiJ2rHEdYVM
- vI+Krfk6J0rWpAXTRE/9+nZUoVtfZu3lU0Y8mBZNPTiiBDGcJSfnfRdM3j2kT7py
- HGRte1eAVYOXqiSapv1qPG72DE6Q8tkK0XFmHoUQ6ZAuHpp/71CZ5FX7MIVIw15o
- 5Ft+07DPMdrf8AmJmot3Durqm/syDwJRVgShIRf9U423lZxKiheny5XUMfFI53rj
- dApJFiqYGBbYRlsJVDkYvokzrEsbJqqKrUk+M/ii5VGRiFwLHMcXExz4Vt1LfpOY
- Il3BKT36TIRcwrFZsRMxa2ImuQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fedtools.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Cardiff University: Federation Tools provided as-is (1)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://iam.cardiff.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Rhys</GivenName>
- <SurName>Smith</SurName>
- <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rhys</GivenName>
- <SurName>Smith</SurName>
- <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fedtools.cf.ac.uk-simplesamlphp-sp.xml b/swamid-interfederations-2.0/fedtools.cf.ac.uk-simplesamlphp-sp.xml
deleted file mode 100644
index ed4475f8..00000000
--- a/swamid-interfederations-2.0/fedtools.cf.ac.uk-simplesamlphp-sp.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fedtools.cf.ac.uk/simplesamlphp-sp">
- <!--
- This is a simpleSAMLphp SP for Cardiff University.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEgzCCA2ugAwIBAgIJAIuN3Z7UnrWhMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
- VQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxGzAZBgNV
- BAoTEkNhcmRpZmYgVW5pdmVyc2l0eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2Vy
- dmljZXMxGjAYBgNVBAMTEWZlZHRvb2xzLmNmLmFjLnVrMB4XDTEwMDkyOTE1MjYy
- NloXDTMwMDkyNDE1MjYyNlowgYcxCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVXYWxl
- czEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UEChMSQ2FyZGlmZiBVbml2ZXJzaXR5
- MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEaMBgGA1UEAxMRZmVkdG9v
- bHMuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD51CM
- 59johJT4Qynp/jMDPHtorlgzj29UYHX9qF44Cb8V9nmwixQyiPS61lU60bzJi6qi
- 5zEaiGKbyv9BPHyc/BcHx5HlkW7mZt+7yW7OCAh+Lhvb/ErJwbz8mu/i20Usmhe0
- 51gve3ZBepWX4N/0AO1l3FbGi5uAEdYbHI5SHXzYCcqr4kU9KdtbrNMKguftGmJB
- u0ip90sUjkgyjLilagGLJVoKPhHzkTwVWooE4OMcfFeuskyI6akqinm9OQ8Vbo1H
- s6ZrucjmvlqTNQXna8p1xpOM8AbUO+BmcCaKoUAHNHVTmH26ZM2M6pEyPT4JBMf+
- x6FLk6vGmGo+//QVAgMBAAGjge8wgewwHQYDVR0OBBYEFGCd0N5Uv5KJ2I5W75tW
- e2vi+nS5MIG8BgNVHSMEgbQwgbGAFGCd0N5Uv5KJ2I5W75tWe2vi+nS5oYGNpIGK
- MIGHMQswCQYDVQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRp
- ZmYxGzAZBgNVBAoTEkNhcmRpZmYgVW5pdmVyc2l0eTEdMBsGA1UECxMUSW5mb3Jt
- YXRpb24gU2VydmljZXMxGjAYBgNVBAMTEWZlZHRvb2xzLmNmLmFjLnVrggkAi43d
- ntSetaEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAICI2/X4Lo4CN
- ISgB5QrlNM+imqiX4nL6JRwJCb7tlwUJee38/pW7CnuHQsjNxVAkOdbGRibEBmZJ
- rPVFgTzIICjZalNrfFnQFNonADfmmi3NkKTxEq9oYQBEmPTaSHouaFQxFn5VznyV
- fIEI5NmSG9bFGmgM/kajj+DCy1/w6fzfmNadjMuzHFps1hWtPS0rLz7gprX6SMUq
- ybXLlrXtlH6fADD+EvTUvM1kz39xNCDUHqKHm9K4KK4KrqDc4Bf8lhLfui7XRSuJ
- FogK4w7sK5tExHqgMe+svIkbrrSY74JJAcEqOXJCYJSh49xVzjjMUAgWvVYyqAcl
- uEKwDiCyiQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEgzCCA2ugAwIBAgIJAIuN3Z7UnrWhMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
- VQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxGzAZBgNV
- BAoTEkNhcmRpZmYgVW5pdmVyc2l0eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2Vy
- dmljZXMxGjAYBgNVBAMTEWZlZHRvb2xzLmNmLmFjLnVrMB4XDTEwMDkyOTE1MjYy
- NloXDTMwMDkyNDE1MjYyNlowgYcxCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVXYWxl
- czEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UEChMSQ2FyZGlmZiBVbml2ZXJzaXR5
- MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEaMBgGA1UEAxMRZmVkdG9v
- bHMuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD51CM
- 59johJT4Qynp/jMDPHtorlgzj29UYHX9qF44Cb8V9nmwixQyiPS61lU60bzJi6qi
- 5zEaiGKbyv9BPHyc/BcHx5HlkW7mZt+7yW7OCAh+Lhvb/ErJwbz8mu/i20Usmhe0
- 51gve3ZBepWX4N/0AO1l3FbGi5uAEdYbHI5SHXzYCcqr4kU9KdtbrNMKguftGmJB
- u0ip90sUjkgyjLilagGLJVoKPhHzkTwVWooE4OMcfFeuskyI6akqinm9OQ8Vbo1H
- s6ZrucjmvlqTNQXna8p1xpOM8AbUO+BmcCaKoUAHNHVTmH26ZM2M6pEyPT4JBMf+
- x6FLk6vGmGo+//QVAgMBAAGjge8wgewwHQYDVR0OBBYEFGCd0N5Uv5KJ2I5W75tW
- e2vi+nS5MIG8BgNVHSMEgbQwgbGAFGCd0N5Uv5KJ2I5W75tWe2vi+nS5oYGNpIGK
- MIGHMQswCQYDVQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRp
- ZmYxGzAZBgNVBAoTEkNhcmRpZmYgVW5pdmVyc2l0eTEdMBsGA1UECxMUSW5mb3Jt
- YXRpb24gU2VydmljZXMxGjAYBgNVBAMTEWZlZHRvb2xzLmNmLmFjLnVrggkAi43d
- ntSetaEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAICI2/X4Lo4CN
- ISgB5QrlNM+imqiX4nL6JRwJCb7tlwUJee38/pW7CnuHQsjNxVAkOdbGRibEBmZJ
- rPVFgTzIICjZalNrfFnQFNonADfmmi3NkKTxEq9oYQBEmPTaSHouaFQxFn5VznyV
- fIEI5NmSG9bFGmgM/kajj+DCy1/w6fzfmNadjMuzHFps1hWtPS0rLz7gprX6SMUq
- ybXLlrXtlH6fADD+EvTUvM1kz39xNCDUHqKHm9K4KK4KrqDc4Bf8lhLfui7XRSuJ
- FogK4w7sK5tExHqgMe+svIkbrrSY74JJAcEqOXJCYJSh49xVzjjMUAgWvVYyqAcl
- uEKwDiCyiQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fedtools.cf.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fedtools.cf.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fedtools.cf.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fedtools.cf.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fedtools.cf.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Cardiff University: Federation Tools provided as-is (2)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://iam.cardiff.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Rhys</GivenName>
- <SurName>Smith</SurName>
- <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rhys</GivenName>
- <SurName>Smith</SurName>
- <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fieldtrial.webfiltering.ja.net-shibboleth-sp.xml b/swamid-interfederations-2.0/fieldtrial.webfiltering.ja.net-shibboleth-sp.xml
deleted file mode 100644
index 554ea84b..00000000
--- a/swamid-interfederations-2.0/fieldtrial.webfiltering.ja.net-shibboleth-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fieldtrial.webfiltering.ja.net/shibboleth-sp">
- <!--
- This is a Shibboleth 2.3.1 'Safetynet JANET Field Trial' SP owned by RM Education plc.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJALB0hSzEevYIMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFnNuZnR3ZWIwMS5pZGV2LmlmbC5uZXQwHhcNMTAwMjE5MTMyODQ2WhcNMjAw
- MjE3MTMyODQ2WjAhMR8wHQYDVQQDExZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Cu9o/6D/wmBP45C/0SSxgPv
- MuYMz8MwX/HJFP2+W4ADHmQhb4DL9x0kxF5ESuy26jCdtB4aUSl1BIi0qNhQ363t
- sPMrD19R3xgZ1plxt+A9Y6VkkB+lO8A2WFpuwmI+pl7mP8jLvBKgG0g1oxLIqFZS
- 0S9Q7c4Fn9zQTcCNBiirlfTMXggVvASHfpqFIVe+NF5BWrGZqJ7RiPIB4ZnkR1AZ
- ZNVpu5BsoZdpX601qTf6kT2xDuObdjmWvZWG+Z7VfiRts3lWStSHJe1RoN7nQBQt
- byBkOzLT/41IrlpJYzzRgfBc0zV+WvMlxqz7rvmNQAPwfEm2bIUrCRRXrDPTHQID
- AQABo0QwQjAhBgNVHREEGjAYghZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MB0GA1Ud
- DgQWBBTpdGvCZNgsXYU87SWVZdDvBacV3jANBgkqhkiG9w0BAQUFAAOCAQEANeg4
- Io4/wYni0tlCN7ObChWNEEb7yuWOA8hKqrxHw0KowzlwY6aXa+cAoibNs8nU2Vfg
- aeJCm1z87cz/HtvzRtMRW/ddjS/cTbZPzWu8p9EADOGEOGTkofXnJZqFSdCCeFOy
- 78yqS1GCf3hm7Qvj3hhJ8Wbz+jFX0BEjR3kjxMgFCDXz/a0iohCbfFY5ZiByIIHZ
- rNaIlPACPcHWrUIOzukV7ZeN+wlxbNhm5aXHiEWC6xSLSRHTDYMNhoac/1wEjU9Z
- zz1XVHG0KovZIi9psy0ehbjZyjupNcsIGjY/flxs6qLNoD1gNxDkJ+2qt+NMZMGJ
- pEJ7l2rYmZM+/vn4aw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJALB0hSzEevYIMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFnNuZnR3ZWIwMS5pZGV2LmlmbC5uZXQwHhcNMTAwMjE5MTMyODQ2WhcNMjAw
- MjE3MTMyODQ2WjAhMR8wHQYDVQQDExZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Cu9o/6D/wmBP45C/0SSxgPv
- MuYMz8MwX/HJFP2+W4ADHmQhb4DL9x0kxF5ESuy26jCdtB4aUSl1BIi0qNhQ363t
- sPMrD19R3xgZ1plxt+A9Y6VkkB+lO8A2WFpuwmI+pl7mP8jLvBKgG0g1oxLIqFZS
- 0S9Q7c4Fn9zQTcCNBiirlfTMXggVvASHfpqFIVe+NF5BWrGZqJ7RiPIB4ZnkR1AZ
- ZNVpu5BsoZdpX601qTf6kT2xDuObdjmWvZWG+Z7VfiRts3lWStSHJe1RoN7nQBQt
- byBkOzLT/41IrlpJYzzRgfBc0zV+WvMlxqz7rvmNQAPwfEm2bIUrCRRXrDPTHQID
- AQABo0QwQjAhBgNVHREEGjAYghZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MB0GA1Ud
- DgQWBBTpdGvCZNgsXYU87SWVZdDvBacV3jANBgkqhkiG9w0BAQUFAAOCAQEANeg4
- Io4/wYni0tlCN7ObChWNEEb7yuWOA8hKqrxHw0KowzlwY6aXa+cAoibNs8nU2Vfg
- aeJCm1z87cz/HtvzRtMRW/ddjS/cTbZPzWu8p9EADOGEOGTkofXnJZqFSdCCeFOy
- 78yqS1GCf3hm7Qvj3hhJ8Wbz+jFX0BEjR3kjxMgFCDXz/a0iohCbfFY5ZiByIIHZ
- rNaIlPACPcHWrUIOzukV7ZeN+wlxbNhm5aXHiEWC6xSLSRHTDYMNhoac/1wEjU9Z
- zz1XVHG0KovZIi9psy0ehbjZyjupNcsIGjY/flxs6qLNoD1gNxDkJ+2qt+NMZMGJ
- pEJ7l2rYmZM+/vn4aw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fieldtrial.webfiltering.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">RM Education plc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">RM Education plc: Safetynet JANET Field Trial</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.rm.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Shibboleth Technical Contact</GivenName>
- <EmailAddress>mailto:shibtechcontact@ifl.net</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Shibboleth Technical Contact</GivenName>
- <EmailAddress>mailto:shibtechcontact@ifl.net</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml
index e1f55d81..89083ca3 100644
--- a/swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml
@@ -3,7 +3,6 @@
<md:Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/foreman.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/foreman.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 7c9960e9..00000000
--- a/swamid-interfederations-2.0/foreman.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foreman.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Foreman Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-10T12:14:37Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAISqqY+qU29kMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB2ZvcmVtYW4wHhcNMTQwNDA5MTQ0MzA0WhcNMjQwNDA2MTQ0MzA0WjASMRAw
- DgYDVQQDEwdmb3JlbWFuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- yX3uGRiFRhaeh6l3ibzhHcSC25iKJ8Hm+9+OgrmgFlVgMfRz9+bIyFOZVJnV2fjD
- qu34FwxIpWA1qRikI2anVILFkT9hbCF8eOqzHDF6zkBB3hBIlnvCP21mPFU9DbmG
- 66xTOVxIOmY+RAS7GP2ye/lBYbO611FmAx2pjfPTiwNqS1aDLL2ZUc0IhvzfIV4V
- N2SDXzz3VXtls1drCv7YW710Lh0p8x0uBJlS599Ic+FRfu4ufylBO39mp9ymj0kl
- wsoq58+XPcyQtiGpD59NYxMluF5z2LAK0rZnn2Ssu37HQWo12zEP2YiZbjxM1g7h
- Fvg21ge257iTJYkugMYwEwIDAQABozUwMzASBgNVHREECzAJggdmb3JlbWFuMB0G
- A1UdDgQWBBRa3xvcwJCSI7wNVlajZWgNcDLKmTANBgkqhkiG9w0BAQUFAAOCAQEA
- iEmIP4r2YYcSmsPmvY3bpebIyPJvxr8AsO5CANIf/sZYTN8VbshAkhMpGahJrcWY
- Ece+VkYWV7AA9gqZXFJrsbe/rQi22wLhV0yTEPTS8bSuu1LEqrdnPlvRoQkACM+y
- XEvdBYmxLmnPmvJPNcoVkLTGpyYvcRrOUqkygJhA31CJNg2izBFfYOYt2g9V3Tyh
- 9/ADo9uD5HnnJtnXAS0gTpLhTzuGLAOvA8wn4nnUCVfT0pRgsXc33/n1b8+B+0Wv
- wpQhvJBL4Lhu39Bh22VWjNZXgBm0IVKzG33inRJnKIY1WIoVZ260+bRCWLcoYiwF
- 2DKbsuj2dovpBHbgRHH24Q==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://foreman.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Foreman Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/forms-dev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/forms-dev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index fe6e220f..00000000
--- a/swamid-interfederations-2.0/forms-dev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://forms-dev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth Development Forms Server SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-13T13:26:48Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/shibboleth-idp/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/DS"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC5TCCAc2gAwIBAgIJAMCDExtu7iZjMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
- BAMTCmNvbGxhYi1kZXYwHhcNMTIwMzEzMTExMzE2WhcNMjIwMzExMTExMzE2WjAV
- MRMwEQYDVQQDEwpjb2xsYWItZGV2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAx6X3S+oYfn2YSI/OR9uLR4PkpUSFSRYaUXwB9/qq5LZfBQ9vf54ubgCG
- 8v4/+bmXNAdhSFDiB5ZDG/vh0DBCSqDju9YLfriqB0SEg9NM4Tl14IWQTd6Tt0fq
- muVyyb1hopJiIgFIBCBvB9TF/S43m+S/KzE9PDNuQFrWE7gbrU9NmWqkeOTXPWD2
- bD1i8K/luXUzlTcYjgd3nDzPTuYnI0lVEjeEXx/EdHSjcrRTBNB8lw+fAvuzXPA3
- hksi8NG55oRCZ7i/B7LucH3AFk+2IzYzMOFaD48kxygDYmDrepzs9epCP07OlUO1
- hTDcqI745nD+ZJnmim+d+725G5pkLQIDAQABozgwNjAVBgNVHREEDjAMggpjb2xs
- YWItZGV2MB0GA1UdDgQWBBTFBhTBb9MapkrYomNWn6Nn17gdoTANBgkqhkiG9w0B
- AQUFAAOCAQEAeP8Ms6fAFMa15YzIErXxCY2Vy78JgQgxcNZGyX4kleRHRSy0eBOX
- 7OoN1uF+7jK5zMtDXUaKjDpVScUmTXJssgnY75ss8fiBisTBSZde4IjpMAesC847
- SXCNtcUbNHOR6Em5GbG0PxmujhJFRdPJnucIz5mQBh4aWfOPiH9vqEUUCuJHA0W7
- QTX6rPX77V3HUD+0AqqeSkzztQjn11p5sA3v6jy/C03Ojqkycv/jDbejikkKes0Z
- fnhu5KIz7FGX3XA7J04jvTmuP3/6pFtPIysUkvOCGo9zAlnVDHFxv6fpNhBtQHvP
- +WlS5JLB3SQOMYzE+Xhf9qg1MlIvxis5kQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forms-dev.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Development Forms Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/forms.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/forms.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 2b4d6a56..00000000
--- a/swamid-interfederations-2.0/forms.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://forms.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Form Builder" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-27T15:13:59Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forms.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://forms.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://forms.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forms.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forms.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://forms.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://forms.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forms.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forms.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forms.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forms.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forms.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forms.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forms.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forms.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Form Builder SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
index 897b6039..a5722f1e 100644
--- a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://geoshibb.edina.ac.uk/shibboleth">
<!--
- This is a service provider for Edina Digimap (live)
+ This is an "EDINA: Digimap (live)" Shibboleth SP for the University of Edinburgh.
-->
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-04-24T16:39:26Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
@@ -46,8 +48,6 @@
</ds:KeyInfo>
</KeyDescriptor>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://geoshibb.edina.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://geoshibb.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="3"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="4"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="5"/>
diff --git a/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
index 0eb8734c..037a82ef 100644
--- a/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
@@ -3,7 +3,6 @@
<md:Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/groups-dev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/groups-dev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index ba55e700..00000000
--- a/swamid-interfederations-2.0/groups-dev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://groups-dev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/shibboleth-idp/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/DS"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC5TCCAc2gAwIBAgIJAI6cbw7Z9xIXMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
- BAMTCmdyb3Vwcy1kZXYwHhcNMTExMTIxMTQzMDUzWhcNMjExMTE4MTQzMDUzWjAV
- MRMwEQYDVQQDEwpncm91cHMtZGV2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAtz7ogdi7O6I272pM/8hWrVDkO0K6riT4NiOiSq0c3oDCG4fs9yKzxxD2
- zR94nCI7z9PEXKUNIaAHL5bw+xVPAbWlL7o4rQ5bsWtmWBpUtPlrqqVU/+0lw2kV
- sCNeIaYWfHlVigIiSc/ZS1vz6GIhU1kdJpqO8FpgFug9i6vFnxKOl5WMZvHFiY9B
- wz2zbg7XrG3PihyB14kupOKE6pscwEWYlcWrdY5/BCzDWKbeiCiRokVrktyU7p+F
- McoVABwqh19pfprTYAPvQ5ulsjSSFfynA9XGt8V/GtqqsRZuNZhFQaGtR4xZF1Ht
- 56PKxH36pVciE5cfYp67fu/CUhFFEwIDAQABozgwNjAVBgNVHREEDjAMggpncm91
- cHMtZGV2MB0GA1UdDgQWBBSKWvr1QmFokRIdJg/3DJK/ThXgvDANBgkqhkiG9w0B
- AQUFAAOCAQEAg18dOY+Ukif5ygB22fMK4um4lYvdtm4b5iZW1QrsgVW5qseWO/1x
- Hq1vdNCKdsCs9oQxgm7pedYH9S/SS/BdssjemuvjByN+VX8sMhW7BXar8cV0b75U
- 4+AiRoLfXgX2Eh1x0zIRhwxpLgEekNwr9dUN9LCjvMTVe26NhRpsnT7N+rnGZO4o
- oQe+8pE79ftgtY0dg5hneCudECeTQKXby7VyZGcFNiStnmQKrF79XmA58VoaBfpw
- lPVrm52vp6xbF91PAGawPCwsknFM6SiHYGneXbdxjn3xshmtJD4FA8Vsb4JDK7nt
- Jzd5lGEkrN653r2PMWIVKvwGWNsoQ/ut5A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://groups-dev.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Newcastle upon Tyne: Grouper DEV sp</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/groups.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/groups.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 94969fb3..00000000
--- a/swamid-interfederations-2.0/groups.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://groups.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 "Group Management" SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://groups.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC2TCCAcGgAwIBAgIJAMvAafe25UenMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
- BAMTBmNvdHRvbjAeFw0xMDA3MjExNTA2MzNaFw0yMDA3MTgxNTA2MzNaMBExDzAN
- BgNVBAMTBmNvdHRvbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANj7
- ORQG3JYi9FTt1WSVwPM7Oh7yR3mUeRU2Pm3YG4EG/WLhndD/B0KJW2sL6wwxuAGM
- 0oyIY2E8Y0iXExwUr9gqWTaV9V7oCt3gKFSsSbWLcNjq5if6Q6jfkMV0MPhWHOvm
- kVScH2WzMzqdnvV8PKvO/Uud1OGzmA/lZvA/oelXw3C0Xn8S6iTY71oS/B5FV5dQ
- lmNehcfZherne59N2vieZbZZYano2K43kSlS/UX6REESVWAcGZ7yCOux43ZYE188
- vC9+gAB8/EBs/AvvRkNQjr8aRI3fTaG8mGioi5xVnDwuKeR9Hj2ja5JKZjJKZI5c
- urcZLMFLSUXWzAafhh0CAwEAAaM0MDIwEQYDVR0RBAowCIIGY290dG9uMB0GA1Ud
- DgQWBBR9kyoiSimRNByaUE6PAhAY7dSSNzANBgkqhkiG9w0BAQUFAAOCAQEAJS/O
- I4uCyMs7BJ/gn/K9BzfBHazAWCyQ6k8Nx/iwEJupqvSAMQwyDRXeSH9S5I4KHuWX
- uANSzmAWnAxgbLep7AaXLbZNgi16K+yoGc8cujCWVXo6Ow+2yt6PA1+KG83m7pVF
- wm/BT1I0E0lZAHdDPMT9OQaS9tpibJwLLTTLMFUUtVeKgA3nGnWJQKm3se0pTGLk
- dYp3u7VMxzi7ByFQ7DKQTLINnZLrsBYc/zutbEceMLA9yiM5Y5yMtfM5NTY2rq3Z
- foRLZIsE419YpZJhIZFMRkctG5v4cb52Axvs3yeGN+0N3zEDJKUSKfHm00MvnbzQ
- LTu/0W+DC4osOO/URA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC2TCCAcGgAwIBAgIJAMvAafe25UenMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
- BAMTBmNvdHRvbjAeFw0xMDA3MjExNTA2MzNaFw0yMDA3MTgxNTA2MzNaMBExDzAN
- BgNVBAMTBmNvdHRvbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANj7
- ORQG3JYi9FTt1WSVwPM7Oh7yR3mUeRU2Pm3YG4EG/WLhndD/B0KJW2sL6wwxuAGM
- 0oyIY2E8Y0iXExwUr9gqWTaV9V7oCt3gKFSsSbWLcNjq5if6Q6jfkMV0MPhWHOvm
- kVScH2WzMzqdnvV8PKvO/Uud1OGzmA/lZvA/oelXw3C0Xn8S6iTY71oS/B5FV5dQ
- lmNehcfZherne59N2vieZbZZYano2K43kSlS/UX6REESVWAcGZ7yCOux43ZYE188
- vC9+gAB8/EBs/AvvRkNQjr8aRI3fTaG8mGioi5xVnDwuKeR9Hj2ja5JKZjJKZI5c
- urcZLMFLSUXWzAafhh0CAwEAAaM0MDIwEQYDVR0RBAowCIIGY290dG9uMB0GA1Ud
- DgQWBBR9kyoiSimRNByaUE6PAhAY7dSSNzANBgkqhkiG9w0BAQUFAAOCAQEAJS/O
- I4uCyMs7BJ/gn/K9BzfBHazAWCyQ6k8Nx/iwEJupqvSAMQwyDRXeSH9S5I4KHuWX
- uANSzmAWnAxgbLep7AaXLbZNgi16K+yoGc8cujCWVXo6Ow+2yt6PA1+KG83m7pVF
- wm/BT1I0E0lZAHdDPMT9OQaS9tpibJwLLTTLMFUUtVeKgA3nGnWJQKm3se0pTGLk
- dYp3u7VMxzi7ByFQ7DKQTLINnZLrsBYc/zutbEceMLA9yiM5Y5yMtfM5NTY2rq3Z
- foRLZIsE419YpZJhIZFMRkctG5v4cb52Axvs3yeGN+0N3zEDJKUSKfHm00MvnbzQ
- LTu/0W+DC4osOO/URA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://groups.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://groups.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groups.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://groups.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://groups.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://groups.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groups.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://groups.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groups.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://groups.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://groups.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://groups.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groups.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://groups.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Group Management SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml
index 112a39ae..859e32af 100644
--- a/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml
@@ -3,7 +3,6 @@
<md:Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
index 0a5e174b..3fb0dd9c 100644
--- a/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
@@ -3,7 +3,6 @@
<md:Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
index d8c088c4..c1aef287 100644
--- a/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
@@ -3,7 +3,6 @@
<md:Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/halists.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/halists.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 104523bc..00000000
--- a/swamid-interfederations-2.0/halists.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://halists.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2.3.1 SP for Newcastle University's HA Lists Server.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://halists.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC5TCCAc2gAwIBAgIJALPnvwUK3LYlMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
- BAMTCmlzc21sbS1kYngwHhcNMDkxMTExMTQwOTA4WhcNMTkxMTA5MTQwOTA4WjAV
- MRMwEQYDVQQDEwppc3NtbG0tZGJ4MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEA8I8lwx8UfEt5nvfLeiTwA9pAxsN+0OSPdOwuVRRWi4M9500zNmAXuddD
- ULzdgeAS98zYpFVLJI0ysZwzr7Nx0caPNF69pgTnB2Bo2RUZsozC24MkImBBshnP
- sSs3OP6/0ocrFDrNEFKj+93emceW6u5RtyOXeWf0sdC7spW+/mAiHfqJCRmGfR6d
- boCZFN8g0LOoNyjb9DqovluyZ99BRsSunrlLP9bz/sOCRGchWz2cfn60klCPr1wF
- iB2ATU65VfVm4c3R0LKbPPV84DgxJA3KNSE+kCEwjum8E6X2Loc9/XSEnyeCRcFO
- N/wquM7wGrJ0Z1EHvxXdu2yqGQsUEQIDAQABozgwNjAVBgNVHREEDjAMggppc3Nt
- bG0tZGJ4MB0GA1UdDgQWBBR92iWgkbQtLBfItmwh8t7o0Om54jANBgkqhkiG9w0B
- AQUFAAOCAQEADZNr2JtFCaa2uXClEq5IjLdrx+0V8DiNds8uRZjzJWxOBtu8sxmG
- iHZ2G60m/qSz4lP3RxS9GEmB1tqF7ckLmPC1DwDPVC8r2peOekcVirt0wPzRFR5G
- iFidfHbysL487dY5WtFEaqSFiqYA7LC4mmu12QLrbWvs5UpkpCksqT8eKnChiQO2
- L2jYICDWSXySOh3A/XvtBFLM3njyAgnhViIDVFWo19BUA8tTxwy/mugYNpLmAOLI
- ZGQyUie+dSx/hiE8kdUs/J3Vr78s9IsMO0iEipG1Y0ZJaamnhybzjjne9/qrmBHM
- qXhJNRCw9fxvJHafpXhUDKyNN3KQzmC5zg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC5TCCAc2gAwIBAgIJALPnvwUK3LYlMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
- BAMTCmlzc21sbS1kYngwHhcNMDkxMTExMTQwOTA4WhcNMTkxMTA5MTQwOTA4WjAV
- MRMwEQYDVQQDEwppc3NtbG0tZGJ4MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEA8I8lwx8UfEt5nvfLeiTwA9pAxsN+0OSPdOwuVRRWi4M9500zNmAXuddD
- ULzdgeAS98zYpFVLJI0ysZwzr7Nx0caPNF69pgTnB2Bo2RUZsozC24MkImBBshnP
- sSs3OP6/0ocrFDrNEFKj+93emceW6u5RtyOXeWf0sdC7spW+/mAiHfqJCRmGfR6d
- boCZFN8g0LOoNyjb9DqovluyZ99BRsSunrlLP9bz/sOCRGchWz2cfn60klCPr1wF
- iB2ATU65VfVm4c3R0LKbPPV84DgxJA3KNSE+kCEwjum8E6X2Loc9/XSEnyeCRcFO
- N/wquM7wGrJ0Z1EHvxXdu2yqGQsUEQIDAQABozgwNjAVBgNVHREEDjAMggppc3Nt
- bG0tZGJ4MB0GA1UdDgQWBBR92iWgkbQtLBfItmwh8t7o0Om54jANBgkqhkiG9w0B
- AQUFAAOCAQEADZNr2JtFCaa2uXClEq5IjLdrx+0V8DiNds8uRZjzJWxOBtu8sxmG
- iHZ2G60m/qSz4lP3RxS9GEmB1tqF7ckLmPC1DwDPVC8r2peOekcVirt0wPzRFR5G
- iFidfHbysL487dY5WtFEaqSFiqYA7LC4mmu12QLrbWvs5UpkpCksqT8eKnChiQO2
- L2jYICDWSXySOh3A/XvtBFLM3njyAgnhViIDVFWo19BUA8tTxwy/mugYNpLmAOLI
- ZGQyUie+dSx/hiE8kdUs/J3Vr78s9IsMO0iEipG1Y0ZJaamnhybzjjne9/qrmBHM
- qXhJNRCw9fxvJHafpXhUDKyNN3KQzmC5zg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halists.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halists.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halists.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halists.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halists.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halists.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halists.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halists.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halists.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://halists.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halists.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halists.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halists.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halists.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University HA Lists Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Gavin</GivenName>
- <SurName>Younger</SurName>
- <EmailAddress>mailto:gavin.younger@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/heinonline.org-entity.xml b/swamid-interfederations-2.0/heinonline.org-entity.xml
index eb09bfe6..db1db0c2 100644
--- a/swamid-interfederations-2.0/heinonline.org-entity.xml
+++ b/swamid-interfederations-2.0/heinonline.org-entity.xml
@@ -4,9 +4,17 @@
This is an OpenAthens SP for William S. Hein & Co., Inc.
-->
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-21T15:27:59Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</Extensions>
- <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">HeinOnline</mdui:DisplayName>
+ <mdui:Description xml:lang="en">The World's Largest Image-based Legal Research Database</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -66,9 +74,7 @@
</ds:KeyInfo>
</KeyDescriptor>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://heinonline.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://heinonline.org/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://heinonline.org/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://heinonline.org/oa/auth/rcv/saml2/art" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://heinonline.org/oa/auth/rcv/saml2/post" index="2"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">William S. Hein &amp; Co., Inc.</OrganizationName>
@@ -84,4 +90,14 @@
<SurName>Marisa</SurName>
<EmailAddress>mailto:rjm2@cornell.edu</EmailAddress>
</ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Adam</GivenName>
+ <SurName>Tramp</SurName>
+ <EmailAddress>mailto:atramp@wshein.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Kyle</GivenName>
+ <SurName>Daving</SurName>
+ <EmailAddress>mailto:kdaving@wshein.com</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
index 76965251..89005b36 100644
--- a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
@@ -63,7 +63,6 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">11sola.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossvj.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osormoz.si</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-secovlje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskolezija.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abesednjak.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrojica.si</shibmd:Scope>
@@ -255,6 +254,8 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mg-lj.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospodzemelj.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os4ms.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossecovlje.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grm-nm.si</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
<mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
diff --git a/swamid-interfederations-2.0/idp.approval.glowscotland.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.approval.glowscotland.org.uk-idp-shibboleth.xml
deleted file mode 100644
index 9fedf552..00000000
--- a/swamid-interfederations-2.0/idp.approval.glowscotland.org.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.approval.glowscotland.org.uk/idp/shibboleth">
- <!--
- This is a Shibboleth 2 'approval' IdP for Glow Scotland, owned by RM Education plc.
- -->
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">approval.glowscotland.org.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFyTCCBLGgAwIBAgIQNVv6vCdm+B2Ww8ov2gDvJDANBgkqhkiG9w0BAQUFADCB
- tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
- ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
- YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
- VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwOTI2
- MDAwMDAwWhcNMTYxMDEyMjM1OTU5WjCB9jELMAkGA1UEBhMCR0IxFDASBgNVBAgT
- C094Zm9yZHNoaXJlMREwDwYDVQQHFAhBYmluZ2RvbjEPMA0GA1UEChQGUk0gUExD
- MTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3LnZlcmlzaWduLmNvLnVrL3Jw
- YSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRlZCBieSBWZXJpU2lnbjEnMCUG
- A1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMSkwJwYDVQQDFCBp
- ZHAuYXBwcm92YWwuZ2xvd3Njb3RsYW5kLm9yZy51azCCASIwDQYJKoZIhvcNAQEB
- BQADggEPADCCAQoCggEBANV/QA/Q/7h32gu4dBR2VSyC65H3fmk87UIVRT6CHAG8
- UScEalaWYMbjdNJoGA/w4uywYvxbrZEDHq+b/a/s3mZXs19HjeRzOpw8UqLRRNei
- Yu7EIppfjCXXliWskYZ4DN9CMv9d0G8nuhH1hZm9DLCVXvsRmvu/qPecnQCZGVi4
- vYeF7AW3j7Oae7bmIF2be2og5K33dSuGAVOvcB7q3iOvgp6SwePd0b1izPZTJQ93
- qBme0nPreKOtI59lomYIuxUdjKcZrnKcdiVCLQbkmq4dn9AqL2kn357ZKTCJKh2q
- Gjiy2jrsF9R5605lR8ww2h1FoM4NuHLxIDjhasUx2LECAwEAAaOCAZAwggGMMCsG
- A1UdEQQkMCKCIGlkcC5hcHByb3ZhbC5nbG93c2NvdGxhbmQub3JnLnVrMAkGA1Ud
- EwQCMAAwDgYDVR0PAQH/BAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9T
- VlJTZWN1cmUtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwQwYD
- VR0gBDwwOjA4BgpghkgBhvhFAQc2MCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3
- LnZlcmlzaWduLmNvbS9jcHMwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
- MB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPYvnmlMHYGCCsGAQUFBwEBBGow
- aDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMEAGCCsGAQUF
- BzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSU2Vj
- dXJlRzMuY2VyMA0GCSqGSIb3DQEBBQUAA4IBAQARGraY/Oi38TY9ag3kqLbQdikg
- zl7h7IwRrNq6ApnA5lP2Pe1YxaddPUTckJPxkIYHpo1sfvBDr6ysJgM7onLzPEvI
- elRKjE/DaYcypLroREaDo4xM8RlF2x1n1A+QchAn/9+Jl8F++AskizHllMTZY5JM
- l5c9BqgTh8MR2XTEyMTdObFRqtH7XXIY7sovrfyThWqYSaONepYNFCWdl+YsV8Qj
- 4EtP5S2OzPK4Cq/W4o3bX9+COO5ogvMqte7zZhg39BVXzPgxU0D1snoY1iwIWSwi
- FyOlGRITIABEBH3YBIOzf2BMQj8PWJNy3GvOwyNBmWRsURPlfgsVAY6lwwz1
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.approval.glowscotland.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.approval.glowscotland.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.approval.glowscotland.org.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.approval.glowscotland.org.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.approval.glowscotland.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.approval.glowscotland.org.uk/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">approval.glowscotland.org.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFyTCCBLGgAwIBAgIQNVv6vCdm+B2Ww8ov2gDvJDANBgkqhkiG9w0BAQUFADCB
- tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
- ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
- YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
- VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwOTI2
- MDAwMDAwWhcNMTYxMDEyMjM1OTU5WjCB9jELMAkGA1UEBhMCR0IxFDASBgNVBAgT
- C094Zm9yZHNoaXJlMREwDwYDVQQHFAhBYmluZ2RvbjEPMA0GA1UEChQGUk0gUExD
- MTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3LnZlcmlzaWduLmNvLnVrL3Jw
- YSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRlZCBieSBWZXJpU2lnbjEnMCUG
- A1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMSkwJwYDVQQDFCBp
- ZHAuYXBwcm92YWwuZ2xvd3Njb3RsYW5kLm9yZy51azCCASIwDQYJKoZIhvcNAQEB
- BQADggEPADCCAQoCggEBANV/QA/Q/7h32gu4dBR2VSyC65H3fmk87UIVRT6CHAG8
- UScEalaWYMbjdNJoGA/w4uywYvxbrZEDHq+b/a/s3mZXs19HjeRzOpw8UqLRRNei
- Yu7EIppfjCXXliWskYZ4DN9CMv9d0G8nuhH1hZm9DLCVXvsRmvu/qPecnQCZGVi4
- vYeF7AW3j7Oae7bmIF2be2og5K33dSuGAVOvcB7q3iOvgp6SwePd0b1izPZTJQ93
- qBme0nPreKOtI59lomYIuxUdjKcZrnKcdiVCLQbkmq4dn9AqL2kn357ZKTCJKh2q
- Gjiy2jrsF9R5605lR8ww2h1FoM4NuHLxIDjhasUx2LECAwEAAaOCAZAwggGMMCsG
- A1UdEQQkMCKCIGlkcC5hcHByb3ZhbC5nbG93c2NvdGxhbmQub3JnLnVrMAkGA1Ud
- EwQCMAAwDgYDVR0PAQH/BAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9T
- VlJTZWN1cmUtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwQwYD
- VR0gBDwwOjA4BgpghkgBhvhFAQc2MCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3
- LnZlcmlzaWduLmNvbS9jcHMwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
- MB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPYvnmlMHYGCCsGAQUFBwEBBGow
- aDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMEAGCCsGAQUF
- BzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSU2Vj
- dXJlRzMuY2VyMA0GCSqGSIb3DQEBBQUAA4IBAQARGraY/Oi38TY9ag3kqLbQdikg
- zl7h7IwRrNq6ApnA5lP2Pe1YxaddPUTckJPxkIYHpo1sfvBDr6ysJgM7onLzPEvI
- elRKjE/DaYcypLroREaDo4xM8RlF2x1n1A+QchAn/9+Jl8F++AskizHllMTZY5JM
- l5c9BqgTh8MR2XTEyMTdObFRqtH7XXIY7sovrfyThWqYSaONepYNFCWdl+YsV8Qj
- 4EtP5S2OzPK4Cq/W4o3bX9+COO5ogvMqte7zZhg39BVXzPgxU0D1snoY1iwIWSwi
- FyOlGRITIABEBH3YBIOzf2BMQj8PWJNy3GvOwyNBmWRsURPlfgsVAY6lwwz1
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.approval.glowscotland.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.approval.glowscotland.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">RM Education plc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Glow Scotland (Approval)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.glowscotland.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Glow Support</GivenName>
- <EmailAddress>mailto:glowsupport@rm.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Glow Support</GivenName>
- <EmailAddress>mailto:glowsupport@rm.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml
deleted file mode 100644
index 9a5cb269..00000000
--- a/swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ens-cachan.fr/idp/shibboleth">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-03-26T11:25:12Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-cachan.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">ENS de Cachan</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEbzCCA1egAwIBAgIQBrpuBObhBogKlHNCdbsTdDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAuZW5zLWNh
-Y2hhbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEXMkxFCzXc
-0fnyg1iSqsCVQDAQANEoSYEoifDOBrGxyLUs9NeYPWxqZ5eTbTb5Nf0eoQVYfdw1
-7UPguHsYrH8sJCJvt6l6E45QB8c4dms2dq6L5hC/Nte0IE9PnnZZFeZyC0VEc/or
-/QAdp7KqtuSYUMMfcZa9KmKewq5Wk2q450hoJXt1P2SfbMg1d6upGchBaaIzRGfr
-H6EkW9iWkZ59faXV4D/5lQIxFBegQZdc/3aQhRBANOJf+Kns0CFNa4pKdokyOWmN
-QIwqNz/gbDhmoihcO/lFdzyl5wYFm+AyeaN2EJAyJGc05GSZqHJ37xqR9f9k3aSe
-w9wqLwHCnZsCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBRY6tyt/yDskMb5Xs6pNDkIhZmCmjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLmVucy1jYWNoYW4uZnIw
-DQYJKoZIhvcNAQEFBQADggEBAFIGuxBICKfh41j7d4yN5dbJglRPBjA3hR+I17+C
-RGHKYhlnkLIka3w82T1jJFfKrcsBhJOXDuXTMY7gTijYg04cxPj2cQlOX9JRi13F
-wH0xnR1lid85jEmF7hesb8+soZODRltJl23UVA5xlUUNN5fyq/2+u49XDgGC7fCo
-xk4SF1WcnXvDZ6ly2SEhz/HkjpnTTFf44gnL8Xb3eiDdMfHp58Uz6eyqFgv1vG45
-UPahQ2nS0Lvr4xj89XvWXH9lDb5s5n2FT5RO90LBfKxIntzaV8ETBCg82d6YazQ1
-FMAUtMExS5hnbLUzHXkoy/XY1GSOFrdo+xC3J8W5X0qykgE=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDLzCCAhegAwIBAgIUc0v583FVYdPbzKH4phM2yzqVs+gwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLmVucy1jYWNoYW4uZnIwHhcNMTIwMTE4MTUzODA5
-WhcNMzIwMTE4MTUzODA5WjAcMRowGAYDVQQDExFpZHAuZW5zLWNhY2hhbi5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqkeVKNEl2sPzNSgS376od2
-d5WtlpzbZmHWi0r7qolGnFvdsGI17nF+5rrmJQWgOhUk28BscIORdBWmZ+heH2uj
-Vg9kB6ScbWClFwmVSJvs0DKTNblpGKvkoq2K5/O5eGkfxUFk2bVTuS0LCex8pHF7
-dUg4ZT54voceu1rTysufBO75M+VgpdOFSXQE0I2neY7ZsshFJKY9dldlTBGBQczN
-wxk69FKpovZ5Mn8WtRqd11mebDd3lnRrn9r6U3cCo8qarTYde9DPjSJlww33Xp4r
-6ud/Vve++tw26PstOBeiNGEQqlAmSftbTbFBRvExwcVT0c+ej9Ex1S+jV7le/CsC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLmVucy1jYWNoYW4uZnKGKGh0dHBzOi8v
-aWRwLmVucy1jYWNoYW4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPCHdSuO
-sn5GdKlPsFmMdLGKi9fnMA0GCSqGSIb3DQEBBQUAA4IBAQB6F+ZMPSjvDqel8H5g
-hgWoE4y07lxcD/Fq/nlfLMvgZrcWPHvP2Sv6w8VCjPSQ+y6QcXxrxCPbVRqLRScA
-gs9ihdB4n/esZyuX/RAYcpW5sJjq5LEfgxuLNbj5TLpnMpx+pqVzMa/MaOUfwXcp
-cswXnyQAsJBx+5j6t0NPONYAPkjHEFhI0CKHmJ7EJ2Ipln1VPhuoYj1/CbSbpjM5
-Yi2MEZIFtlIvQPeI8ZiBo33ciNakrTjsM8hxVuEdTcmzmBblgQm8O7Rbeh68WgmS
-g/V6L5+BN6Eoy8lbisNWOb+pqQIXDwcjRTqpk/896NzDC+LYe9u3DifcfhIhdD5y
-XnpY
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ens-cachan.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens-cachan.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ens-cachan.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">ENS de Cachan</OrganizationName>
- <OrganizationDisplayName xml:lang="en">ENS de Cachan</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <SurName>Sabrina LOUISON-FRANCOIS</SurName>
- <EmailAddress>sabrina.louison-francois@ens-cachan.fr</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Pascal SOULLARD</SurName>
- <EmailAddress>pascal.soullard@ens-cachan.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml b/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml
new file mode 100644
index 00000000..4601db57
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gpiran.si/idp/20110919">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-03-09T08:03:12Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gpiran.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.gpiran.si</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Gymnasium Piran</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sl">Gimnazija, elektro in pomorska Å¡ola Piran</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity provider for organization Gymnasium Piran</mdui:Description>
+ <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Gimnazija Piran</mdui:Description>
+ <mdui:Keywords xml:lang="en">Identity provider for organization Gymnasium Piran</mdui:Keywords>
+ <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Gimnazija Piran</mdui:Keywords>
+ <mdui:Logo height="299" width="300">data:image/png;base64,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</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://www.gpiran.si</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sl">http://www.gpiran.si</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFejCCA2KgAwIBAgIEATLeRzANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMjEwMTAyNTAxWhcNMzQwODI3MTAyNTAxWjBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJDW6GNvyv/4uQs+YMi+A1cfj2JpBJ7DI1dz2AawdyUN1u07XPApyqSkwAgIgOrLTwD78qezCnMbNmJKxKgCW3nCLcHm1hoF4UgI7sD2ouJYiFAFAskIAidj4/26niCiYKF/RhjNr79m23SsUk6P/ouFIpy5s04VlF0Ev0QEhIgi2w79lpKDLhAvTovyTAvYiz64WXSIPKST68dU4jTWSSSpa1xAmvKf+yXoYT7+nzTskxeaE7NwDl2pCun9BODP4G/cOtxE6oiracde+Rewlikqc1Z+ksHsEM3z3UIwPg41stAydIX9Y79To2DXxhTRiwINlHg6Utjsd7fdEwnTMlC4Q5P9UBX01TlASnfLqetoh0doNShcrYRNgvN9eLhFe0ocZdSBw473A0n87WB84E9i9yZXAoKRbGw5/JadtChsPtlItaKxHWkJWTNQHVn3poQjvx7aOxqXEaWq4KDAPZjI7SwBDjUGKlBlrakyAhuQKQXcAdYFayrk2i/SsUy6RSKFEVJylTMfFmcvmE4aL+PNK4j/Xj5WixABZRMBVE+g3DHrXgXyj5pASnTsWlC1dH8XZm7eogLTAgvbkmd/i4VhfVPIo8rugi390Sqaxis+2df1m8pcPUYboilNGj9c9eU1KQS8jhcmH7CWw1btScAAhB9W0uxiVKKIVYjQKEyQIDAQABo1AwTjAdBgNVHQ4EFgQUXaCKA7A9IOWCijj2X1qW1iQqlYgwHwYDVR0jBBgwFoAUXaCKA7A9IOWCijj2X1qW1iQqlYgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAD+QHXbGFpPV8vBUR2UHEjdMOHBinFweVml66OPPsFz1lcHEEVaXYKmhUhXkxlHGq95lq2WgIwbjC/+oEt2nX6Dp6Q4Qx5Fbbm2h2wWz3q8z2NxtgT3NtToybPaOkNsK27FUENsj4bz92eIToyWqQMsolVZ6+efOMXeASSd0wfo5ePhm5fSEquKmRWxQHyBl1e3BsfcxeIbGhDHmwBC0IVyX+KO1IuYSCqwYnZviN9+g/U6vqUfz+LyJm7oQtM5SXAiR/bUWDKKfzHPWWZvLDH5GlSDAN5znktSDkVbCgYnmmCifmJS1MPnNoUSf5Nb8pFJ1LLavH8ru3mEzVKJfb8uk+5QVXWJHobeDaXhfW38V78KcIUr0mHNx/VV+2D+dhtsS+KjdxMbKRh9c6H8tuMHICYwY4wQVSuQzM3K09RySp9SABwL6kqxBDvxne7mb4TEG3czU2LCHWHJk+yxxwJnTNp83SdJM4nqX9p0EGJfLtqY8bP2pMGBDD6a+9U/dqTO75rzHJKYl1RNtLLVMpTmChVDa+yUh1uN1jUQCJ76QOoewKmYVLSopT2p3nEzWsHJFWN6/xaYmu9e/GkCJ/bDOU5zJPzrnfJc6fr3PboaOR3yx71geO+nZXrVSlBpBY6tc+TVVlpxlhsoWXFbm4t0nTp9ORSFkJnQCZmOjV2mA=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFejCCA2KgAwIBAgIEATLeRzANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMjEwMTAyNTAxWhcNMzQwODI3MTAyNTAxWjBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJDW6GNvyv/4uQs+YMi+A1cfj2JpBJ7DI1dz2AawdyUN1u07XPApyqSkwAgIgOrLTwD78qezCnMbNmJKxKgCW3nCLcHm1hoF4UgI7sD2ouJYiFAFAskIAidj4/26niCiYKF/RhjNr79m23SsUk6P/ouFIpy5s04VlF0Ev0QEhIgi2w79lpKDLhAvTovyTAvYiz64WXSIPKST68dU4jTWSSSpa1xAmvKf+yXoYT7+nzTskxeaE7NwDl2pCun9BODP4G/cOtxE6oiracde+Rewlikqc1Z+ksHsEM3z3UIwPg41stAydIX9Y79To2DXxhTRiwINlHg6Utjsd7fdEwnTMlC4Q5P9UBX01TlASnfLqetoh0doNShcrYRNgvN9eLhFe0ocZdSBw473A0n87WB84E9i9yZXAoKRbGw5/JadtChsPtlItaKxHWkJWTNQHVn3poQjvx7aOxqXEaWq4KDAPZjI7SwBDjUGKlBlrakyAhuQKQXcAdYFayrk2i/SsUy6RSKFEVJylTMfFmcvmE4aL+PNK4j/Xj5WixABZRMBVE+g3DHrXgXyj5pASnTsWlC1dH8XZm7eogLTAgvbkmd/i4VhfVPIo8rugi390Sqaxis+2df1m8pcPUYboilNGj9c9eU1KQS8jhcmH7CWw1btScAAhB9W0uxiVKKIVYjQKEyQIDAQABo1AwTjAdBgNVHQ4EFgQUXaCKA7A9IOWCijj2X1qW1iQqlYgwHwYDVR0jBBgwFoAUXaCKA7A9IOWCijj2X1qW1iQqlYgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAD+QHXbGFpPV8vBUR2UHEjdMOHBinFweVml66OPPsFz1lcHEEVaXYKmhUhXkxlHGq95lq2WgIwbjC/+oEt2nX6Dp6Q4Qx5Fbbm2h2wWz3q8z2NxtgT3NtToybPaOkNsK27FUENsj4bz92eIToyWqQMsolVZ6+efOMXeASSd0wfo5ePhm5fSEquKmRWxQHyBl1e3BsfcxeIbGhDHmwBC0IVyX+KO1IuYSCqwYnZviN9+g/U6vqUfz+LyJm7oQtM5SXAiR/bUWDKKfzHPWWZvLDH5GlSDAN5znktSDkVbCgYnmmCifmJS1MPnNoUSf5Nb8pFJ1LLavH8ru3mEzVKJfb8uk+5QVXWJHobeDaXhfW38V78KcIUr0mHNx/VV+2D+dhtsS+KjdxMbKRh9c6H8tuMHICYwY4wQVSuQzM3K09RySp9SABwL6kqxBDvxne7mb4TEG3czU2LCHWHJk+yxxwJnTNp83SdJM4nqX9p0EGJfLtqY8bP2pMGBDD6a+9U/dqTO75rzHJKYl1RNtLLVMpTmChVDa+yUh1uN1jUQCJ76QOoewKmYVLSopT2p3nEzWsHJFWN6/xaYmu9e/GkCJ/bDOU5zJPzrnfJc6fr3PboaOR3yx71geO+nZXrVSlBpBY6tc+TVVlpxlhsoWXFbm4t0nTp9ORSFkJnQCZmOjV2mA=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gpiran.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gpiran.si/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Gymnasium Piran</md:OrganizationName>
+ <md:OrganizationName xml:lang="sl">Gimnazija, elektro in pomorska Å¡ola Piran</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Gymnasium Piran</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sl">Gimnazija, elektro in pomorska Å¡ola Piran</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.gpiran.si</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sl">http://www.gpiran.si</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Borut</md:GivenName>
+ <md:SurName>Butinar</md:SurName>
+ <md:EmailAddress>mailto:ravnatelj@gpiran.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Helpdesk</md:GivenName>
+ <md:SurName>Helpdesk</md:SurName>
+ <md:EmailAddress>mailto:oki@gpiran.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Igor</md:GivenName>
+ <md:SurName>Kralj</md:SurName>
+ <md:EmailAddress>mailto:igor.kralj1@guest.arnes.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Igor</md:GivenName>
+ <md:SurName>Kralj</md:SurName>
+ <md:EmailAddress>mailto:oki@gpiran.si</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.learningfutures.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.learningfutures.org.uk-idp-shibboleth.xml
deleted file mode 100644
index 2b415dc4..00000000
--- a/swamid-interfederations-2.0/idp.learningfutures.org.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.learningfutures.org.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for Capita Managed IT Solutions Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-08-23T09:24:00Z"/>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">learningfutures.org.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFLDCCBJWgAwIBAgIQbWboU77LtB8TXqBBmNOOijANBgkqhkiG9w0BAQUFADCB
- ujEfMB0GA1UEChMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UECxMOVmVy
- aVNpZ24sIEluYy4xMzAxBgNVBAsTKlZlcmlTaWduIEludGVybmF0aW9uYWwgU2Vy
- dmVyIENBIC0gQ2xhc3MgMzFJMEcGA1UECxNAd3d3LnZlcmlzaWduLmNvbS9DUFMg
- SW5jb3JwLmJ5IFJlZi4gTElBQklMSVRZIExURC4oYyk5NyBWZXJpU2lnbjAeFw0x
- MDA4MTEwMDAwMDBaFw0xNTA4MTAyMzU5NTlaMIG4MQswCQYDVQQGEwJHQjEPMA0G
- A1UECAwGQW50cmltMRAwDgYDVQQHDAdCZWxmYXN0MSwwKgYDVQQKDCNOb3J0aGdh
- dGUgSW5mb3JtYXRpb24gU29sdXRpb25zIEx0ZDEzMDEGA1UECwwqVGVybXMgb2Yg
- dXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MSMwIQYDVQQDDBppZHAu
- bGVhcm5pbmdmdXR1cmVzLm9yZy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
- AQoCggEBAOSC2ZH+NAVWRn43yHmuoMLFGedM23OG4NfgwtLvo23gLFLxlLOwf7f4
- voHiE3wmC+MWYMEWJQB/8yhnRhafkGEVKacdmamn+LmBrslIOkA8SN0SgaVo7se+
- 7S+Tof8ak7CbHIX/4Oz7mTrxfJtuG07BbKipGY/nRCL6avZ+94VwIgNx/O5p4bsH
- b+NTzixt79hyxw6MymYdNJG2XP+auD/HN8Jvff2CACEZ74AXNIZz39LMpsgTAhGn
- syBIGXjb5sQnZ68bDAJy4OcYprT6G8aRrooVIWlXbKf6hd2U7iD9GyDpoPLEDmpV
- rRzoOIfBni2gysQ27DiZufe/pZlY2w8CAwEAAaOCAa0wggGpMAkGA1UdEwQCMAAw
- CwYDVR0PBAQDAgWgMEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHFwMwKjAoBggrBgEF
- BQcCARYcaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYTA8BgNVHR8ENTAzMDGg
- L6AthitodHRwOi8vU1ZSSW50bC1jcmwudmVyaXNpZ24uY29tL1NWUkludGwuY3Js
- MCgGA1UdJQQhMB8GCCsGAQUFBwMBBggrBgEFBQcDAgYJYIZIAYb4QgQBMHEGCCsG
- AQUFBwEBBGUwYzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29t
- MDsGCCsGAQUFBzAChi9odHRwOi8vU1ZSSW50bC1haWEudmVyaXNpZ24uY29tL1NW
- UkludGwtYWlhLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9n
- aWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8v
- bG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADgYEA
- Scm9hXbXuNrNA1MNMjL1u0oWWt1vH/CO9nMnMXv1ZdezJcwhJ2pWA+gY2mruofgn
- QMRs79AbiQMOlRlwxUOny/lSSBkQUKT4Il3qcHSvaUXQ2A7OwHFm5Kf+SgP3x3Vl
- D9KEA05gKd3o/+aPpQ696aQg+Quv2j0fQUPEAkXraIY=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.learningfutures.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.learningfutures.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.learningfutures.org.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.learningfutures.org.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.learningfutures.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.learningfutures.org.uk/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">learningfutures.org.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFLDCCBJWgAwIBAgIQbWboU77LtB8TXqBBmNOOijANBgkqhkiG9w0BAQUFADCB
- ujEfMB0GA1UEChMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UECxMOVmVy
- aVNpZ24sIEluYy4xMzAxBgNVBAsTKlZlcmlTaWduIEludGVybmF0aW9uYWwgU2Vy
- dmVyIENBIC0gQ2xhc3MgMzFJMEcGA1UECxNAd3d3LnZlcmlzaWduLmNvbS9DUFMg
- SW5jb3JwLmJ5IFJlZi4gTElBQklMSVRZIExURC4oYyk5NyBWZXJpU2lnbjAeFw0x
- MDA4MTEwMDAwMDBaFw0xNTA4MTAyMzU5NTlaMIG4MQswCQYDVQQGEwJHQjEPMA0G
- A1UECAwGQW50cmltMRAwDgYDVQQHDAdCZWxmYXN0MSwwKgYDVQQKDCNOb3J0aGdh
- dGUgSW5mb3JtYXRpb24gU29sdXRpb25zIEx0ZDEzMDEGA1UECwwqVGVybXMgb2Yg
- dXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MSMwIQYDVQQDDBppZHAu
- bGVhcm5pbmdmdXR1cmVzLm9yZy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
- AQoCggEBAOSC2ZH+NAVWRn43yHmuoMLFGedM23OG4NfgwtLvo23gLFLxlLOwf7f4
- voHiE3wmC+MWYMEWJQB/8yhnRhafkGEVKacdmamn+LmBrslIOkA8SN0SgaVo7se+
- 7S+Tof8ak7CbHIX/4Oz7mTrxfJtuG07BbKipGY/nRCL6avZ+94VwIgNx/O5p4bsH
- b+NTzixt79hyxw6MymYdNJG2XP+auD/HN8Jvff2CACEZ74AXNIZz39LMpsgTAhGn
- syBIGXjb5sQnZ68bDAJy4OcYprT6G8aRrooVIWlXbKf6hd2U7iD9GyDpoPLEDmpV
- rRzoOIfBni2gysQ27DiZufe/pZlY2w8CAwEAAaOCAa0wggGpMAkGA1UdEwQCMAAw
- CwYDVR0PBAQDAgWgMEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHFwMwKjAoBggrBgEF
- BQcCARYcaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYTA8BgNVHR8ENTAzMDGg
- L6AthitodHRwOi8vU1ZSSW50bC1jcmwudmVyaXNpZ24uY29tL1NWUkludGwuY3Js
- MCgGA1UdJQQhMB8GCCsGAQUFBwMBBggrBgEFBQcDAgYJYIZIAYb4QgQBMHEGCCsG
- AQUFBwEBBGUwYzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29t
- MDsGCCsGAQUFBzAChi9odHRwOi8vU1ZSSW50bC1haWEudmVyaXNpZ24uY29tL1NW
- UkludGwtYWlhLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9n
- aWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8v
- bG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADgYEA
- Scm9hXbXuNrNA1MNMjL1u0oWWt1vH/CO9nMnMXv1ZdezJcwhJ2pWA+gY2mruofgn
- QMRs79AbiQMOlRlwxUOny/lSSBkQUKT4Il3qcHSvaUXQ2A7OwHFm5Kf+SgP3x3Vl
- D9KEA05gKd3o/+aPpQ696aQg+Quv2j0fQUPEAkXraIY=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.learningfutures.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.learningfutures.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Capita Managed IT Solutions Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Blackburn with Darwen BSF</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.northgate-managedservices.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Peter</GivenName>
- <SurName>McCready</SurName>
- <EmailAddress>mailto:Peter.McCready@capita.co.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Peter</GivenName>
- <SurName>McCready</SurName>
- <EmailAddress>mailto:Peter.McCready@capita.co.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml
deleted file mode 100644
index ca335175..00000000
--- a/swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mnhn.fr/idp/shibboleth">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-24T10:42:58Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mnhn.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Muséum National d'Histoire Naturelle (MNHN)</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGDCCAgCgAwIBAgIVAN2WCywAfMl5MJ8cVRoKFLyV+pBoMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5tbmhuLmZyMB4XDTExMDUyMzA4NTUyNloXDTMx
-MDUyMzA4NTUyNlowFjEUMBIGA1UEAxMLaWRwLm1uaG4uZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCmAwtKt4Gn/OnH/ER/RWlu+XXXicirD/hyUooa
-K5KKEsbiRAr//R+vzCwC3svUQJ5F6f9mMaLoPC06cALnyMmylUJhT1D7XW2mJQMX
-XroZC1fa+UCmxtdvZIM7qjesRIfLYEZMoa4/weBEbEElUfuqPkoqShTp5kbO/L5Y
-/phmvhYV0MnReY5UYOH59yzCHcZ1N9vDu4K5HwvaK56nYTc/yVfAlhK7T2KTZldP
-+yf8tU2UBdhympcm4WCaH2wbZSlVt5Vr4V0CgQmF3AkkSmmr+l2z0WmIyj5DqYc5
-UwVu5q/YteHRNqy2HD0BpyFnWd+OumQRRtMLOQYqqTmMVtBHAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5tbmhuLmZyhiJodHRwczovL2lkcC5tbmhuLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTwc9EzS0upzHexvPHSjyyBXtJRzzANBgkqhkiG
-9w0BAQUFAAOCAQEAUjcVU43UjPS2yZa2B98B2GixtGn5JcBnE1QLt5pgGsnr4CIx
-I8cC/jZT5L7NXrTNt/6nPGMCycxAWv7tlueZ0WdzZ+UGtB/rRYkL2r469oLZ3rYa
-+UjhcWk/BF913fSK/FsRHrdp/Ml4qKsgePY0XovshBV95lfyRSfO2fOYkOE9DqWi
-xFPoC+FB1H96Xlqm9MNJTjVHOlK/dsWepngeGtSThDfw6Zu2YBffGKmjUxZupnz/
-x1tBulh4y7eU//huta68Wi6YRz4yzVlzbowBI/RxtKs0bme6vXeCkL1b5TCJBpHy
-vRrHv8r51u7XXy3b5wfo2T+mRkq36Qzb3+UX7w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mnhn.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mnhn.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mnhn.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Muséum National d'Histoire Naturelle (MNHN)</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Muséum National d'Histoire Naturelle (MNHN)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>zyxad@mnhn.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml
deleted file mode 100644
index 73f71a10..00000000
--- a/swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.renata.edu.co/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://colfire.co" registrationInstant="2014-01-01T00:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="es">
- http://colfire.co/Politica_IdP.pdf
- </mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.co</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">
- RENATA - Red Nacional Academica de Tecnologia Avanzada
- </mdui:DisplayName>
- <mdui:DisplayName xml:lang="es">
- RENATA - Red Nacional Academica de Tecnologia Avanzada
- </mdui:DisplayName>
- <mdui:Description xml:lang="en">
- RENATA - Red Nacional Academica de Tecnologia Avanzada
- </mdui:Description>
- <mdui:Description xml:lang="es">
- RENATA - Red Nacional Academica de Tecnologia Avanzada
- </mdui:Description>
- <mdui:InformationURL xml:lang="en">
- http://www.renata.edu.co
- </mdui:InformationURL>
- <mdui:InformationURL xml:lang="es">
- http://www.renata.edu.co
- </mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIG3jCCBcagAwIBAgIQA7a3wqJ79UaLPv5KuUFPwzANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwMjAxMDAwMDAwWhcN
-MTcwMjA4MTIwMDAwWjCBpTELMAkGA1UEBhMCQ08xFTATBgNVBAgTDEN1bmRpbmFt
-YXJjYTEPMA0GA1UEBxMGQm9nb3RhMT8wPQYDVQQKEzZSZWQgTmFjaW9uYWwgQWNh
-ZGVtaWNhIGRlIFRlY25vbG9naWEgQXZhbnphZGEgLSBSRU5BVEExEzARBgNVBAsT
-ClRlY25vbG9naWExGDAWBgNVBAMMDyoucmVuYXRhLmVkdS5jbzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALJAw54JxXbJCfivUGdH7p5aMVbWDtURIS4u
-MLAnOi8pcW2U5Bdmgxlgt40eTYHlyXFCO2HHoFLakvdNSiRbiuEuy/P5j26Lq/UA
-BUXdilbK/tZMeEvZiowG0WpOV792v59+2cxQk4un/kQVAkeTGaWjAPu44zKsSWyp
-doCkNqYCjGJM10IgW5TRaw/eolJ48ABKP/xtJa5F76RXGSD1zcoDywgUFSsfmTod
-xuFzuuEr+qEdW58JyNnubK7WMXvJC7VZxml4Zskh2cZ2YuLCMlyLQkcqCZX/wcfr
-HKSOr24lny4682wHr82shejU1KgbGe5Lvj/rHAb1H33zV3ZD0MkCAwEAAaOCA18w
-ggNbMB8GA1UdIwQYMBaAFA+AYRyCMWHVLyjnjUY4tCzhxtniMB0GA1UdDgQWBBQ7
-7XixpUynbtyxuf8Kyc2wRYHOIDApBgNVHREEIjAggg8qLnJlbmF0YS5lZHUuY2+C
-DXJlbmF0YS5lZHUuY28wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdp
-Y2VydC5jb20vc3NjYS1zaGEyLWcxLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGln
-aWNlcnQuY29tL3NzY2Etc2hhMi1nMS5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMG
-CWCGSAGG/WwBATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQu
-Y29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFS
-AEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBj
-AGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBu
-AGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQ
-AFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAg
-AEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABp
-AGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwBy
-AGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBl
-AC4wfAYIKwYBBQUHAQEEcDBuMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
-Y2VydC5jb20wRgYIKwYBBQUHMAKGOmh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNv
-bS9EaWdpQ2VydFNIQTJTZWN1cmVTZXJ2ZXJDQS5jcnQwDAYDVR0TAQH/BAIwADAN
-BgkqhkiG9w0BAQsFAAOCAQEAP6sIijTMWSk92M25IGy/SAGaXIVPMPIy0K4aerw9
-vx9bJ1D2+aZ70EnBlCWdbuWLTlZusRrnf/3ZvB3GgjbZDiMugGq1Mu6o2oEf0304
-yk4E0ftsgBvF+ABPh7UncA7g7Xib9JAApCuO4cVoT+ZCSjiFRwW8IDVgcCZENdeP
-4dxIQ2kOCnB9xctnWyNKZv5AjAp/Trw2l1XhTVeu+U22v2pAlJPrOsiM/yCYaaVj
-yh4ohtfLM8hd099K6Tk5TKIRt+SW1KRgEga4jRrOxMQ0bKjxQWydo93HVfMPiBhn
-FtZcGPmpg9fHry1cbwDW0660J/yOZsUbhNuUu5xv06SOqA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.renata.edu.co:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renata.edu.co/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co:8443/idp/profile/SAML2/SOAP/SLO"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.renata.edu.co/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renata.edu.co/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.co</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIG3jCCBcagAwIBAgIQA7a3wqJ79UaLPv5KuUFPwzANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwMjAxMDAwMDAwWhcN
-MTcwMjA4MTIwMDAwWjCBpTELMAkGA1UEBhMCQ08xFTATBgNVBAgTDEN1bmRpbmFt
-YXJjYTEPMA0GA1UEBxMGQm9nb3RhMT8wPQYDVQQKEzZSZWQgTmFjaW9uYWwgQWNh
-ZGVtaWNhIGRlIFRlY25vbG9naWEgQXZhbnphZGEgLSBSRU5BVEExEzARBgNVBAsT
-ClRlY25vbG9naWExGDAWBgNVBAMMDyoucmVuYXRhLmVkdS5jbzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALJAw54JxXbJCfivUGdH7p5aMVbWDtURIS4u
-MLAnOi8pcW2U5Bdmgxlgt40eTYHlyXFCO2HHoFLakvdNSiRbiuEuy/P5j26Lq/UA
-BUXdilbK/tZMeEvZiowG0WpOV792v59+2cxQk4un/kQVAkeTGaWjAPu44zKsSWyp
-doCkNqYCjGJM10IgW5TRaw/eolJ48ABKP/xtJa5F76RXGSD1zcoDywgUFSsfmTod
-xuFzuuEr+qEdW58JyNnubK7WMXvJC7VZxml4Zskh2cZ2YuLCMlyLQkcqCZX/wcfr
-HKSOr24lny4682wHr82shejU1KgbGe5Lvj/rHAb1H33zV3ZD0MkCAwEAAaOCA18w
-ggNbMB8GA1UdIwQYMBaAFA+AYRyCMWHVLyjnjUY4tCzhxtniMB0GA1UdDgQWBBQ7
-7XixpUynbtyxuf8Kyc2wRYHOIDApBgNVHREEIjAggg8qLnJlbmF0YS5lZHUuY2+C
-DXJlbmF0YS5lZHUuY28wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdp
-Y2VydC5jb20vc3NjYS1zaGEyLWcxLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGln
-aWNlcnQuY29tL3NzY2Etc2hhMi1nMS5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMG
-CWCGSAGG/WwBATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQu
-Y29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFS
-AEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBj
-AGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBu
-AGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQ
-AFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAg
-AEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABp
-AGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwBy
-AGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBl
-AC4wfAYIKwYBBQUHAQEEcDBuMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
-Y2VydC5jb20wRgYIKwYBBQUHMAKGOmh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNv
-bS9EaWdpQ2VydFNIQTJTZWN1cmVTZXJ2ZXJDQS5jcnQwDAYDVR0TAQH/BAIwADAN
-BgkqhkiG9w0BAQsFAAOCAQEAP6sIijTMWSk92M25IGy/SAGaXIVPMPIy0K4aerw9
-vx9bJ1D2+aZ70EnBlCWdbuWLTlZusRrnf/3ZvB3GgjbZDiMugGq1Mu6o2oEf0304
-yk4E0ftsgBvF+ABPh7UncA7g7Xib9JAApCuO4cVoT+ZCSjiFRwW8IDVgcCZENdeP
-4dxIQ2kOCnB9xctnWyNKZv5AjAp/Trw2l1XhTVeu+U22v2pAlJPrOsiM/yCYaaVj
-yh4ohtfLM8hd099K6Tk5TKIRt+SW1KRgEga4jRrOxMQ0bKjxQWydo93HVfMPiBhn
-FtZcGPmpg9fHry1cbwDW0660J/yOZsUbhNuUu5xv06SOqA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.renata.edu.co:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="es">
- RENATA - Red Nacional Académica de Tecnología Avanzada
- </md:OrganizationName>
- <md:OrganizationName xml:lang="en">
- RENATA - Red Nacional Académica de Tecnología Avanzada
- </md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="es">
- RENATA - Red Nacional Académica de Tecnología Avanzada
- </md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">
- RENATA - Red Nacional Académica de Tecnología Avanzada
- </md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="es">
- http://www.renata.edu.co
- </md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">
- http://www.renata.edu.co
- </md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>
- Hernan Garcia
- </md:SurName>
- <md:EmailAddress>
- elcira@renata.edu.co
- </md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:SurName>
- Javier Enrique Lizarazo
- </md:SurName>
- <md:EmailAddress>
- tecnico@renata.edu.co
- </md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sbc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sbc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index e74de711..00000000
--- a/swamid-interfederations-2.0/idp.sbc.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sbc.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for South & City College Birmingham.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-28T17:19:00Z"/>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbc.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEaDCCA1CgAwIBAgIRALPLpoO1SYULfKewZOIh0wEwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xNDAxMDkwMDAwMDBaFw0xNzAxMDgyMzU5NTlaMDsxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwLnNiYy5h
- Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANLx6SesLhA5Bd8r
- qwseSaN7wPNyPlECzNDdG3/b9Ru79FMveUWfCR/wejLe0JzCFb/lk+7P81VL8+uv
- /2hU3A+5n+bFZ3iO5suZgAN974630CgdFEcUq+Mp3+9eiVh1Z8B1dKFqzOcr+e6x
- C1qSwWsBG6RkCGe63nq+LY2Bc1I72RcRBVzO3hzN+MKay6xn9Nr9q13TJQ7nYY5F
- 5gTQgV2dasmB2ANkTW2TleKLn0QTXEWDgboM1KZR/rx+t0rrLcGmvjGz3OIHUHjF
- SFjKOq2yEsWzKovEkUq6R1hV3sKRyiipixTaVq+ZXVolmf3YMNJjwH7yA6vBZ6hc
- gXiMQg0CAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
- 47ntMB0GA1UdDgQWBBRQYiuu0mY2s29/tYH/pk/IKKhqDTAOBgNVHQ8BAf8EBAMC
- BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
- IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
- oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
- bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
- bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
- dGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwLnNiYy5hYy51azANBgkqhkiG
- 9w0BAQUFAAOCAQEACaQXpN6BH+zJzpEo+Ugy/amJDyuYWyKsFTvzQ1jH3uhQJaQ8
- 7XZScE55S1IXoEnRE1EnX2y/dCuJgMsRIvDvyM/gzyLILU+BZwAr/AzFRMoJKfjI
- eLVlhg2MNSpX9vMTPo5R8tVhVWvI/Ay5f3j5LHfloNOkT8VcqRnxzhyHGwbZzacH
- hOUKt5OW0reVpMZz7RTP/2Vhy3C/R78BakBPus0+JhK1kkqTuay5VXR2k+1dcqXm
- X8fvQQdHyVp3LDYYOfjzsVNSsVnPXds+6ZHLmTriqUaceR9klM4j1GVr4QS/PliU
- E5462laDFcXvG65p/NGd70Sg88TaW3tvwmyEzQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sbc.ac.uk/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sbc.ac.uk/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sbc.ac.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sbc.ac.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sbc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sbc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbc.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEaDCCA1CgAwIBAgIRALPLpoO1SYULfKewZOIh0wEwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xNDAxMDkwMDAwMDBaFw0xNzAxMDgyMzU5NTlaMDsxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwLnNiYy5h
- Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANLx6SesLhA5Bd8r
- qwseSaN7wPNyPlECzNDdG3/b9Ru79FMveUWfCR/wejLe0JzCFb/lk+7P81VL8+uv
- /2hU3A+5n+bFZ3iO5suZgAN974630CgdFEcUq+Mp3+9eiVh1Z8B1dKFqzOcr+e6x
- C1qSwWsBG6RkCGe63nq+LY2Bc1I72RcRBVzO3hzN+MKay6xn9Nr9q13TJQ7nYY5F
- 5gTQgV2dasmB2ANkTW2TleKLn0QTXEWDgboM1KZR/rx+t0rrLcGmvjGz3OIHUHjF
- SFjKOq2yEsWzKovEkUq6R1hV3sKRyiipixTaVq+ZXVolmf3YMNJjwH7yA6vBZ6hc
- gXiMQg0CAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
- 47ntMB0GA1UdDgQWBBRQYiuu0mY2s29/tYH/pk/IKKhqDTAOBgNVHQ8BAf8EBAMC
- BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
- IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
- oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
- bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
- bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
- dGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwLnNiYy5hYy51azANBgkqhkiG
- 9w0BAQUFAAOCAQEACaQXpN6BH+zJzpEo+Ugy/amJDyuYWyKsFTvzQ1jH3uhQJaQ8
- 7XZScE55S1IXoEnRE1EnX2y/dCuJgMsRIvDvyM/gzyLILU+BZwAr/AzFRMoJKfjI
- eLVlhg2MNSpX9vMTPo5R8tVhVWvI/Ay5f3j5LHfloNOkT8VcqRnxzhyHGwbZzacH
- hOUKt5OW0reVpMZz7RTP/2Vhy3C/R78BakBPus0+JhK1kkqTuay5VXR2k+1dcqXm
- X8fvQQdHyVp3LDYYOfjzsVNSsVnPXds+6ZHLmTriqUaceR9klM4j1GVr4QS/PliU
- E5462laDFcXvG65p/NGd70Sg88TaW3tvwmyEzQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sbc.ac.uk/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sbc.ac.uk/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">South &amp; City College Birmingham</OrganizationName>
- <OrganizationDisplayName xml:lang="en">South and City College Birmingham</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.sbc.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Martin</GivenName>
- <SurName>Whinnery</SurName>
- <EmailAddress>mailto:Martin.Whinnery@sccb.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Martin</GivenName>
- <SurName>Whinnery</SurName>
- <EmailAddress>mailto:Martin.Whinnery@sccb.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml
index 4feb0b02..8d002066 100644
--- a/swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml
@@ -84,13 +84,13 @@
<OrganizationURL xml:lang="en">http://idp.snc.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Alan</GivenName>
- <SurName>Whittamore</SurName>
- <EmailAddress>mailto:alan.whittamore@snc.ac.uk</EmailAddress>
+ <GivenName>Gareth</GivenName>
+ <SurName>Hall</SurName>
+ <EmailAddress>mailto:webmaster@centralnottingham.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Alan</GivenName>
- <SurName>Whittamore</SurName>
- <EmailAddress>mailto:alan.whittamore@snc.ac.uk</EmailAddress>
+ <GivenName>Gareth</GivenName>
+ <SurName>Hall</SurName>
+ <EmailAddress>mailto:webmaster@centralnottingham.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml
deleted file mode 100644
index c648004d..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux3.fr/idp/shibboleth">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-03-03T16:23:59Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux3.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Bordeaux 3</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEcjCCA1qgAwIBAgIRAIA4wqJMJlgNhR1cuTMjrPwwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAxMjcwMDAwMDBaFw0xNzAyMDQyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSaWRwLnUtYm9y
-ZGVhdXgzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6WG1Lr+3
-bgs3SpaycblGA81MTDhqytZBDkFWVKxqG80PygkxJC7elmNW8vmiYr05q3DhKJvU
-qWMVcoELB92ae0u2VU0uAWrZ9F1uoJothG+ZSPEqMB8/lMnfb5mFiDdODWTDaoqr
-+ON+76ln4UJ1A1B/OnYRIXoaQNck8EszUEJ/l8joUj6B6PpQyXbr/oQvgDRLqP+f
-MyG13K0WIJ58gsHSOJ5A56GgfXIyiUhl1dw02ymTmXbEbvmUqskWZmUJKAEWWpSI
-SaMzJjsduob6LDGgf9rW1ZQI/ZjebSklu6pvgfhYRcneOLFc1Himw+vWIqjLR3J6
-R/jcaI/S6z6XGwIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFAlvLXNjRgJ+SoPvSDhB7HHqENWvMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAudS1ib3JkZWF1eDMu
-ZnIwDQYJKoZIhvcNAQEFBQADggEBAMEoeBmDgbEabFzNFNi64ltc67lfluV+0yFU
-Bv9wDCEpE/oX8gwToDpLPrwLTyyRL/hPXYlGb9Q/aY0PoTny//z78wF/fG714Vu8
-H++rAbnOnWoljZM+HwMfYqiwwo2cDFenKGHmpjxWp8yRzfsQIMg3a9xPuLVcA71L
-cuLvdtOQMqlfgwDLfs/vpHElIWPht/ev3rx8iJRwIWHa2OTiBYA/BJURgonZvfFE
-oTHRaJENWStkW9NhhC+D6vYX9C3R2jHTiJy7ELRI9goY0PfzWFwO9uURJT6Q0Tm+
-y9Lo5MJ5yNmEDB5+h/7fJyAcRzIuprZEv/c0v+d4qbevTm3iIRM=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-bordeaux3.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux3.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux3.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Bordeaux 3</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Bordeaux 3</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>reseau@u-bordeaux-montaigne.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml
index f0770799..625f2e87 100644
--- a/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml
@@ -78,9 +78,9 @@
<OrganizationURL xml:lang="en">http://www.uws.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Sheila</GivenName>
- <SurName>MacPherson</SurName>
- <EmailAddress>mailto:sheila.macpherson@uws.ac.uk</EmailAddress>
+ <GivenName>Sally</GivenName>
+ <SurName>McIntosh</SurName>
+ <EmailAddress>mailto:sally.mcintosh@uws.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Julie</GivenName>
diff --git a/swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml
index c31ab1ce..cc80f613 100644
--- a/swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml
@@ -45,40 +45,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIErjCCA5agAwIBAgIQTPB/HzBz9PfH2AHFJdJYMzANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMDMyMzAwMDAwMFoXDTE1MDMyMzIzNTk1OVowgYUxCzAJBgNV
- BAYTAkdCMRIwEAYDVQQIEwlXaWx0c2hpcmUxEzARBgNVBAcTClRyb3dicmlkZ2Ux
- GjAYBgNVBAoTEVdpbHRzaGlyZSBDb2xsZWdlMRMwEQYDVQQLEwpJVCBTdXBwb3J0
- MRwwGgYDVQQDExNpZHAud2lsdHNoaXJlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEF
- AAOCAQ8AMIIBCgKCAQEAvFl0ALGu5Y3ifOmEhdIwMq6smkniI8EIBZ1FxQj8P5Px
- /b8zQxf3GTPH2kX8fteG/RzJVy3Sw2ynJf+HT0GOqMarftyBkyzwE72tmjG7LE2y
- ArMFc+1TlYxzD57LIWvR2AxYKFFU1ewtH/Jyhs80Ik+hSLKSI1gCwVOwwDqJ789D
- Hq5w1qVUOb6Vv00jG3dcAR4DJnU5rof14H3zmKJYYAUuWrIpQtzugQqsW2HR++jB
- HmXFXFwn9MuJUONaVDWoALS3QjTmbgOSFG6q2qOgQAoihc7/5qYLmDVxLWR0hsgi
- 6wtqrtp50Nrnan55gWLYLF/BVgFELc9izb1tDkq8BwIDAQABo4IBZjCCAWIwHwYD
- VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFFk9umv2DBA8
- I7CzfiJ1Lo14IvjxMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
- JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
- AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
- VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
- cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
- MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB4GA1UdEQQXMBWCE2lkcC53
- aWx0c2hpcmUuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAJRrLG+1EBSkUgQE5wVb
- ktKsrNZJAnZbwtCnKXMgtO/hdp1Eq9iDr6ZbY9cqj8FbCc1bTkME4jt45Vh8/32i
- /Bl6/UCQ1I4vVvaRUmpx77ke3JZxwmt7StZhhEybTaiOi2SKQsb2srqyj9PjwMD/
- kKXyXXNoMgYtwOvGvDWFPPVEG1kHzdIBYYZMVTzbidlvjaeE1P2jlM85WqqfbMk2
- jf7RvOJ0/kscD9Q3BXGSCJukwoyTlCGqOMkmWvGCte85m3bTTAnZi6DP5vM1ePT3
- ChQ/VY3SIm2IpeIg7RG7c27q21qdaRhZ0xkzp7nere5kX2lFb0kJKJWPVEaeRRxW
- 218=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -125,40 +91,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIErjCCA5agAwIBAgIQTPB/HzBz9PfH2AHFJdJYMzANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMDMyMzAwMDAwMFoXDTE1MDMyMzIzNTk1OVowgYUxCzAJBgNV
- BAYTAkdCMRIwEAYDVQQIEwlXaWx0c2hpcmUxEzARBgNVBAcTClRyb3dicmlkZ2Ux
- GjAYBgNVBAoTEVdpbHRzaGlyZSBDb2xsZWdlMRMwEQYDVQQLEwpJVCBTdXBwb3J0
- MRwwGgYDVQQDExNpZHAud2lsdHNoaXJlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEF
- AAOCAQ8AMIIBCgKCAQEAvFl0ALGu5Y3ifOmEhdIwMq6smkniI8EIBZ1FxQj8P5Px
- /b8zQxf3GTPH2kX8fteG/RzJVy3Sw2ynJf+HT0GOqMarftyBkyzwE72tmjG7LE2y
- ArMFc+1TlYxzD57LIWvR2AxYKFFU1ewtH/Jyhs80Ik+hSLKSI1gCwVOwwDqJ789D
- Hq5w1qVUOb6Vv00jG3dcAR4DJnU5rof14H3zmKJYYAUuWrIpQtzugQqsW2HR++jB
- HmXFXFwn9MuJUONaVDWoALS3QjTmbgOSFG6q2qOgQAoihc7/5qYLmDVxLWR0hsgi
- 6wtqrtp50Nrnan55gWLYLF/BVgFELc9izb1tDkq8BwIDAQABo4IBZjCCAWIwHwYD
- VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFFk9umv2DBA8
- I7CzfiJ1Lo14IvjxMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
- JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
- AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
- VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
- cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
- MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB4GA1UdEQQXMBWCE2lkcC53
- aWx0c2hpcmUuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAJRrLG+1EBSkUgQE5wVb
- ktKsrNZJAnZbwtCnKXMgtO/hdp1Eq9iDr6ZbY9cqj8FbCc1bTkME4jt45Vh8/32i
- /Bl6/UCQ1I4vVvaRUmpx77ke3JZxwmt7StZhhEybTaiOi2SKQsb2srqyj9PjwMD/
- kKXyXXNoMgYtwOvGvDWFPPVEG1kHzdIBYYZMVTzbidlvjaeE1P2jlM85WqqfbMk2
- jf7RvOJ0/kscD9Q3BXGSCJukwoyTlCGqOMkmWvGCte85m3bTTAnZi6DP5vM1ePT3
- ChQ/VY3SIm2IpeIg7RG7c27q21qdaRhZ0xkzp7nere5kX2lFb0kJKJWPVEaeRRxW
- 218=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/internal.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/internal.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index bad1c300..00000000
--- a/swamid-interfederations-2.0/internal.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://internal.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an SP for Newcastle University's internal Server.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://internal.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://internal.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://internal.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://internal.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://internal.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://internal.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://internal.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://internal.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://internal.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://internal.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://internal.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://internal.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://internal.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://internal.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://internal.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: internal</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ir-ckan.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/ir-ckan.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 60155242..00000000
--- a/swamid-interfederations-2.0/ir-ckan.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ir-ckan.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "CKAN Pilot Research Data Repository" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-17T14:23:05Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC6zCCAdOgAwIBAgIJAPeId3DNWWTfMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
- BAMTDGlyLXRlc3RyZXBvczAeFw0xMjEyMTExMDI4MDdaFw0yMjEyMDkxMDI4MDda
- MBcxFTATBgNVBAMTDGlyLXRlc3RyZXBvczCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBANC9ceGGQWXwm+Cde8Ghc1eN8fy8c6dRjtKPbW21uyP9BGl3Xklx
- SMrraRvhG9j0rmtBb+E118NKuiL09lKSi9f3eTIYEMhbJvGFu6msGQlxNEM5DN8A
- MXS+pNc9vhX3thR4Ky3yOcXmzMPWhLA0j4dQ5K7KcFMfPBJRUECulbr/DfFED8s2
- GTNPbBSkLaOo21RkOq0zIwjuNu+6dP9LIwPbmaU9UZuWfE8KHQohLHOZLZ/nHc9P
- jbp0aD12MYH7rEoC3W3JBydFS0gBNFEOjR0Cz658f3zGyCn+z3Y/Nc6ipC0mt5Xa
- q3gm4LrcUPI4Ne/r2RtIGOIRyTfCicez0BkCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
- aXItdGVzdHJlcG9zMB0GA1UdDgQWBBQX2Mxcgb5mqroPRDSdWsNXELUVijANBgkq
- hkiG9w0BAQUFAAOCAQEAuqxLuLROS7JmDXqQSrF8z4mEbiPgc6jygHpG/2SAso9Y
- FeU69nMk2ZQ00z2oJJfuW6tYt+oQrEfO867C8FwAn5kMHzzytJsHIQ2ht+RwWZtF
- R95nDtrYRgVMpgalK+juowNruQmX4yBpHhIUdcqJJcjej/hP2Ec5ht1gXDLsilCs
- Z1zD5peqaO+ze5PQ/hNVZQ35WpYoDFOvNMtp2CJVeZWapEo/wUoaV68AKZc2no0g
- 5Xi6mSTxaND8PEyXULl1BbMrpGWCvXe7OJVCg1OT2q/bPwrRADeGwKw35WnzYjGy
- 2zrh2Nbr+Zuy7UvUBYbmoQdf3G/AooAf3laQ0/2LFA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ir-ckan.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University CKAN Pilot Research Data Repository</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ben</GivenName>
- <SurName>Allen</SurName>
- <EmailAddress>mailto:ben.allen@newcastle.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ben</GivenName>
- <SurName>Allen</SurName>
- <EmailAddress>mailto:ben.allen@newcastle.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/isis.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/isis.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 0015b935..00000000
--- a/swamid-interfederations-2.0/isis.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://isis.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an "Isotope Stock Inventory System" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-05T12:28:38Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://isis.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://isis.ncl.ac.uk/Shibboleth.sso/ncldur"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://isis.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAP2gLdgHSWHTMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmRhbnRvb2luZS5jYW1wdXMubmNsLmFjLnVrMB4XDTEwMTIxMDE1MjMxMloX
- DTIwMTIwNzE1MjMxMlowJTEjMCEGA1UEAxMaZGFudG9vaW5lLmNhbXB1cy5uY2wu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC96j7lMubJp+aX
- DqwLGDzxcrm2bxvKU3WjWK91L5rD0P0HYle7yr2VcuXsChz7jyFrMNZ+tCUhfvlA
- gRuhiKjXC9PRDf18NRx43UhPlRnwrvjN5OFhOH1Mvq4QFkpnTtqPHQ5RM7T3+U0l
- /lacgZtzhmXiCbY9KLOF0Qc5iLjD+ISwErSd6N1ovhIyNsZ4/44Cquz0fcFyV1PN
- BIzj1toMubMqStVY98OnKCVIDccOsKeZW7RPevLP4T5uglP88hgiFhN5auJDWy2B
- fm/AA9pjD/u9BsAggdVfrAE0WvatR+a6cpxngNTFjht9UUoxBlUq844RFZBqXf/v
- xLmipJUlAgMBAAGjSDBGMCUGA1UdEQQeMByCGmRhbnRvb2luZS5jYW1wdXMubmNs
- LmFjLnVrMB0GA1UdDgQWBBTHyeqX+oU3dzZx3e1+nYbV7evjejANBgkqhkiG9w0B
- AQUFAAOCAQEAIzxIXH09GMjE+nIpbGIACTI9ERepMQMzNnO+M8JugkhEhrLWXWvu
- XoswtdvxBH3rKMKZp1tJIk7T1toLDn3vCvn60S/6AjzQbyYzQ+qfDBij7X7kBU71
- jlfFn8dFGGcYNdPkl2EjrtWQ/pOTJiJAqal0rPQTcqmrFmi3UeDw+gtncRDIBEGx
- JvjufLt4NSdyg7ZHLLjLv2ntSGPk4ZFLjw0ihpigI6LLzhNv3zxuH/x/y1pIyolC
- MQHLbJL5+WUpb/syt6lRETX5WxKuJHTirlgkjz1edzAPDZ8SIKD3O/TcnKXB/rpF
- HitJuYtcRIR/YxPrydq4GCsFy99FLz336A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isis.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isis.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://isis.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isis.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isis.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isis.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://isis.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isis.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isis.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isis.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://isis.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isis.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://isis.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://isis.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://isis.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Isotope Stock Inventory System</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..8e0b7168
--- /dev/null
+++ b/swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://its-aai-logon.unibas.ch/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-03-09T19:56:20Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Universität Basel [DO NOT USE YET]</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Basel [DO NOT USE YET]</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">Université de Bâle [DO NOT USE YET]</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Universität Basel</mdui:Description>
+ <mdui:Description xml:lang="en">University of Basel</mdui:Description>
+ <mdui:Description xml:lang="fr">Université de Bâle</mdui:Description>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAgklEQVQ4EbVRQQ6AMAib/o/X8kANi90KG3GJ0wu0tJTMUv74ROSKe2ecaU4IMwHmXFMtBly5tyXAvND1JpiJMv5Y2uoiOlDV6u/M08W0iAcDCJzOlXvTAcPT/gKILdVSOCliDtn/iFlaxvM17YFwPpuYcyYACAxzvzqHrta3BU78Fdzl9FuPpzdbqAAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAfHSURBVHic7JvZTxVJFIf9n3zz2QffTFzBLSoxikiURFkcFBUUInpBFgUVVHAB9QIuIJlxA69xQUSGxRVUXABFVBQVQXu+3IqVovt2D/FWDeNynrqq6zb1dZ0653e6mwnWL2YTTP+Bpqam9PT0sYzMycm5cOGC4emYB25sbNywYcNYRm7fvv3s2bOm5/NfAG/cuHEsI38Y4FevXj148MDtrAp89+7dt2/fqmc/fPjQ3t4ujr2BHz9+3NvbG/5sNQA/e/YsMjKyoaEh5FkVuKamZvHixQMDA6L56dOnmJiY8vJy0fQA5qZERER0dHSEP1s9Lt3Z2Tlr1qzr1687T9lc+vjx41FRUf39/e/fv1+xYsW+ffvkKTdgaLl4W1ublqlq28MPHz4MyezcwzAfPnz4xIkT+/fvV/tDAuultfQGrZDMTuChoaHW1tbbt2+zyGq/ExjOmTNnyk2uxTRHaSezDZgotXTp0tOnT1+8eHHRokVv3ryRp2zA0OpdW2H605JgvnbtmmiqwNBGR0cfPHhQNKuqqlRmFVjQ6l1bYUby8KNHjySzBLbRChPMIldJYBxeuydL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</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>192.43.196.0/24</mdui:IPHint>
+ <mdui:IPHint>192.43.192.0/22</mdui:IPHint>
+ <mdui:IPHint>2001:620:200::/48</mdui:IPHint>
+ <mdui:IPHint>192.43.196.0/24</mdui:IPHint>
+ <mdui:IPHint>195.176.29.0/25</mdui:IPHint>
+ <mdui:IPHint>193.8.136.0/23</mdui:IPHint>
+ <mdui:IPHint>131.152.0.0/16</mdui:IPHint>
+ <mdui:IPHint>131.152.188.64/26</mdui:IPHint>
+ <mdui:IPHint>131.152.193.0/24</mdui:IPHint>
+ <mdui:IPHint>131.152.194.0/23</mdui:IPHint>
+ <mdui:IPHint>131.152.227.192/29</mdui:IPHint>
+ <mdui:IPHint>131.152.227.200/30</mdui:IPHint>
+ <mdui:IPHint>131.152.227.204/31</mdui:IPHint>
+ <mdui:IPHint>131.152.227.206/32</mdui:IPHint>
+ <mdui:DomainHint>unibas.ch</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:47.55898,7.58352</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIJAKhSRQPaDjLiMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2l0cy1hYWktbG9nb24udW5pYmFzLmNoMB4XDTE1MDMwNTE1MjYzM1oXDTE4
+MDMwNDE1MjYzM1owIjEgMB4GA1UEAxMXaXRzLWFhaS1sb2dvbi51bmliYXMuY2gw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Ew0TSF/LwcaHcLKqWygO
+LsQ8WqnH1fWhHjrO6uah9IlR5ReAblC3D6eF8I2E+oT36R6kO+hdUsTCwOXCdn86
+HgtD/b6bONReTSc3DJ3i50/hCZOAE9xkF7StvkEkTOEvKoQf8LF5phothcu2/4MJ
+uUqYiRm8TeYm8lfnWCjbSuCT7Na2P8s+EwLnbutkHwKFc03uCIWlCOQ5cw8soSXI
+ANd4xuL7t8LYTPWHB1dTv+VA/jWxddNgQ5cnJ5rkWRrLSTT3hgsUbgq7KAheF+8i
+WtPOlJr2cSqwK+C36LIg1c2BPs7rbUVlciBwOAhSXZ+VV75i2h939cUdiEVS4OzT
+AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2l0cy1hYWktbG9nb24udW5pYmFzLmNohi5o
+dHRwczovL2l0cy1hYWktbG9nb24udW5pYmFzLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRVRTA2rDViMaivqEgVn3TaybQJ8jANBgkqhkiG9w0BAQUFAAOCAQEA
+O8NZZx2cIVnL7crxy9znPUD6NbTfSF/J1pY2Rl0mSfQ3BTgA4u6Fu9ds8Ty9p8vH
+lpa1Sep/Iys6jsf578P6UXCZZxvYBbDXQehjIUJu4mRUBNIkKKMStbm6lSEWhHhv
+gqxkeAhQRXsCbbUiignEDLfAPJ7Oja+aMAVreBN0ojEDy+5Yapi5De5Mb9fbBPN8
+t7o0+SaKUJCeKAti9v18Sw7+gB8Ri2WoGKHTtfy75PYMlzPNcjXBKddSiDOhl/P0
+K1deBnSSDhXeFcAL/Dug74f6LwUYH0gE0hQ21MCU4h2mY69FTNjTnRtZA/ExQdQW
+xVM3RvYuoZFN8VKpoMHa6A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-aai-logon.unibas.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-aai-logon.unibas.ch/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-aai-logon.unibas.ch/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://its-aai-logon.unibas.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIJAKhSRQPaDjLiMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2l0cy1hYWktbG9nb24udW5pYmFzLmNoMB4XDTE1MDMwNTE1MjYzM1oXDTE4
+MDMwNDE1MjYzM1owIjEgMB4GA1UEAxMXaXRzLWFhaS1sb2dvbi51bmliYXMuY2gw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Ew0TSF/LwcaHcLKqWygO
+LsQ8WqnH1fWhHjrO6uah9IlR5ReAblC3D6eF8I2E+oT36R6kO+hdUsTCwOXCdn86
+HgtD/b6bONReTSc3DJ3i50/hCZOAE9xkF7StvkEkTOEvKoQf8LF5phothcu2/4MJ
+uUqYiRm8TeYm8lfnWCjbSuCT7Na2P8s+EwLnbutkHwKFc03uCIWlCOQ5cw8soSXI
+ANd4xuL7t8LYTPWHB1dTv+VA/jWxddNgQ5cnJ5rkWRrLSTT3hgsUbgq7KAheF+8i
+WtPOlJr2cSqwK+C36LIg1c2BPs7rbUVlciBwOAhSXZ+VV75i2h939cUdiEVS4OzT
+AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2l0cy1hYWktbG9nb24udW5pYmFzLmNohi5o
+dHRwczovL2l0cy1hYWktbG9nb24udW5pYmFzLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRVRTA2rDViMaivqEgVn3TaybQJ8jANBgkqhkiG9w0BAQUFAAOCAQEA
+O8NZZx2cIVnL7crxy9znPUD6NbTfSF/J1pY2Rl0mSfQ3BTgA4u6Fu9ds8Ty9p8vH
+lpa1Sep/Iys6jsf578P6UXCZZxvYBbDXQehjIUJu4mRUBNIkKKMStbm6lSEWhHhv
+gqxkeAhQRXsCbbUiignEDLfAPJ7Oja+aMAVreBN0ojEDy+5Yapi5De5Mb9fbBPN8
+t7o0+SaKUJCeKAti9v18Sw7+gB8Ri2WoGKHTtfy75PYMlzPNcjXBKddSiDOhl/P0
+K1deBnSSDhXeFcAL/Dug74f6LwUYH0gE0hQ21MCU4h2mY69FTNjTnRtZA/ExQdQW
+xVM3RvYuoZFN8VKpoMHa6A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-aai-logon.unibas.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">unibas.ch</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Universität Basel [DO NOT USE YET]</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Basel [DO NOT USE YET]</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fr">Université de Bâle [DO NOT USE YET]</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.unibas.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.unibas.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.unibas.ch/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>URZ</md:GivenName>
+ <md:SurName>Helpdesk</md:SurName>
+ <md:EmailAddress>mailto:support-urz@unibas.ch</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Arsene</md:GivenName>
+ <md:SurName>Gschwind</md:SurName>
+ <md:EmailAddress>mailto:arsene.gschwind@unibas.ch</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/itsmweb-dev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/itsmweb-dev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 00b84942..00000000
--- a/swamid-interfederations-2.0/itsmweb-dev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://itsmweb-dev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "DEV ITSM Server" for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-21T13:32:26Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://itsmweb-dev.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGzCCAgOgAwIBAgIJAPV5jEzBYyLHMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
- BAMTHGl0c213ZWItZGV2LmNhbXB1cy5uY2wuYWMudWswHhcNMTQwNTIxMTE1NzMy
- WhcNMjQwNTE4MTE1NzMyWjAnMSUwIwYDVQQDExxpdHNtd2ViLWRldi5jYW1wdXMu
- bmNsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Ctokgys
- T5AIXpR9u+x6kUlSdx6AXC3O/FznDmCtgVGUlh7Lcw9jRbO6bhe2YoRPGQcTvJBF
- q6YkAHdW6yhfx/C0jDQqZ1zxaJaer1ZjR+ejD2bhnpssl0/4ImLlJqEF0nssGCPQ
- GDZzV5RXNJavDWgPkuFUPYX6/FKNF+m8bmRm0gu+qd4TxacC/QTxq9Cz1Fm05OBA
- ZG6c2CYzo84rvCfWPQ0Tm8o1XYWiqXcD22nR8ccxIeeMhPM3qRg2cT3GgMTAShby
- ejZldR1cDlo0JXhXXrD4D34PeZpooXRadZjnQgGslCzprWJjwr6QpwV0vSfHJaeY
- wvvXDb0pMhcv9QIDAQABo0owSDAnBgNVHREEIDAeghxpdHNtd2ViLWRldi5jYW1w
- dXMubmNsLmFjLnVrMB0GA1UdDgQWBBSrPfyv4ic2aLHYVc+/auE7C/pq9TANBgkq
- hkiG9w0BAQUFAAOCAQEAh5CZmC36N7mIkczydzkB3daYkRr3zfdAPB5McGjANwmA
- 3eNqbpQDECeJv2byPmSt1dX/Pd0cplf3O/uY6oAqX8qh9TmteWUSZXi/R2fJextX
- +wKxzx5DHXR4oTcAWVPBxFWdo2qkbU5o8vPNm1Vxvve516iAjJHx61jUUHZzAtEH
- ss6jQzcdqHjmA1fpEXLOk4MTECWqkLynzjQqo6mkZCfAFMyLuu+Ab+sZ8LOP6rP5
- GTkAM6uatZDL4IsySDcPmrsfzHjgvqGDStC38m6s1u05tSMOnQ+vLunPcxalEcY4
- TgPulp5GNsiJLgd2sWKl4Sq1qTTNOQFhBXA7Z3owAQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itsmweb-dev.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itsmweb-dev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itsmweb-dev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itsmweb-dev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://itsmweb-dev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itsmweb-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itsmweb-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://itsmweb-dev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://itsmweb-dev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University DEV ITSM Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/itsmweb-test.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/itsmweb-test.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 68c05ba9..00000000
--- a/swamid-interfederations-2.0/itsmweb-test.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://itsmweb-test.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "TEST ITSM Server" for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-21T13:39:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://itsmweb-test.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDHjCCAgagAwIBAgIJAMb457vtaZlUMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
- BAMTHWl0c213ZWItdGVzdC5jYW1wdXMubmNsLmFjLnVrMB4XDTE0MDUyMTA4MzQ1
- OVoXDTI0MDUxODA4MzQ1OVowKDEmMCQGA1UEAxMdaXRzbXdlYi10ZXN0LmNhbXB1
- cy5uY2wuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDfAif
- Ghz558e4M/rTm/vhxuwX91vPhwVtWpZIXc0usDzFilKFC0dMQ6TuDk2BOYlah6nq
- JcpMBuWjMxQAkXeHbBqWC4jQvnEoCK3EZTTeQZ17VeoL8GfYoW18d4VJYMXgl17+
- eKM9G2w6wWhm1H67nD1QFJacMEDbMgiTKIzGIC2CY8f1OGf2vgAHXNnZ6d5ZcLUe
- zZj/Qzvh3YzZSmSxJ5Sncj9mXvZXxiZGjf9P/GXnNAgtK6+CMwtDqWrieThpuKlD
- Zd1vHDCwy2Dr87UNNebo0XLhT3j+gN6KEp1NeX+lznAg3uF7HUMBbNH1qm1zKZgY
- EDY0rC732zbSuo9tAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWl0c213ZWItdGVzdC5j
- YW1wdXMubmNsLmFjLnVrMB0GA1UdDgQWBBRYIn0hkDkRtZ0XDUP4atCHPI8VEzAN
- BgkqhkiG9w0BAQUFAAOCAQEATlGN9/XDARUU+3+ZRyuY25455owp4Aqfo7yLU193
- xL2CC0oFUdizlzehCt1fXD6h3pa8aCnYdUTKpIUkGqlvrBJzxMZa5IUUcQQ85OoX
- WKfFpjJjMAXPnFHnnz+MGA/M3XJHb3tkkFW7NKkXahxHhq/6RwR8lalMnEZRB5WA
- JAtczW+5UP4EZ8RIaRlqOXkiLUvXRRKVQymYXtPdAUKS5VLEzqL+UWTXspFCE9EX
- ob7EftEaEOoid7/2jmj7r0oI7Fhbz5VWyrzuwGeRZ2NY6ChbSNkCm2p5QnSvQGj8
- /5yywOygDjB+qnRO8wZcm+1362G4c7ZI2x4qkFxFexED1Q==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itsmweb-test.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itsmweb-test.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itsmweb-test.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itsmweb-test.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://itsmweb-test.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itsmweb-test.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itsmweb-test.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://itsmweb-test.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://itsmweb-test.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University TEST ITSM Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rcnpublishing.com-shibboleth.xml b/swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml
index 994d5e69..b4865990 100644
--- a/swamid-interfederations-2.0/rcnpublishing.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml
@@ -1,14 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rcnpublishing.com/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journals.rcni.com/shibboleth">
<!--
- This is a "Royal College of Nursing Publishing" OpenSAML SP for Atypon Systems, Inc
+ This is a "Royal College of Nursing Publishing" OpenSAML SP for Atypon Systems, Inc.
-->
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-08T14:19:46Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-06T13:47:37Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">RCNi</mdui:DisplayName>
+ <mdui:Description xml:lang="en">
+ RCNi is the premier provider of innovative and creative information solutions
+ for the whole nursing team and allied health professionals.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://journals.rcni.com/page/about-us</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -34,14 +43,14 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rcnpublishing.com/action/samlACS" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rcnpublishing.com/action/samlACS" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rcnpublishing.com/action/samlACS" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journals.rcni.com/action/samlACS" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journals.rcni.com/action/saml2post" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journals.rcni.com/action/saml2artifact" index="3"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
<OrganizationDisplayName xml:lang="en">Royal College of Nursing Publishing</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://rcnpublishing.com/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://journals.rcni.com/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
<GivenName>sso-support</GivenName>
diff --git a/swamid-interfederations-2.0/lectopia.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/lectopia.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 4305dce6..00000000
--- a/swamid-interfederations-2.0/lectopia.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lectopia.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Lectopia Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC4zCCAcugAwIBAgIBADANBgkqhkiG9w0BAQUFADAXMRUwEwYDVQQDEwxsZWN0
- b3BpYS1uZXcwHhcNMTAwNDI4MTM0MzU1WhcNMjAwNDI1MTM0MzU1WjAXMRUwEwYD
- VQQDEwxsZWN0b3BpYS1uZXcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQDtxYuuBrryd7jF+SCROSuRKXtmTHXnmGKe24cgQLVrBtyWHsw0MubKY94ydlJK
- +fs273ME9l+oeIPSpcL4xtk/3K9quhKaq7srw99tEZlDCenB6ZgCHLuO2PTe37ih
- SXe4AMcQO7yyZaVB7jk+3xWUb+Q01w2YzFNmF95SSL0YYmsCSbvitLrycQ7OmqKU
- GKfIV7zeYtzZufWcG3Bq51/jBtKjB99yZ7q44g6LN8RX2gFWwWGaAzusdbB9EjIP
- fFNjSR+KbIUwwrhUfgkzAUN6ihbsV8ipWuSTEcJZFqvn9Vz/H1zq2pXQ5EqbR/CP
- a5SvZWSWzpNCpzLQ2OEhxzhXAgMBAAGjOjA4MBcGA1UdEQQQMA6CDGxlY3RvcGlh
- LW5ldzAdBgNVHQ4EFgQUWJBF/P6HJ0nbp5T3QoJwpNn3Kg8wDQYJKoZIhvcNAQEF
- BQADggEBAHtyLHVNnhur3ucSScj5nDY6tllHfXJycyYkGjPhJkDOsZJmvaUVkMmb
- RfKSNJwEoduYN30GvrEJxELrRtyeacHh7WFN1NMJlJ99As1PyAjmjXtTINmfv1qJ
- JFYPnimUR/w0S6trOT00IwubZ7EdpIuOueetPIabZE7DyT5UnS659UvpTZ5N/IQj
- qOUcP1PZFan2/jCMAUDqXlSK4Nbtw7hkAj7+I//Y5S07X5kDxOGrryjFxB10TZ7Q
- ZElm+hAdSMs3yuKP7SwIHfQSdRN6RKGEp8wg4/JFZi68y5ISZk2K/PlnCAmBf2wa
- st2ZJTUQrE0f/V9R2BaSP9Bmzvm8Kic=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC4zCCAcugAwIBAgIBADANBgkqhkiG9w0BAQUFADAXMRUwEwYDVQQDEwxsZWN0
- b3BpYS1uZXcwHhcNMTAwNDI4MTM0MzU1WhcNMjAwNDI1MTM0MzU1WjAXMRUwEwYD
- VQQDEwxsZWN0b3BpYS1uZXcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQDtxYuuBrryd7jF+SCROSuRKXtmTHXnmGKe24cgQLVrBtyWHsw0MubKY94ydlJK
- +fs273ME9l+oeIPSpcL4xtk/3K9quhKaq7srw99tEZlDCenB6ZgCHLuO2PTe37ih
- SXe4AMcQO7yyZaVB7jk+3xWUb+Q01w2YzFNmF95SSL0YYmsCSbvitLrycQ7OmqKU
- GKfIV7zeYtzZufWcG3Bq51/jBtKjB99yZ7q44g6LN8RX2gFWwWGaAzusdbB9EjIP
- fFNjSR+KbIUwwrhUfgkzAUN6ihbsV8ipWuSTEcJZFqvn9Vz/H1zq2pXQ5EqbR/CP
- a5SvZWSWzpNCpzLQ2OEhxzhXAgMBAAGjOjA4MBcGA1UdEQQQMA6CDGxlY3RvcGlh
- LW5ldzAdBgNVHQ4EFgQUWJBF/P6HJ0nbp5T3QoJwpNn3Kg8wDQYJKoZIhvcNAQEF
- BQADggEBAHtyLHVNnhur3ucSScj5nDY6tllHfXJycyYkGjPhJkDOsZJmvaUVkMmb
- RfKSNJwEoduYN30GvrEJxELrRtyeacHh7WFN1NMJlJ99As1PyAjmjXtTINmfv1qJ
- JFYPnimUR/w0S6trOT00IwubZ7EdpIuOueetPIabZE7DyT5UnS659UvpTZ5N/IQj
- qOUcP1PZFan2/jCMAUDqXlSK4Nbtw7hkAj7+I//Y5S07X5kDxOGrryjFxB10TZ7Q
- ZElm+hAdSMs3yuKP7SwIHfQSdRN6RKGEp8wg4/JFZi68y5ISZk2K/PlnCAmBf2wa
- st2ZJTUQrE0f/V9R2BaSP9Bmzvm8Kic=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lectopia.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Lectopia Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>ISS Helpline</GivenName>
- <EmailAddress>mailto:helpline@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lesson.cs.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/lesson.cs.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 12cd5ba3..00000000
--- a/swamid-interfederations-2.0/lesson.cs.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lesson.cs.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 "Computing Science Lesson" SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/shibboleth-idp/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/DS"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDADCCAeigAwIBAgIJAKlyumoGUQihMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
- BAMTE3ZzLWxlc3Nvbi5uY2wuYWMudWswHhcNMTExMjA2MTQzNDA4WhcNMjExMjAz
- MTQzNDA4WjAeMRwwGgYDVQQDExN2cy1sZXNzb24ubmNsLmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4KYoJ8/xEOtcBraZMYWrIgsSotN8/wb8
- sXFcj0A4a01nnFzh0GRQBnfl+ShXzsgCHI1bMJajcMQ6j2vB7at3VWccbvAWvte1
- e1Ed0wgG+u5a/3llI8Rq8jl9585pQ+I25ks57fBIQ+gvqtRgflaiNAcYxyQFfx/5
- bLKeCM9bCZa/HO6Z1anH2nBgzJ1kfRLPuJr1TQeelhL/KnOQEIgDnmKkrPXWMMhb
- 16YshEGeX1OY5HKj9374qtmG5CN63pR7lzWwj7P0dioCPetDGgWj34jNu6C4ivxP
- O0CIPbUoI3r3nOZOTVliu9/7EUeIy4wbDLjK+emZF7ZBTLFqOmj4ywIDAQABo0Ew
- PzAeBgNVHREEFzAVghN2cy1sZXNzb24ubmNsLmFjLnVrMB0GA1UdDgQWBBSMJ89J
- k5UY0+hMrofnI+X34KpMITANBgkqhkiG9w0BAQUFAAOCAQEAuG8452JnD6hl3TA1
- Gk6ulE3J3ld9Damn0n+qSl3QLVjzDUYMro3R4zv/UDJ3jtf0jQPSupyuG3DXZzWL
- wSjgBaBrhwfjqAWPqsMv5zdVBrSFtgk4GkhSWGKvWEhYnSa+eGxmvRNghFIZus5c
- qYl6nBZ6Q59MBlslcT2JJI9AoPadF0CgxV8PbdJRszhQNLwQfB6MM/DmAbFKv7Ba
- 5NExqvd56ed2ec0e3Y4NCUXyGOhB+RbRtPHwj1XtWWlGUZv3zIz8aL/URNoT+qnh
- 1MHG1iCH4a4QAI8hg7UwpgwkFVzMQ5FDSHCVTEPBUkAjRdCIZBoWNl4/cIVj7wy8
- HLQVpw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lesson.cs.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Computing Science Lesson SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Jon</GivenName>
- <SurName>Dowland</SurName>
- <EmailAddress>mailto:jon.dowland@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/libbookings.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/libbookings.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 6896e781..00000000
--- a/swamid-interfederations-2.0/libbookings.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://libbookings.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Library Bookings" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-14T11:45:18Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC2TCCAcGgAwIBAgIJAIbzpon9V3c+MA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
- BAMTBnBlbmNpbDAeFw0xMzAzMTMxMzQzNTBaFw0yMzAzMTExMzQzNTBaMBExDzAN
- BgNVBAMTBnBlbmNpbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7i
- ExkJ422ugJhh/pxNRXI7b8GAQG5sxP7LH/UiLG/FGPooMwjiJTQJKMxl+xjovCoX
- NY01kjVplUTFLWxgJrJ0IQ32NR4q05xb9nPCOJnk601T5bG1yP3hQuTTsQYy08QQ
- tVXQqot7oTAIjmJfhDHWzLMe8wZ6ZbytgKLiKdJ1lr2owGrKXoqAt4muYjPuGmiO
- f5/G1s40f2IKF55Q9TzY2StIjn7C56ptLYMAvkyKriXBUkBW13sn8ZOle7aMErb4
- RBy59nqWmn3bZT/yuDpPEq5V622tY6rObsAoiWChLz5atePR8AYAZVTkjV/lZWCl
- G7qnSK+XpbrRYno00YUCAwEAAaM0MDIwEQYDVR0RBAowCIIGcGVuY2lsMB0GA1Ud
- DgQWBBQT4vUuYIbpWNBLVkqtaBTznNtoEzANBgkqhkiG9w0BAQUFAAOCAQEAFPwE
- tUfHPXfTKmUKcGEaTbcLOG7lZ16ZSqWNOqHaNBE/F9xPGbjmKVNuSD16yThw2UpO
- chvBe2jcHr/chACCYj++CwMlW676yZchKjpbDpqAw/rqwUtw+qkxjESfdrC+kqsd
- 1faZKgb78TbvVHgI3C37C0Y0Okgcb6U1dkv3jFBikVWLBxbt2VbblBE+EgCqOYzO
- 3PC4QxZulCGCI48tH22tXTAo0mXwW6EcXKwCvk3RO/6/mGqbnuLfvfBtrp21rPkh
- ncyUjIBvTWFeCIf/cWCgbQnE8MNtMBFWoiK9CRQ2H53NpwP97qsp0yBH9sHva3U+
- FUI9K8nsMzEaUNH1jA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC2TCCAcGgAwIBAgIJAIbzpon9V3c+MA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
- BAMTBnBlbmNpbDAeFw0xMzAzMTMxMzQzNTBaFw0yMzAzMTExMzQzNTBaMBExDzAN
- BgNVBAMTBnBlbmNpbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7i
- ExkJ422ugJhh/pxNRXI7b8GAQG5sxP7LH/UiLG/FGPooMwjiJTQJKMxl+xjovCoX
- NY01kjVplUTFLWxgJrJ0IQ32NR4q05xb9nPCOJnk601T5bG1yP3hQuTTsQYy08QQ
- tVXQqot7oTAIjmJfhDHWzLMe8wZ6ZbytgKLiKdJ1lr2owGrKXoqAt4muYjPuGmiO
- f5/G1s40f2IKF55Q9TzY2StIjn7C56ptLYMAvkyKriXBUkBW13sn8ZOle7aMErb4
- RBy59nqWmn3bZT/yuDpPEq5V622tY6rObsAoiWChLz5atePR8AYAZVTkjV/lZWCl
- G7qnSK+XpbrRYno00YUCAwEAAaM0MDIwEQYDVR0RBAowCIIGcGVuY2lsMB0GA1Ud
- DgQWBBQT4vUuYIbpWNBLVkqtaBTznNtoEzANBgkqhkiG9w0BAQUFAAOCAQEAFPwE
- tUfHPXfTKmUKcGEaTbcLOG7lZ16ZSqWNOqHaNBE/F9xPGbjmKVNuSD16yThw2UpO
- chvBe2jcHr/chACCYj++CwMlW676yZchKjpbDpqAw/rqwUtw+qkxjESfdrC+kqsd
- 1faZKgb78TbvVHgI3C37C0Y0Okgcb6U1dkv3jFBikVWLBxbt2VbblBE+EgCqOYzO
- 3PC4QxZulCGCI48tH22tXTAo0mXwW6EcXKwCvk3RO/6/mGqbnuLfvfBtrp21rPkh
- ncyUjIBvTWFeCIf/cWCgbQnE8MNtMBFWoiK9CRQ2H53NpwP97qsp0yBH9sHva3U+
- FUI9K8nsMzEaUNH1jA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://libbookings.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Library Bookings Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/library/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Paul</GivenName>
- <SurName>Kobasa</SurName>
- <EmailAddress>mailto:paul.kobasa@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Paul</GivenName>
- <SurName>Kobasa</SurName>
- <EmailAddress>mailto:paul.kobasa@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/libproxy.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/libproxy.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index f1e53148..00000000
--- a/swamid-interfederations-2.0/libproxy.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://libproxy.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an EZproxy SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEdTCCA12gAwIBAgIQH8o4/KIMxCU3aV4quKMPwjANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDEyMTAwMDAwMFoXDTE2MDEyMTIzNTk1OVowQjEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDFBQqLmxpYnByb3h5
- Lm5jbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK74ch5v
- B2mAzhdUps7bov2FzxRZpjTMAHgr4+9XacmkiYjnwkRpWRwTlivYAyexryz7dQeB
- UJUNbFMo4W3dCYj31GJIF8bhC0xrc+jrQNfIilwpVLDMmeLHcAssdyb9G9e/rhH/
- aqPznJu/fpdZMlh6MOxxDc6pnPsIRTFjzHT9Rzn6xlPwyZTUik4fCOKry7wX1hlr
- jpsXFz/zG70ALYeNOxXT3XKo4FhKVgWEcctWg+piTmBsOp8TbMR3CKdq5zNwziR4
- XVL5UZap9wsUb8/ieqEpjgus7cfg2mA9gAyEtnqopex3JLyzmoTMiKVYVZUZs6P8
- 0UjShVM5GLS+DksCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
- KzdXR+qQ47ntMB0GA1UdDgQWBBTHiXLmDVI8ibMAV+teni+oStCPUDAOBgNVHQ8B
- Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
- BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
- BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
- cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
- L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUKi5saWJwcm94eS5uY2wu
- YWMudWswDQYJKoZIhvcNAQEFBQADggEBACDRFyFRLiJMbiFnIbp2ZsiZOsxUGXoR
- 7ZX8GG9ala8IG7y+Ka1r32wbdB/1DKRd2uA11lTB4F1zpXOQgSl53eqOqfGb17sE
- i0x0W8Kw/CK8ct+3SKMfUIrspfpu9ZSn7SzwaW+yhiSkYzM4tHlj7W4G8Q7CfAg1
- kYiGOJBNdpKDCOJjO97DAy5bxByaeiI91TKNJGE94tzoINIoCiGh8daOarPcMaS0
- 95HimpZGcCRXAyU0PI8uIJCx1Hr2v5ylntbTuDDkYLgtLZmRTA90aSNX0BewcS/6
- ez2h4B2D9SDG885gZqr/S6Yh9rkcla0roTEZTWsxyWkZzZR1LQL7OVs=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.libproxy.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.libproxy.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: EZproxy Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml b/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml
index f96f0eea..fb2ca19a 100644
--- a/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml
@@ -3,7 +3,6 @@
<md:Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/lists.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/lists.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index cc806523..00000000
--- a/swamid-interfederations-2.0/lists.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lists.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC5TCCAc2gAwIBAgIJALPnvwUK3LYlMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
- BAMTCmlzc21sbS1kYngwHhcNMDkxMTExMTQwOTA4WhcNMTkxMTA5MTQwOTA4WjAV
- MRMwEQYDVQQDEwppc3NtbG0tZGJ4MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEA8I8lwx8UfEt5nvfLeiTwA9pAxsN+0OSPdOwuVRRWi4M9500zNmAXuddD
- ULzdgeAS98zYpFVLJI0ysZwzr7Nx0caPNF69pgTnB2Bo2RUZsozC24MkImBBshnP
- sSs3OP6/0ocrFDrNEFKj+93emceW6u5RtyOXeWf0sdC7spW+/mAiHfqJCRmGfR6d
- boCZFN8g0LOoNyjb9DqovluyZ99BRsSunrlLP9bz/sOCRGchWz2cfn60klCPr1wF
- iB2ATU65VfVm4c3R0LKbPPV84DgxJA3KNSE+kCEwjum8E6X2Loc9/XSEnyeCRcFO
- N/wquM7wGrJ0Z1EHvxXdu2yqGQsUEQIDAQABozgwNjAVBgNVHREEDjAMggppc3Nt
- bG0tZGJ4MB0GA1UdDgQWBBR92iWgkbQtLBfItmwh8t7o0Om54jANBgkqhkiG9w0B
- AQUFAAOCAQEADZNr2JtFCaa2uXClEq5IjLdrx+0V8DiNds8uRZjzJWxOBtu8sxmG
- iHZ2G60m/qSz4lP3RxS9GEmB1tqF7ckLmPC1DwDPVC8r2peOekcVirt0wPzRFR5G
- iFidfHbysL487dY5WtFEaqSFiqYA7LC4mmu12QLrbWvs5UpkpCksqT8eKnChiQO2
- L2jYICDWSXySOh3A/XvtBFLM3njyAgnhViIDVFWo19BUA8tTxwy/mugYNpLmAOLI
- ZGQyUie+dSx/hiE8kdUs/J3Vr78s9IsMO0iEipG1Y0ZJaamnhybzjjne9/qrmBHM
- qXhJNRCw9fxvJHafpXhUDKyNN3KQzmC5zg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC5TCCAc2gAwIBAgIJALPnvwUK3LYlMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
- BAMTCmlzc21sbS1kYngwHhcNMDkxMTExMTQwOTA4WhcNMTkxMTA5MTQwOTA4WjAV
- MRMwEQYDVQQDEwppc3NtbG0tZGJ4MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEA8I8lwx8UfEt5nvfLeiTwA9pAxsN+0OSPdOwuVRRWi4M9500zNmAXuddD
- ULzdgeAS98zYpFVLJI0ysZwzr7Nx0caPNF69pgTnB2Bo2RUZsozC24MkImBBshnP
- sSs3OP6/0ocrFDrNEFKj+93emceW6u5RtyOXeWf0sdC7spW+/mAiHfqJCRmGfR6d
- boCZFN8g0LOoNyjb9DqovluyZ99BRsSunrlLP9bz/sOCRGchWz2cfn60klCPr1wF
- iB2ATU65VfVm4c3R0LKbPPV84DgxJA3KNSE+kCEwjum8E6X2Loc9/XSEnyeCRcFO
- N/wquM7wGrJ0Z1EHvxXdu2yqGQsUEQIDAQABozgwNjAVBgNVHREEDjAMggppc3Nt
- bG0tZGJ4MB0GA1UdDgQWBBR92iWgkbQtLBfItmwh8t7o0Om54jANBgkqhkiG9w0B
- AQUFAAOCAQEADZNr2JtFCaa2uXClEq5IjLdrx+0V8DiNds8uRZjzJWxOBtu8sxmG
- iHZ2G60m/qSz4lP3RxS9GEmB1tqF7ckLmPC1DwDPVC8r2peOekcVirt0wPzRFR5G
- iFidfHbysL487dY5WtFEaqSFiqYA7LC4mmu12QLrbWvs5UpkpCksqT8eKnChiQO2
- L2jYICDWSXySOh3A/XvtBFLM3njyAgnhViIDVFWo19BUA8tTxwy/mugYNpLmAOLI
- ZGQyUie+dSx/hiE8kdUs/J3Vr78s9IsMO0iEipG1Y0ZJaamnhybzjjne9/qrmBHM
- qXhJNRCw9fxvJHafpXhUDKyNN3KQzmC5zg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lists.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lists.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lists.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lists.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lists.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lists.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lists.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lists.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lists.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lists.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Newcastle upon Tyne: lists</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Helpline</GivenName>
- <EmailAddress>mailto:webmaster@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Caleb</GivenName>
- <SurName>Racey</SurName>
- <EmailAddress>mailto:Caleb.Racey@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/m.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/m.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index d706e3e5..00000000
--- a/swamid-interfederations-2.0/m.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://m.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Mobile Portal Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://m.ncl.ac.uk/Shibboleth.sso/shibboleth-idp/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://m.ncl.ac.uk/Shibboleth.sso/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://m.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://m.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://m.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://m.ncl.ac.uk/Shibboleth.sso/DS"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://m.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAO8dH32hCAHpMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB21vYmhvc3QwHhcNMTExMDIwMTMxMTI5WhcNMjExMDE3MTMxMTI5WjASMRAw
- DgYDVQQDEwdtb2Job3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- sUoIUuIHB7TCpKJe0qE+95JDD71guf34mUY82HKYCCrcNKmR0XgKqefTz2cPFnlm
- Gk0twelQ8+yn+DvLe7QguJ6758nwhsIYtalKLrXoD9MTMyN2WZWu39fpRS7qhGBX
- 7dS6NRj80kfFC++qlVKhKnbFSI0qAGLCoBbEPFAwGRfUNdzTDaxHIvoc2O3P6EBY
- iWdLZc9cwq/sH0eY4foPEAN9rHon1lLO2Qg7TPJWvBHeZZGw5Y7Gt/6dHF6vNg7d
- iwA5fa/TzgU7Wcrqb9LWezgRWvTAh7X75BYr0z1DQnfWJOyvTr3tbwy8Elo3kU1z
- 9bzQC0UF+kT3RzUlHmQ3uwIDAQABozUwMzASBgNVHREECzAJggdtb2Job3N0MB0G
- A1UdDgQWBBTO3NMLOcG243R6suIm3VJJ62Ac4DANBgkqhkiG9w0BAQUFAAOCAQEA
- kRvCejjDws6oe7TiXR56bOKVlCq4wSkqR4RAHax23Xbg5kbSeqXvUA7Yg9C6FEnn
- 4d4g/sALt708xJ80gCmAUOJwnoBdzicjXM14XgvOvI/5C/8ljLytvzivj8XKrh76
- 9miczrzVT1i6vsolJ99K6BXiF5BkaqgJq4Ra/Z/KO76PFAfAtBhpDRxjHdQCQxSQ
- nK46ozdQYcfVFcfdd+sEaq6iDND/QHiSLX/YquDahmD76iP1NLCsITXPTQdpan02
- J5TLa/1bOJkX9IpYZ2Bxr5oI3yTrclmSne/8hiv/TA319QEtxSKDLvmC6e9M2sok
- 56Tx657YklwJZJ7lMZMG/w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://m.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://m.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://m.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://m.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://m.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://m.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://m.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://m.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://m.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://m.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://m.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://m.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://m.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Newcastle upon Tyne: Mobile Portal</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT service desk</GivenName>
- <EmailAddress>mailto:it.servicedesk@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andrew</GivenName>
- <SurName>Martin</SurName>
- <EmailAddress>mailto:Andrew.Martin@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/manchester.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/manchester.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 7b8ab0da..00000000
--- a/swamid-interfederations-2.0/manchester.hosted.exlibrisgroup.com-shib.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://manchester.hosted.exlibrisgroup.com/shib">
- <!--
- This is an "ExLibris Metalib ASP SP" Shibboleth SP for Ex Libris (UK) Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-13T16:40:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNjCCAh6gAwIBAgIJAK8CsrsSbK5sMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
- BAMTJWRjMDN2ZzAwOTBldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTIw
- MjEzMTA1MzQ1WhcNMjIwMjEwMTA1MzQ1WjAwMS4wLAYDVQQDEyVkYzAzdmcwMDkw
- ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEA12jbSN8VkdsEWt0yfZqBmn1mdygZkmR+6hq9XyTsa056p5uw
- EUAf8TnQvmW8YEpo/7UI6DDFHmjpcA+I+YCJlohggE3YbOD1Nruh0AV32Vn4yKav
- /uynYn63gPtK2MH94ym25jeYFGNokUMgrcINN88pUVvsy6RRU9ivY92ICm7MVYai
- o9DDxhiwn8NAiXc9Xf2UzR+TfdogdLjgxMrnsPrfKYvxSxQQYXtzEAfEZmTKkLHX
- Es5t72ORdbNao2IXP4q2BTuCTCRaE+hG0qKETNbBXWrsU8ZKGxhj4xGhoGxT+zfS
- 5CUV2eAb8gO4uRU/gXp9VuQmkNRYArPzvi3TawIDAQABo1MwUTAwBgNVHREEKTAn
- giVkYzAzdmcwMDkwZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
- BBTZK/ibFNDgNZa+0jQhVWAQsyAKnjANBgkqhkiG9w0BAQUFAAOCAQEANZk9UZAk
- FX29HuGKyceSK0lVDOa4wP1R4hAJzfJNVeUZTApk2FcHd683+rxRIcooX1ee0fP1
- 91euAMtX5tgtqwzL67SlXFsZp8/1aDVPyaWVolvD898RV+rbH8ilg3zD/w6pR4s5
- fTjTGjXShK6O+TffdTEBW5YWCzmIOTheapTG8qsNPFtnQ+MAc5hYi/XupU7Snd1v
- BOanlPPFv1cAtPlgqWKXk25yaLA9oKtIbiefw6ZPtVdE4KxmZnCCW6pMjWeLygTo
- EZOItlM8FtzbKUEzvn8ssrBbU2Bwjg08MtD+1fnn2xr64Oh7C3jsoQ/5vcgG72tk
- V6HGD2HGtZeYtg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://manchester.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">ExLibris Metalib ASP Service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Frank</GivenName>
- <SurName>Bieber</SurName>
- <EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Frank</GivenName>
- <SurName>Bieber</SurName>
- <EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mathsupport.mas.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/mathsupport.mas.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 82a79212..00000000
--- a/swamid-interfederations-2.0/mathsupport.mas.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mathsupport.mas.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Maths Support" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-12T10:25:06Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/WAYF"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/WAYF"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/DS"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDBjCCAe6gAwIBAgIJAIuVo4ImldDvMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
- BAMTFW1hcy1zdXBwb3J0Lm5jbC5hYy51azAeFw0xMjEyMTAxMTAxMTZaFw0yMjEy
- MDgxMTAxMTZaMCAxHjAcBgNVBAMTFW1hcy1zdXBwb3J0Lm5jbC5hYy51azCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO32N3DmsbdEALEyDfQrTiF8scKa
- 2lVcxBt68RlMtjN3nY7Fyo3I6/OCVdo9AWh/X1yfj40bFPCumpyolhAb9RkuC8rg
- AX1yrdb1lmK1aNzBfWlA/3l2Cysmh10Gs0YaFc62L5VHysvo+VzTqZtsy0EcACLo
- HGaD+dn0hSpeZHLNthv9fRi8mLYesG2kE8ZfXE7e8rtZAVQgkOaLO997xThgvaXz
- tvRBMhuEFzGSovKg3L8oLmsuYm0jmDnhNE22SDNCwjsnlT3E2Z5T74WDfVgTEJ/v
- JiWqo2Ni5zY2ciysV2Jb1ZAJyOyJmxYf0SWlH+vVOmmCGBRHhTd7ct1u2aMCAwEA
- AaNDMEEwIAYDVR0RBBkwF4IVbWFzLXN1cHBvcnQubmNsLmFjLnVrMB0GA1UdDgQW
- BBQ8YqG+3HRAT8ckwSRuBukr2n5qwDANBgkqhkiG9w0BAQUFAAOCAQEAJvYf/LmS
- 6EdWsA3NZ41nrAkhWKSuiWDi1DZQaaEFPXUubx0czSscyWIcK6t0gW1xUFJ37i+b
- vBtooDB7hCQeqIXPhbY7UghGnRG06jW7NP6bQXlUx2grWeBHf6T1uEb4k43tiUR6
- oXsZXw7OP7gMUkjZuX5O0X0FwT66xsJb/0WuphV40/WKNFwllUXMVxxxF3RjCNd+
- V3GRVBIKcwjK9o6CpHfIO0JhiWoCemi7f5kyH2rMwR2dWEKnDo0eo3Z4PJqzvWK9
- nVg6+9ngrxT/7c8egWQZeZBeG5RVjXsrjYnSFosSBwPt6TkWQpjOE/T//2YH2/iV
- wJRInanK3KQtDQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mathsupport.mas.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Maths Support SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/maths/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/media.heanet.ie-shibboleth.xml b/swamid-interfederations-2.0/media.heanet.ie-shibboleth.xml
deleted file mode 100644
index 1666b74a..00000000
--- a/swamid-interfederations-2.0/media.heanet.ie-shibboleth.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://media.heanet.ie/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Media Hosting</mdui:DisplayName>
- <mdui:Description xml:lang="en">The HEAnet Media Hosting service allows authenticated users to upload audio and video content in multiple formats. This content will be transcoded into suitable formats for podcasting and embedded on VLE and other websites. Playback of the hosted content from its unique URL does not require authentication.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://media.heanet.ie</mdui:InformationURL>
- <mdui:Logo height="82" width="200">https://edugate.heanet.ie/rr3/logos/heanet.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDlzCCAn+gAwIBAgIJALwnnZrelCacMA0GCSqGSIb3DQEBBQUAMGIxCzAJBgNV
-BAYTAklFMREwDwYDVQQIDAhMZW5pc3RlcjEPMA0GA1UEBwwGRHVibGluMRMwEQYD
-VQQKDApIRUFuZXQgTHRkMRowGAYDVQQDDBFoZWFuZXQtbWVkaWEtc2FtbDAeFw0x
-NDA0MjkwNzU0NTFaFw0xODA2MDcwNzU0NTFaMGIxCzAJBgNVBAYTAklFMREwDwYD
-VQQIDAhMZW5pc3RlcjEPMA0GA1UEBwwGRHVibGluMRMwEQYDVQQKDApIRUFuZXQg
-THRkMRowGAYDVQQDDBFoZWFuZXQtbWVkaWEtc2FtbDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANSxKvKTIYt4t6EspXboyTqxxalVHgO3z1/pHqK0fGAu
-tnxLYiDHIah6Zt+tjaBomK0RdiJ21bddGPYdDWYx8vKMDa7xJUQF8Gh8fnS+9mqt
-FSoBWvdsw6dNh+DxXD6tIA3cD0uD3eviIa0/i2AIjFgfe7piWFqU7msOTSDpKfXx
-dM+jTNI/1zAT0PAwM6me4IZm1VoHqe73gMWF7AW5Hj+jsHYgj5z0s8A7XP9G8U2h
-yFrRBuHjy6X59OFXV1yqAahsWs5TrUDVhsbRmuPmP04Z17WB9rzclJWFkMQYDSDw
-L5VVsxqUBaVBBfZZLAC9xXy4U4OBYXXV5mSfUlB4VFUCAwEAAaNQME4wHQYDVR0O
-BBYEFFm44Lw4lG3l7eOE4yK5hkDKTYB6MB8GA1UdIwQYMBaAFFm44Lw4lG3l7eOE
-4yK5hkDKTYB6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJV2dWbF
-9axqE2pY/Qqwp1xA049DXLFSnVDOx5Xb5wI7RoeUOaxDg6kvyN4VMA51+S4pmWLg
-PcOStj2nsjZI6vOzYrR8enE1XhBJ/WNQJ71NJwHd7Wi0eBA22Nx+jsGUjynvERpE
-uK+byGfxWDrcYSzyTplvEIBvSnbGqQh45uvV2suc5T1+PxAVy/z6iDtpksSDovVF
-ncOBL30Cvnp2k+wi8R5+0quE35rZe5G5aa4rLOBfgLzciWCFB3PbKT2n4kxyOocx
-dRjtQvcYv9PsYivyeqF6kB4bq6yFuUoMladJnKeIySOkSEb0QlCmZTZlytiMyVsP
-IWHeIHoDFxmzg30=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://media.heanet.ie/Shibboleth.sso/SAML2/POST" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://media.heanet.ie/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://media.heanet.ie/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://media.heanet.ie/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://media.heanet.ie/Shibboleth.sso/SAML2/Artifact" index="6"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://media.heanet.ie/Shibboleth.sso/SAML2/POST" index="3"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">Media Hosting</md:ServiceName>
- <md:ServiceDescription xml:lang="en">The HEAnet Media Hosting service allows authenticated users to upload audio and video content in multiple formats. This content will be transcoded into suitable formats for podcasting and embedded on VLE and other websites. Playback of the hosted content from its unique URL does not require authentication.</md:ServiceDescription>
- <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
- <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">HEAnet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://media.heanet.ie/help/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Justin</md:GivenName>
- <md:SurName>Hourigan</md:SurName>
- <md:EmailAddress>mailto:justin.hourigan@heanet.ie</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:SurName>noc</md:SurName>
- <md:EmailAddress>mailto:noc@heanet.ie</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:SurName>NOC</md:SurName>
- <md:EmailAddress>mailto:noc@heanet.ie</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/metadata.lst b/swamid-interfederations-2.0/metadata.lst
index 536a9b42..748cb044 100644
--- a/swamid-interfederations-2.0/metadata.lst
+++ b/swamid-interfederations-2.0/metadata.lst
@@ -1,4 +1,3 @@
https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml kalmar-signer.crt
http://mds.edugain.org edugain.crt
-#https://callback-prod.inloggning.se/authify/metadata/?fed_name=swamidfederation
http://metadata.ukfederation.org.uk/ukfederation-export.xml ukfederation.pem
diff --git a/swamid-interfederations-2.0/midev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/midev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 4ddcc295..00000000
--- a/swamid-interfederations-2.0/midev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://midev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-06T11:22:14Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://midev.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAJGmmpkGYi+WMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFm1hbmEyLmNhbXB1cy5uY2wuYWMudWswHhcNMTExMTIyMTUxOTAyWhcNMjEx
- MTE5MTUxOTAyWjAhMR8wHQYDVQQDExZtYW5hMi5jYW1wdXMubmNsLmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTMo91N+S+LJEwcB42qN/FOT
- nR13dFvSdl6+xH7swsHbBu54lg/HVDbaPDRcoq0WXR9OxHrF1vsGuBDGB3oAOV0n
- Orgs8rtuKtPg8bwUl/fCuzto4Wm9wqyEH/LHUp0dZQdSlptkUGbZO6cKTXIeXAeh
- 008vw7KzDT1VdfHmh60itCsuF7OjO6jSComIUgINDHi00ZP3SY7wrMa+Wy+4vFYv
- UiFwzilq6eLUyy6SYThAQFS3MXN0iIeO186Za0cbgA4FidxVbDe/GmE059rpZyWP
- nPHrot8dPm0LYfP7lNzz1C23fqKyug3HLFPpgPHts8K0kY0uyvQ9KT4JAybMQQID
- AQABo0QwQjAhBgNVHREEGjAYghZtYW5hMi5jYW1wdXMubmNsLmFjLnVrMB0GA1Ud
- DgQWBBSy+bT4H4K7/XBkrcraStzcMbK0VjANBgkqhkiG9w0BAQUFAAOCAQEAL9KG
- l9YfEhrDgogFwo3veAASciT1LnQRoTwnDUYrcBCbsVbbwzMY42VsjKc3BGnRoAHR
- UI1CcIiiug/xX3orp8hKeJQZ7jn4PzllTbp0tXzVTDpn5urNP9gnQ31SZuCXCe5q
- BKo9DAN2zT6vBaCo4cw+fFgqfk/XmUuCAbtjNQKQ/ol/G04E330Krs9xAkklNrso
- u2Ou8in+ATTrZ8T3lH5bSjYfZXDTXyu9tQJ4OtFF3lOu5c8q622xOav0ocd0KOAp
- he44MCHB16lEZO7PSCCdN4zNsKH+wq2CD7V6lMAtA/zINcRiTaEk5g1vGeD9fikB
- 5v5kyrUztnFghkEBlg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://midev.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://midev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://midev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://midev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://midev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://midev.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://midev.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://midev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://midev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://midev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://midev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Newcastle upon Tyne</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Helpdesk</GivenName>
- <EmailAddress>mailto:helpline@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mistage.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/mistage.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 81b1593c..00000000
--- a/swamid-interfederations-2.0/mistage.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mistage.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-06T11:41:05Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAJGmmpkGYi+WMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFm1hbmEyLmNhbXB1cy5uY2wuYWMudWswHhcNMTExMTIyMTUxOTAyWhcNMjEx
- MTE5MTUxOTAyWjAhMR8wHQYDVQQDExZtYW5hMi5jYW1wdXMubmNsLmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTMo91N+S+LJEwcB42qN/FOT
- nR13dFvSdl6+xH7swsHbBu54lg/HVDbaPDRcoq0WXR9OxHrF1vsGuBDGB3oAOV0n
- Orgs8rtuKtPg8bwUl/fCuzto4Wm9wqyEH/LHUp0dZQdSlptkUGbZO6cKTXIeXAeh
- 008vw7KzDT1VdfHmh60itCsuF7OjO6jSComIUgINDHi00ZP3SY7wrMa+Wy+4vFYv
- UiFwzilq6eLUyy6SYThAQFS3MXN0iIeO186Za0cbgA4FidxVbDe/GmE059rpZyWP
- nPHrot8dPm0LYfP7lNzz1C23fqKyug3HLFPpgPHts8K0kY0uyvQ9KT4JAybMQQID
- AQABo0QwQjAhBgNVHREEGjAYghZtYW5hMi5jYW1wdXMubmNsLmFjLnVrMB0GA1Ud
- DgQWBBSy+bT4H4K7/XBkrcraStzcMbK0VjANBgkqhkiG9w0BAQUFAAOCAQEAL9KG
- l9YfEhrDgogFwo3veAASciT1LnQRoTwnDUYrcBCbsVbbwzMY42VsjKc3BGnRoAHR
- UI1CcIiiug/xX3orp8hKeJQZ7jn4PzllTbp0tXzVTDpn5urNP9gnQ31SZuCXCe5q
- BKo9DAN2zT6vBaCo4cw+fFgqfk/XmUuCAbtjNQKQ/ol/G04E330Krs9xAkklNrso
- u2Ou8in+ATTrZ8T3lH5bSjYfZXDTXyu9tQJ4OtFF3lOu5c8q622xOav0ocd0KOAp
- he44MCHB16lEZO7PSCCdN4zNsKH+wq2CD7V6lMAtA/zINcRiTaEk5g1vGeD9fikB
- 5v5kyrUztnFghkEBlg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mistage.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Newcastle upon Tyne</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Helpdesk</GivenName>
- <EmailAddress>mailto:helpline@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mobdev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/mobdev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 5590c1a2..00000000
--- a/swamid-interfederations-2.0/mobdev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mobdev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth Mobile Apps dev SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-27T15:19:28Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/shibboleth-idp/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/DS"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC2TCCAcGgAwIBAgIJAJVktlC5vQ5qMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
- BAMTBm1vYmRldjAeFw0xMjAyMjcxNDI3MTNaFw0yMjAyMjQxNDI3MTNaMBExDzAN
- BgNVBAMTBm1vYmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM1F
- QfS5gO32NHbXu5K3IwcXvu9RoO+d87UQYTZXomZ/ynAUnuGLEefabYcm9tBcVij+
- kl7hQ0YEHmmo8JAHXckOtQU9sxt2wp9oM0REp4LY0QWGz6EzZPHJotiyFnIIsRQC
- 9b06tGmPEyRypewdLWUonpJ/UbwkjHMN0Rg7G8+75c32CfTmpOtmW2mU1xwp8CZc
- r4SkfJWR+cJiyYRTXGqa00I7z17hNKXjrAQoudbkEfv4AH89pamVwApWzbSVWsiG
- QvpSQJ5xl4TYTrMYpbMNb7Bz68gHW4qrwqpvARmJlEgsZuEW8RSBsGCbZDsCdZlj
- LlELFPUSACMVMQQ9UsECAwEAAaM0MDIwEQYDVR0RBAowCIIGbW9iZGV2MB0GA1Ud
- DgQWBBTgCf5o8y3l5+IdEanL7/UKE8vYyzANBgkqhkiG9w0BAQUFAAOCAQEACx95
- 5sgSylEqVrQMi/mDmqOsMFC80NSjVMHLtJ9N1/+vCxPax3cPuVgSy5AqhLQzxGAy
- dKXRBAjk1LNIVAYvz6TBAFGiqVtbTtsshuZuHwJSS6ZOqDjmSoLRs5H08ffxfGkb
- Zpg8JD0nUgB+gGRf22FtEW7l59d0a1+g/5+JWPSWfsHzMnmDUEzE7EtE7D2a/074
- ZVoQkXSH5a8uTuLnAU4W8T61zLRU06miNQOKTb/Mrp7/1yBoNIX/mOV5UnYwL+NZ
- iF+H6y89LarzeEviXxoQTnileauyTItt4FWWfJVSzEJIexd15eHo3WRC2IdJhjxT
- VZ880xuBt3YOUfHnIg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mobdev.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Mobile Apps dev</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mobhost2.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/mobhost2.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 9dc03fe3..00000000
--- a/swamid-interfederations-2.0/mobhost2.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mobhost2.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Mobile Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-05T14:50:53Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3zCCAcegAwIBAgIJANQgroLqu7kUMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
- BAMTCG1vYmhvc3QyMB4XDTE0MTEwNTExMTc0OFoXDTI0MTEwMjExMTc0OFowEzER
- MA8GA1UEAxMIbW9iaG9zdDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQCzBzguYQ1pcUtuo8eoR2fyLEGsA0ioAzCOuh9QA0qbEpjtmCXf4uOqRhz67oRn
- eEDDrgNCV9h+qDqPO7+H3ZtdMgL10l1/WvYhr8bfVJnLd8Cn/y3tIqeyWpz1HNzE
- 5TCUFn+XyJaFbTExt0K63f07HD9xze5HQiZHvNJ0qGwWPD0bu69PXhiJQMKbxBhb
- rt65smKcrhle/4DpL1JKGpr0WVMUF5mGPRV+km8nkOSUHz5XBTl2RXfW58I0Ruez
- KYAGmQh4KVYDkDfn0DXVjrY9ecd5uSpuKx5yRDSRqyoBvue6nGXX+MndZ+r1/07M
- 89Rq8sgQ1yo4Dd+DFAr3gWcfAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG1vYmhvc3Qy
- MB0GA1UdDgQWBBS9hKLCDncfgTlj+DgzQixFLZAFVDANBgkqhkiG9w0BAQUFAAOC
- AQEAgHB/eV/GQDmMkmakJG3rgLOFSiB9/klzYMpFKBYn5qGPyNiQoKCQIC2Runy/
- Z+CN2vF/7ys8mOZRcB6IV+RCoz2zYsqGTivI9WmbDlDEldyl/FAAe2VqlzlRLPA8
- ZZXx7N/jket+R/XeItaxn+HbYgzdH9X0h89m4k0OdC37pBbWPnYR00nI02gnqI7N
- hxqVvn8NSsAU0qW+klATcuiPS+eMBdg3TNKfoBpoFxjGJI6m2m1HxupvZ3rbag8w
- qBr+JQYtXFrO+9/v5Mz3VEWHcywCS++ANkawmVWkMw6y8QtgY54siP98nZuIdn3A
- I0gJZ2vKkUOtWsJ9LwK2VWzp7A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mobhost2.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Mobile Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/moodleshare-hw.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/moodleshare-hw.ac.uk-shibboleth.xml
deleted file mode 100644
index 2c636c32..00000000
--- a/swamid-interfederations-2.0/moodleshare-hw.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://moodleshare-hw.ac.uk/shibboleth">
- <!--
- This is a Moodle Share HW Shibboleth SP for Heart of Worcestershire College.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-08T11:14:32Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAPa9QifSVGt7MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF2JwLW1vb2RsZS53b3J0ZWNoLmFjLnVrMB4XDTEyMDMwNzE1NTgzMFoXDTIy
- MDMwNTE1NTgzMFowIjEgMB4GA1UEAxMXYnAtbW9vZGxlLndvcnRlY2guYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXLmAdfCd9eaJOR1KsZow6
- i4od5ZCWIKksLz7bXrCq/qns02re128ipjB0OgtFuiPWhe/M/UylESsZX9zC7wvU
- y+jTigtBzvF73Zmw8N8I4th+qUGyLB8QJp0dqNWNluCy+3ttXNp2S3AZyl/1Orad
- fCRR3XBr74BMxNBsA0/OwVYIMa8NowfoZSSqmpt/qBBrTM1SL9xdIBOfMkIv7PKD
- eX5sv8BgOaqtz/ejtnYSuFUvi13RWgIqvCriGPM4AJTyI/RDb8DPUSGwThe9don8
- ABnCaa0Og+yDsSRM77jBe3kS0Cn4k8Cg6P5bqLZcOcwS+wdYHauC7jkswWig5wo1
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2JwLW1vb2RsZS53b3J0ZWNoLmFjLnVrMB0G
- A1UdDgQWBBRoYpkZGfLd+Z3vnJAXpZSwXDj83DANBgkqhkiG9w0BAQUFAAOCAQEA
- ltr+0fk1QGSueo3CDbPz7aVaCCogYY70a5X6V7ak41grzMYiizZI0l1GT80JE4cg
- XS7DQseWYh36VI1PhGRPEVkiF4JgftLHuv8DB0eWlTcK8aaMdhQj++cHHaGlH40G
- FlQUr1911QHq9edaT1Ez68oAtfZtHMsQ66h9PXflAnU70M4eaX6swu8jGhiCpD8E
- ic1Ld86jaRy8TPIfS1BiO/4rWPnuBmyAwh2R0Jw7eTFs9qDA2OZsSlQH0TainjPT
- hpM4OjhXb8xcg1HmGY7nXwCxPL6ltbWvvDmGYooN//RQVlFHe1F39ZLATHDpkT9f
- VDaZzrhbVP+87Q5ueikcpA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodleshare-hw.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Heart of Worcestershire College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Worcester College of Technology Moodle Share HW</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.wortech.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Services</GivenName>
- <EmailAddress>mailto:itservices@wortech.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Services</GivenName>
- <EmailAddress>mailto:itservices@wortech.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/my-dev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/my-dev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 8d1da8cc..00000000
--- a/swamid-interfederations-2.0/my-dev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://my-dev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2.3 SP for Newcastle University's personalised homepage.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC1jCCAb6gAwIBAgIJAMh40ma52Zb8MA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
- BAMTBXlvdXJzMB4XDTA5MTEyMDA4NTc0MVoXDTE5MTExODA4NTc0MVowEDEOMAwG
- A1UEAxMFeW91cnMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfbPqX
- 7m583p3Bp1WOZZMmsa8/V7HRlXtXUzD2bQddVicYwYPWjEoVaWD7W5tRSw34IMFW
- SCu7osU5GMOn/yEa9Gg8++54nNhMCV8S9ZSULdWw8GYea2yEVjN2yDk0SH1WJYWD
- ZDjDV7xOJ5FU7/mDbBgrHlutLz9ymixCMgh71MdHuDlM2qo6miTBVoGThEFEvrZT
- gB4MwkNZKSAfiWXsP/6fsQop4bvkoZQAFsErORf21+DZl/orWvjS/Vhi5RknFv3r
- mAKUwIcPy+nzfewF9e2jhkdbhduSNVzBjchQGle4Bqw6dIehI7zcjJkCr773K2sC
- uZZcaXg4QEj5nB07AgMBAAGjMzAxMBAGA1UdEQQJMAeCBXlvdXJzMB0GA1UdDgQW
- BBQOYp6LzjG50rAKFMgCuFwxKOCRVjANBgkqhkiG9w0BAQUFAAOCAQEAhe22E366
- hp99N1caKt7xdLsLJDo3SUDA8e2kcxQE4iWHQRLttyN/60FZlsLxvqH61/kIzHfA
- zKRtzn+pdb0fBBcvOTsKbhdPW9JsLvlF4AkCIz1SDrTbfR23IaxSgztn373F6CBz
- aJv6FmEJKO+AGc74GA9cqi7s66gBE8QsAu/s9xmr8gySsPba+0boV8pa7GlbuCyi
- lYWCOYO3TtmV/2dOIzzmAdntVMjjE3nreOY4U/eL7F+2WVSagaLSOW9LXpmEJ2DB
- yhdDZw8LrI8MKVAeh8jqND71PNfvBh6wkCLAXDoVEwA92G6NNzQLcZheIrkQ7XWd
- cEUyP1U1HBhYmg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC1jCCAb6gAwIBAgIJAMh40ma52Zb8MA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
- BAMTBXlvdXJzMB4XDTA5MTEyMDA4NTc0MVoXDTE5MTExODA4NTc0MVowEDEOMAwG
- A1UEAxMFeW91cnMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfbPqX
- 7m583p3Bp1WOZZMmsa8/V7HRlXtXUzD2bQddVicYwYPWjEoVaWD7W5tRSw34IMFW
- SCu7osU5GMOn/yEa9Gg8++54nNhMCV8S9ZSULdWw8GYea2yEVjN2yDk0SH1WJYWD
- ZDjDV7xOJ5FU7/mDbBgrHlutLz9ymixCMgh71MdHuDlM2qo6miTBVoGThEFEvrZT
- gB4MwkNZKSAfiWXsP/6fsQop4bvkoZQAFsErORf21+DZl/orWvjS/Vhi5RknFv3r
- mAKUwIcPy+nzfewF9e2jhkdbhduSNVzBjchQGle4Bqw6dIehI7zcjJkCr773K2sC
- uZZcaXg4QEj5nB07AgMBAAGjMzAxMBAGA1UdEQQJMAeCBXlvdXJzMB0GA1UdDgQW
- BBQOYp6LzjG50rAKFMgCuFwxKOCRVjANBgkqhkiG9w0BAQUFAAOCAQEAhe22E366
- hp99N1caKt7xdLsLJDo3SUDA8e2kcxQE4iWHQRLttyN/60FZlsLxvqH61/kIzHfA
- zKRtzn+pdb0fBBcvOTsKbhdPW9JsLvlF4AkCIz1SDrTbfR23IaxSgztn373F6CBz
- aJv6FmEJKO+AGc74GA9cqi7s66gBE8QsAu/s9xmr8gySsPba+0boV8pa7GlbuCyi
- lYWCOYO3TtmV/2dOIzzmAdntVMjjE3nreOY4U/eL7F+2WVSagaLSOW9LXpmEJ2DB
- yhdDZw8LrI8MKVAeh8jqND71PNfvBh6wkCLAXDoVEwA92G6NNzQLcZheIrkQ7XWd
- cEUyP1U1HBhYmg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://my-dev.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University personalised homepage</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/my.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/my.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 804fd7e6..00000000
--- a/swamid-interfederations-2.0/my.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://my.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2.2 SP for Newcastle University's personalised home server.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://my.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC1jCCAb6gAwIBAgIJAJwOAcu/0ce2MA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
- BAMTBW1pbmVyMB4XDTEyMDcwMzE5NDEzOFoXDTIyMDcwMTE5NDEzOFowEDEOMAwG
- A1UEAxMFbWluZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5nZC/
- 1/XiVhZbON/aUiIRararsqiy+RZxsKn0yeKc5aYAJUgBRioXGK2SHh3vTzSS8l25
- qEAc1NyLUHJlZdeJtXf8kIHwulZRWCYALYiY+km/XmZAmKegHkD/YfVl0Qw/5Fkc
- nB/HoRkrwMqqu98Ib2fEnP9mXxUOBIBxRolMeE/rWTJcH2/9uOIbtHp+jY28dSkF
- zpRaRWxH4bN5fF/nobQmF7O7Cd6vLJyyOmw9uGBq5vf1Aq3H1Nloq9TB4wZP+ShD
- l41tb+S7qD4HkXxDj9yLwsYXNr847a2aOwF/Ci4Ei/c+GdPrjW3J1lnwe0ENr4oB
- Jf2we1V1DvPTp2LFAgMBAAGjMzAxMBAGA1UdEQQJMAeCBW1pbmVyMB0GA1UdDgQW
- BBSHjIvwjdiEWHbQ3rIf2L2Da/h7BjANBgkqhkiG9w0BAQUFAAOCAQEALDzD/jTw
- 3d4Kba9e688EfiTfYmCwzzNAfzIPf2g7Bm7b0sRri873zAu7I6qPgyQ0PAcJReex
- bo0E1biGXB4D8Nr02iNauuIL4siC95J4N/25WNmrrT/qe9oY95TWsno5k+NCRdLF
- zybdZ0buB4DYk6Kw4ycoYJAK/le2fLjnrH0F2RESKEMQRetrXs42Kz6ZnDvcZb9V
- sYhOkD+oKd9LR9W2LybXZi1OS7IM4xHXUXgEkJKOgmoel5dURiOQvZx8TbAAPCGC
- nv/x3hGtFCrEI1x7af0hDpRU69GzNrfTOITDLn4l7uudi/D1NMK7z5W6zl2njY/F
- X/DfzDWbHJ1ksQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC1jCCAb6gAwIBAgIJAJwOAcu/0ce2MA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
- BAMTBW1pbmVyMB4XDTEyMDcwMzE5NDEzOFoXDTIyMDcwMTE5NDEzOFowEDEOMAwG
- A1UEAxMFbWluZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5nZC/
- 1/XiVhZbON/aUiIRararsqiy+RZxsKn0yeKc5aYAJUgBRioXGK2SHh3vTzSS8l25
- qEAc1NyLUHJlZdeJtXf8kIHwulZRWCYALYiY+km/XmZAmKegHkD/YfVl0Qw/5Fkc
- nB/HoRkrwMqqu98Ib2fEnP9mXxUOBIBxRolMeE/rWTJcH2/9uOIbtHp+jY28dSkF
- zpRaRWxH4bN5fF/nobQmF7O7Cd6vLJyyOmw9uGBq5vf1Aq3H1Nloq9TB4wZP+ShD
- l41tb+S7qD4HkXxDj9yLwsYXNr847a2aOwF/Ci4Ei/c+GdPrjW3J1lnwe0ENr4oB
- Jf2we1V1DvPTp2LFAgMBAAGjMzAxMBAGA1UdEQQJMAeCBW1pbmVyMB0GA1UdDgQW
- BBSHjIvwjdiEWHbQ3rIf2L2Da/h7BjANBgkqhkiG9w0BAQUFAAOCAQEALDzD/jTw
- 3d4Kba9e688EfiTfYmCwzzNAfzIPf2g7Bm7b0sRri873zAu7I6qPgyQ0PAcJReex
- bo0E1biGXB4D8Nr02iNauuIL4siC95J4N/25WNmrrT/qe9oY95TWsno5k+NCRdLF
- zybdZ0buB4DYk6Kw4ycoYJAK/le2fLjnrH0F2RESKEMQRetrXs42Kz6ZnDvcZb9V
- sYhOkD+oKd9LR9W2LybXZi1OS7IM4xHXUXgEkJKOgmoel5dURiOQvZx8TbAAPCGC
- nv/x3hGtFCrEI1x7af0hDpRU69GzNrfTOITDLn4l7uudi/D1NMK7z5W6zl2njY/F
- X/DfzDWbHJ1ksQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://my.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://my.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://my.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://my.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://my.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://my.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://my.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://my.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://my.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://my.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://my.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://my.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://my.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://my.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University personalised home server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>ISS Helpline</GivenName>
- <EmailAddress>mailto:helpline@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/myimpact.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/myimpact.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index b617c5a4..00000000
--- a/swamid-interfederations-2.0/myimpact.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://myimpact.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-06T11:13:02Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAN9Lr8DiEW2HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFm1hbmEyLmNhbXB1cy5uY2wuYWMudWswHhcNMTMwNjE5MTYwMDU3WhcNMjMw
- NjE3MTYwMDU3WjAhMR8wHQYDVQQDExZtYW5hMi5jYW1wdXMubmNsLmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo00q7293nhjlnVtkfq5Aj8K4
- x/oSQYv+6Go6mIR4AiK8vnRrYy+IpFODjyaQnFlaw20925+G8HsfiQBbbH8bizaH
- tuIr6RGscBhPnJL9u5kTYGrOlSIp7O46EQY4NlroEiIUb2vQDCz/BVFLvE+Q9Gi+
- ur8kKWSo5sobrrFL2PFOa6VFAwGP/XERcVnv9syfVgfSfznM5SAXyxy+nRU/Dh2Z
- /XuVGLzHFs9eH7/YirS1+Zvb967nlQX9rdYIIeUw7IEc0ajxYzxWkklBTY78uXqA
- 1++a6AWZ+0vv/3v0HdwAmtv3lhpd8gVFElKe3DfQT4RKnTvqOHZKweKjmZKnEwID
- AQABo0QwQjAhBgNVHREEGjAYghZtYW5hMi5jYW1wdXMubmNsLmFjLnVrMB0GA1Ud
- DgQWBBTfVDeLYd1pZGIrarVRAospzIJ3hjANBgkqhkiG9w0BAQUFAAOCAQEABh1l
- yeVpPIF2H/TjZNStsqesiuE47wn7BNKrxHI+Z/MXgmj8g2CLXE4yTun98sHCZBvr
- jUrC5Loao8m4ckdqPq6z8TtT6jngluoZBwOi1p+1rxTzNhjoA2ykI0ZZixsL2qq8
- YQHLraIFMGKDYgOvz39PM8GxXlodlIP1ImF2OLkZOo8g3yHylGEMS4vk2Kf5ppSH
- ZDNYgtGaZaKeUP3NXkEW45DptzCSeOMSxfy1tAYIHJTIGEvMf68uALJJjlZQwWqM
- RwXtum9NPBuUOT5JVXKOtD5MwOEY9QqaRi9tAIAv9+ZgfNTuC+MRkmileT8B6mGv
- KzKISKUo7I19U4sNcw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myimpact.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Newcastle upon Tyne</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Helpdesk</GivenName>
- <EmailAddress>mailto:helpline@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/myprocfuat.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/myprocfuat.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 4a627d9b..00000000
--- a/swamid-interfederations-2.0/myprocfuat.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://myprocfuat.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Newcastle University MyProjects dev server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-08T10:55:43Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGDCCAgCgAwIBAgIJAOb/PdxW6RT9MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
- BAMTG215cHJvY2Z1YXQuY2FtcHVzLm5jbC5hYy51azAeFw0xNDAxMDcxNjM4MDda
- Fw0yNDAxMDUxNjM4MDdaMCYxJDAiBgNVBAMTG215cHJvY2Z1YXQuY2FtcHVzLm5j
- bC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJhWWSJFUjxg
- 3A0hNQA7Hk3PVkIsH5EVCODkpGMNKoH+0aDIhpv33/aKzFw22nNu9mIC7vy2TVcD
- wsTR04+Xkx8vGbQS9iUI6ghip2i4CoiwPFFx4za8G0bAFl2ex0x8v+Cp3nWWLOtS
- BEVtJClVkX+e55Xdk5M+BUDwmwWKbk51pnxj/CkHg1AgTM7LKT/4mvY6XnyNMbmO
- Cg0tNxZiiWt6JKA6ij8sD4iCc08wpU5F5SoKFo63+t/zN4OiKpB5B24Rkm0xEe/d
- ib5pNej2pdQTMz6Z5ubOv1a7tfDc7jfUGjjKPl/X+96IvBCYPq+YIvB9Vx1x2GkP
- aLgNpqHw4eMCAwEAAaNJMEcwJgYDVR0RBB8wHYIbbXlwcm9jZnVhdC5jYW1wdXMu
- bmNsLmFjLnVrMB0GA1UdDgQWBBT2dqmqQdjhLgYhRt2IJNF9Oh5FtjANBgkqhkiG
- 9w0BAQUFAAOCAQEAV4id5VyZDq8TSUb0pyoXvjnJ0INV4oxA9EWN9YctSAOqkzf2
- PHFGD24vys60EaZzbbke7KYXxjwAtfzxrIVJqbEgc9UfT3VG9qnytswelEPzlX52
- aUiqP6yKNhXlXWt+3vpXq2DWW8FMA/vJhZBskmS0tEtyCYEolrNpWnQ3ux0hAI72
- +Ph2ZjGW5w3P5PdTwfQftdWbiZMFx9G5LpMPpQG7tKxA7OU51lvxNKjBBqaCMQmg
- MHqaZnYlEt/moyNDTA3WqghE31gVo0nnh5sYDdEg0gAZGM5tmFTeOC8p3BqT7qE2
- xGvcd+i4tgTu5MKJBnePNLm2HM4KaY/u9krv6Q==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myprocfuat.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University MyProjects dev server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/myprodev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/myprodev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 7888b772..00000000
--- a/swamid-interfederations-2.0/myprodev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://myprodev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Dev My Projects Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-04T15:33:29Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJANDKlqMV47q/MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGW15cHJvZGV2LmNhbXB1cy5uY2wuYWMudWswHhcNMTEwNjE3MDc1MDMyWhcN
- MjEwNjE0MDc1MDMyWjAkMSIwIAYDVQQDExlteXByb2Rldi5jYW1wdXMubmNsLmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxpYk5ArfWRAxBLxd
- hUOqj3Y6fipzV5EVWCJXBrWWyA7mTHabk89vbDc5af3WE6PjylwvjQZl4bj+DrxH
- NQSLCxDCPBLdQzCdLznMB2x6/Jy7+Dsu5BlDPWs74XqQyu1q7q4X5jBt8963Vul8
- PhWbOBSe5RZwNQ7feuCny39hTKRRnvVvOOer1yq6iLpfqGp0Zd5pSE24THtPkk+n
- 5+ySzgohBZI8sMmXHOBQ1/SRo7HQqhjIjwQZ8IguVDCf+zxwFUvmBc//NwEgEWnE
- +L2nGoT5jta5MbVnR84shH6iagU/kXU1HUSJB68fCN0IeQzCVIRLFVQwEe5zAmhd
- QqyMiwIDAQABo0cwRTAkBgNVHREEHTAbghlteXByb2Rldi5jYW1wdXMubmNsLmFj
- LnVrMB0GA1UdDgQWBBT9lS4eOe16DJOZhXXeNA150tY0STANBgkqhkiG9w0BAQUF
- AAOCAQEAA5aoWlQJyU5p4SNvCkIesAs2YUWiPU9UAxj9VAZxRIT5uSSf687c1hzE
- cPTqs3zCDP0uDvPgekspgyAE7kM25C4wtic0h5yKvH+tSdot7QbcEjWaaBlJ+oeY
- YOaHaeM4OP6IgUuj4+O93K1cDfS5PeJFCgtmUahiyr97N1pJhCPyGpQ2n0o9ldjf
- b+xryMLK4H/L0yxstXK+l9y0JzVCyiR0IZrkmb+6NrkGJMRVZgC/SdoCRFxg+7pC
- S2THSmS4wtHemoYIyU+0xt/e87BtfttP3s+al8Trfpq7Eh6RCGn8qwvDB71wPEgd
- mO6G7oi9PvMi80tUNgR2iniezP+Cxg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myprodev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Dev My Projects Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/myprouat.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/myprouat.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 6955d6e2..00000000
--- a/swamid-interfederations-2.0/myprouat.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://myprouat.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "User Acceptance Projects" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-04T15:43:27Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJAOBbm94gxem8MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGW15cHJvdWF0LmNhbXB1cy5uY2wuYWMudWswHhcNMTEwNjE3MDc0ODAyWhcN
- MjEwNjE0MDc0ODAyWjAkMSIwIAYDVQQDExlteXByb3VhdC5jYW1wdXMubmNsLmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtcxfiZwTqO4LsD9i
- HlyP3DOmMaQtdOzJfdvyZfw21tBoTR+RQJwt1XbtoF53mCL01zpFm/Q02KxyejxG
- SuPPPiNeWKhIfa1v9KSPlTfTZbsV3+YH9jAc26Cx6kKlHkFs6iHOl4THPRkCDgk3
- piwASXrCgMMi5TJ8AJihFydi4cY97hMQBu9nWNCHHRGxKE4VKTfX0m8ryt7KdM8X
- DkihFN/t133QEpX/ov1CsouqgZ5ubmigi64Loh0/DhUoW7ZyukloxaRnBdpirv8M
- 8WQPf27AbmjQ/F15XhymgDRo7J/zRJBeWJJdV5uooZ0fylwI4ASdH7GECVg2vmKP
- CBVEnQIDAQABo0cwRTAkBgNVHREEHTAbghlteXByb3VhdC5jYW1wdXMubmNsLmFj
- LnVrMB0GA1UdDgQWBBSVJtuw6MgibG4jGnMS4tj9XTYm7DANBgkqhkiG9w0BAQUF
- AAOCAQEADAwn//d7BSHmtSkcWUHb3smWqJ5OinROvbBOFI+Pc73eh28Oj1KgI9Ak
- UpSejdvIiYL660yPgNDG3iP/dU9RAD/anNze5gtutW8KlPODOoCkL1Y/P6QBNL8w
- kjF2az2uZJ8kEfTQ604wIG5lVsNYmik9T0WMrWTjm5cmVMrtRDmsqvFoEcjiZPEA
- m1KT0aKkzVra5fPlcwx+TV2wFakjef8UAo/uiDRrbmj0+nVeecKENWOnjEy9TcMw
- qOrVHKk9nqyxSaRyGX8lZoYBNF5BxA84Rac8HoqSa6u7OQxs3TQlgOmPh6p6d/aG
- xV1kLmf5sTXfSyLaTn14ctbLn2y/bQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myprouat.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: User Acceptance Projects Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nbtr.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/nbtr.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 3f0ab03d..00000000
--- a/swamid-interfederations-2.0/nbtr.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nbtr.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Newcastle Brain Tissue Resource Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-05T12:22:59Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/ncldur"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAP2gLdgHSWHTMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmRhbnRvb2luZS5jYW1wdXMubmNsLmFjLnVrMB4XDTEwMTIxMDE1MjMxMloX
- DTIwMTIwNzE1MjMxMlowJTEjMCEGA1UEAxMaZGFudG9vaW5lLmNhbXB1cy5uY2wu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC96j7lMubJp+aX
- DqwLGDzxcrm2bxvKU3WjWK91L5rD0P0HYle7yr2VcuXsChz7jyFrMNZ+tCUhfvlA
- gRuhiKjXC9PRDf18NRx43UhPlRnwrvjN5OFhOH1Mvq4QFkpnTtqPHQ5RM7T3+U0l
- /lacgZtzhmXiCbY9KLOF0Qc5iLjD+ISwErSd6N1ovhIyNsZ4/44Cquz0fcFyV1PN
- BIzj1toMubMqStVY98OnKCVIDccOsKeZW7RPevLP4T5uglP88hgiFhN5auJDWy2B
- fm/AA9pjD/u9BsAggdVfrAE0WvatR+a6cpxngNTFjht9UUoxBlUq844RFZBqXf/v
- xLmipJUlAgMBAAGjSDBGMCUGA1UdEQQeMByCGmRhbnRvb2luZS5jYW1wdXMubmNs
- LmFjLnVrMB0GA1UdDgQWBBTHyeqX+oU3dzZx3e1+nYbV7evjejANBgkqhkiG9w0B
- AQUFAAOCAQEAIzxIXH09GMjE+nIpbGIACTI9ERepMQMzNnO+M8JugkhEhrLWXWvu
- XoswtdvxBH3rKMKZp1tJIk7T1toLDn3vCvn60S/6AjzQbyYzQ+qfDBij7X7kBU71
- jlfFn8dFGGcYNdPkl2EjrtWQ/pOTJiJAqal0rPQTcqmrFmi3UeDw+gtncRDIBEGx
- JvjufLt4NSdyg7ZHLLjLv2ntSGPk4ZFLjw0ihpigI6LLzhNv3zxuH/x/y1pIyolC
- MQHLbJL5+WUpb/syt6lRETX5WxKuJHTirlgkjz1edzAPDZ8SIKD3O/TcnKXB/rpF
- HitJuYtcRIR/YxPrydq4GCsFy99FLz336A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nbtr.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle Brain Tissue Resource Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ness-dev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/ness-dev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 0b919fb8..00000000
--- a/swamid-interfederations-2.0/ness-dev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ness-dev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Dev E-learning Support Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-16T09:42:00Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3zCCAcegAwIBAgIJAMFYGwICoC6TMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
- BAMTCG5lc3MtZGV2MB4XDTEyMTExNjA4MzgzNVoXDTIyMTExNDA4MzgzNVowEzER
- MA8GA1UEAxMIbmVzcy1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQCaUFtj1jdfuoQbXUvE3pqPG0LLmCryFO0qK2iyybqRTYKAipkVOSFUcOEmtjsp
- 4oToHBSEXY6P6TnrKbwHaupJqnQ5+SzURrRNc9KuSBVwclv8i4IU1XRt4bCmtUCD
- NbiUGK7A2sXQVQw+NYGyTy1XSMlqBz8zU9wUn3mHfXcX5ZEkFecl/2l43bPyAYz2
- APzpTbyGac5in4MTs1buiYvfU7+Z+BqE2pAsyzaWIzX1PIaa2IMyPjcesTi/aTi4
- wki2zGhSfgHsvsJgrJI9H5dY8whPCQPBcQ/WgU+MCX8qaiJ7tiOUGbIm1CeRu710
- 545TMDkTFYBSQExB5HHGxqwzAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG5lc3MtZGV2
- MB0GA1UdDgQWBBTLFikv4MoARqF9WSXqaY6FnJcSFDANBgkqhkiG9w0BAQUFAAOC
- AQEAAWXDpnA8Gv75p2DhAszDDlPjJ4t1ZKia6nXsDfv2aF77Ezye5ZjyRCy+rgcZ
- 4VsX6L5R2vGdk0kOoxD5qLkrbbtUlI180E9cduikz5fS+BR1yiswzbfSMnjY0v/F
- WoXK83hKk0tSo15Mg1qrPwMAPPiDdenohWPMwt6Kryb3fkgyvaCFg44l6Zx8P1IG
- gRgcg9pdGI8LeawRvgxrt/yqklP+WkOeVMbfy7HiOsYAR2X8hEnppJXdhvNMBPG1
- 90NVTgUltOZfM4Mxhx1yfR6k0Pw9QlcvekLQjf9yZlTw2ODZlDLDtXP6mhgWhHLf
- T8AOfuPLji2JsV9p2qGZHo/ofQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ness-dev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Dev E-learning Support Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ness-qa.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/ness-qa.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 14fc229b..00000000
--- a/swamid-interfederations-2.0/ness-qa.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ness-qa.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "QA E-Learning Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-04T16:42:21Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAMXbF+dCfRupMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB25lc3MtcWEwHhcNMTQwMjA0MTUxMzM1WhcNMjQwMjAyMTUxMzM1WjASMRAw
- DgYDVQQDEwduZXNzLXFhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 1CEc5PYP/qLrLJJ4POzBTz3QKvvVL1AD7/NguaQO0qjl7B8dSffbUGtvLC+Hc3uF
- DrYV17M5aItVLfJoB9DYjQZCc9o00fNoJ3TVcl1wSQCKUk5mhZHa7Eig8m6sDPQ5
- QyoA1Ek+nFuVUiRXV4p6UUyktEfZA3MU3xrZKvJ7VNk04hfxUwcz/0geOXzQD5hb
- Xldtm4Ou9u3ISo9T03v8Oa0s7eVcSpKZuYXR+5h0Y4RE8INktb40PnJykm1qKrgh
- VLvj3FVX80yAyz9/8Qv1ammcqTT54F7buL/a6rpPnMzrpwPAis2N7qwTtB05efXj
- ej2xni/ba34Uz9eJCMCsawIDAQABozUwMzASBgNVHREECzAJggduZXNzLXFhMB0G
- A1UdDgQWBBQFxmjNPVpaPox7WoDoUBhDJt1SpDANBgkqhkiG9w0BAQUFAAOCAQEA
- BZgjoBamoj4HZYfQljv7ArbrvMl3czR/tYNJYuezzEJvLXjdxPcvSFHZ2k2NAzDF
- XPUnshJk4YXWT0moshUOCOiOFj31H6wLiV5yL87PZgVzmWrfMbVgi9OdF0HIleXt
- d4GjPvGRqKEX3AOdCFfDRA8AOLSGe6lJT1H8czRntvW/Xw+/qvB39X0mrEuV+W7W
- 4XsYPBHVlzzKITDgw8lf828dX/v3PE6uxgfUI+XoukpZpOdvjW6ItC+1LqJLYUNN
- eeaYqVo8bBxtjnbaYbvRar9JVFAo9Dyxx8NzdS1PKpCH2Dr4Iem/h2ur1bAG6ZTB
- LyKIaGj8HO4hz62IVMKmyA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ness-qa.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University QA E-Learning Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ness.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/ness.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index b9e3ef03..00000000
--- a/swamid-interfederations-2.0/ness.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ness.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an "E-Learning Support Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T12:48:38Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ness.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC4jCCAcqgAwIBAgIJANKcP94r7A6mMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
- BAMTCW5lc3MtcHJvZDAeFw0xNDAyMDcxNTA1MTJaFw0yNDAyMDUxNTA1MTJaMBQx
- EjAQBgNVBAMTCW5lc3MtcHJvZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
- ggEBAO59T+ENkxAUibANvcZXCsSC0xrTGpb2KkdB3ROmZg7lVvR3nOdYU2E7LvMo
- p3N9BIZqeKR1B3aBrgYmM86vk9FYpBOSSo9xObYassoWMQkOr4LJIqT+tfXQ4iu0
- SFzxn+4o9pUnpK3PXtmVy03evTcUrhgvW9y/nGpU0+a/ActyQyVZ7vC/7MpxeAQ5
- vuW1UKS1BH1i35y663FeslVovWA3LhM0XuM9dQyBL0HHAxIad8Bq126l84Kf42nI
- qRh3+rKpmSQxsk4AD0h23yZrYhG7t+jhz61ukTKI396gW1JFmHe8r7z2kCGKWFVq
- MPs8OcJ8eyzJQfzYpnWtDCR9HtMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJbmVzcy1w
- cm9kMB0GA1UdDgQWBBTIAAi3LozjPHAaRQT6MTeQXZwESDANBgkqhkiG9w0BAQUF
- AAOCAQEAsV2MmcL1HlgXGhwXj+AgQK3bWllafRPJNZmauZOFYXI+cmQNp8EVMWJX
- vnNiJyIIwmGjBVc6L3or5tG+OzUTUcCzhgDwVqI3YaENIi3/vasetOPyVv1uxMkS
- zv+huaGoi8gLU3yujqpf7jfnniuA9bdHpjNRXVtO58XwtqouQ9MawXXPbXQvlZkk
- 6OarQ9hUJJyDlRmjT23WyJQArQoIbA2engqoewMPUxUODn9nkqyMTYXwjAqAQq83
- nsMkXgPwTDS2KVMM2bqrJIEUgbF2AEWyGHWCx5be1Ez/A0gc/TAS55BvqtyYFi2P
- I/H3QJqNHhxYOO/woRND0pDdZhl9Vw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ness.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ness.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ness.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ness.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ness.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ness.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ness.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ness.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ness.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ness.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ness.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University E-Learning Support Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nicrctr.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/nicrctr.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 5c129e0e..00000000
--- a/swamid-interfederations-2.0/nicrctr.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nicrctr.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "NICR Central Tissue Resource" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-11T10:11:50Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nicrctr.org/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nicrctr.org/Shibboleth.sso/ncldur"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nicrctr.org/Shibboleth.sso/SPNEGO"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAP2gLdgHSWHTMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmRhbnRvb2luZS5jYW1wdXMubmNsLmFjLnVrMB4XDTEwMTIxMDE1MjMxMloX
- DTIwMTIwNzE1MjMxMlowJTEjMCEGA1UEAxMaZGFudG9vaW5lLmNhbXB1cy5uY2wu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC96j7lMubJp+aX
- DqwLGDzxcrm2bxvKU3WjWK91L5rD0P0HYle7yr2VcuXsChz7jyFrMNZ+tCUhfvlA
- gRuhiKjXC9PRDf18NRx43UhPlRnwrvjN5OFhOH1Mvq4QFkpnTtqPHQ5RM7T3+U0l
- /lacgZtzhmXiCbY9KLOF0Qc5iLjD+ISwErSd6N1ovhIyNsZ4/44Cquz0fcFyV1PN
- BIzj1toMubMqStVY98OnKCVIDccOsKeZW7RPevLP4T5uglP88hgiFhN5auJDWy2B
- fm/AA9pjD/u9BsAggdVfrAE0WvatR+a6cpxngNTFjht9UUoxBlUq844RFZBqXf/v
- xLmipJUlAgMBAAGjSDBGMCUGA1UdEQQeMByCGmRhbnRvb2luZS5jYW1wdXMubmNs
- LmFjLnVrMB0GA1UdDgQWBBTHyeqX+oU3dzZx3e1+nYbV7evjejANBgkqhkiG9w0B
- AQUFAAOCAQEAIzxIXH09GMjE+nIpbGIACTI9ERepMQMzNnO+M8JugkhEhrLWXWvu
- XoswtdvxBH3rKMKZp1tJIk7T1toLDn3vCvn60S/6AjzQbyYzQ+qfDBij7X7kBU71
- jlfFn8dFGGcYNdPkl2EjrtWQ/pOTJiJAqal0rPQTcqmrFmi3UeDw+gtncRDIBEGx
- JvjufLt4NSdyg7ZHLLjLv2ntSGPk4ZFLjw0ihpigI6LLzhNv3zxuH/x/y1pIyolC
- MQHLbJL5+WUpb/syt6lRETX5WxKuJHTirlgkjz1edzAPDZ8SIKD3O/TcnKXB/rpF
- HitJuYtcRIR/YxPrydq4GCsFy99FLz336A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nicrctr.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nicrctr.org/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nicrctr.org/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nicrctr.org/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nicrctr.org/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nicrctr.org/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nicrctr.org/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nicrctr.org/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nicrctr.org/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nicrctr.org/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nicrctr.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nicrctr.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nicrctr.org/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nicrctr.org/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nicrctr.org/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">NICR Central Tissue Resource</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml b/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml
deleted file mode 100644
index b33a88d9..00000000
--- a/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nrenadmin.redclara.net/simplesaml/saml2/sp/metadata.php">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="es">
-http://cofre.reuna.cl/index.php/es/reglas-federacion
-</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">NRENAdmin - RedCLARA</mdui:DisplayName>
- <mdui:DisplayName xml:lang="es">NRENAdmin - RedCLARA</mdui:DisplayName>
- <mdui:Description xml:lang="en">RedCLARA's NREN Administration Service</mdui:Description>
- <mdui:Description xml:lang="es">Servicio de Administración para RNEI de RedCLARA</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
- <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>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
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>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
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nrenadmin.redclara.net/simplesaml/saml2/sp/SingleLogoutService.php"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nrenadmin.redclara.net/simplesaml/saml2/sp/AssertionConsumerService.php" index="0"/>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>SEG</md:GivenName>
- <md:SurName>RedCLARA</md:SurName>
- <md:EmailAddress>seg@redclara.net</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/numbas-editor.mas.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/numbas-editor.mas.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index dfa2157d..00000000
--- a/swamid-interfederations-2.0/numbas-editor.mas.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://numbas-editor.mas.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Maths numbas-editor" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-18T14:21:12Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC/TCCAeWgAwIBAgIJAIzIL6sO27tUMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEnRhbGxhZ2h0Lm5jbC5hYy51azAeFw0xMjEwMTIwODAxNDJaFw0yMjEwMTAw
- ODAxNDJaMB0xGzAZBgNVBAMTEnRhbGxhZ2h0Lm5jbC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAMXaAj+KYQTnQuDpw2qY1NeTfoss6fBRmHa/
- cydAzhECj2kcvgRl+n1dqH9bXLG3n7qnTXjogAr18bjIq/bMZhLGIqj5HkfymMGS
- 8Okxv4of/TNklJjh+G9eTpfwHItq6OlcTjSS/B0fzA4bGd2CjXCFAsAZjnyopazu
- rplfr1WJ07zk9apE0F95SbAjYGJAgT2KTcPFLRkd7Z0wopCKgdD9Qu0y4YqrO8m/
- 4/teSHCTJWL28qKOpfAfWf8qqrV6B9muoUk24CPezrO3WCEG0vRdItgKBhIrjvDQ
- h/ank8adFmPihhIUjkIl6rcC3SNp1c3OPksv2Y9ynDtQ7yXfVJ8CAwEAAaNAMD4w
- HQYDVR0RBBYwFIISdGFsbGFnaHQubmNsLmFjLnVrMB0GA1UdDgQWBBQgvAedBgPx
- u8A4lNDiLRCGhjpEVjANBgkqhkiG9w0BAQUFAAOCAQEAGrUmqI2A5NTAjzDQrnGV
- ZOc9IfzLYZ9e6zsz3er9I94WyaIDj++5m+pV3aLq63PLMR/0mE6j89OIJ23z9Euq
- /Z/4Fb4I1fkqiQANmcxSBrfDcniWH9Jj5HO1qgzF7JYh1LuzEn44pRMFUTynflZN
- rl2VGW2S+oOUCzFkvMUS7VACj+qwn6CdqxAyTGtPX3Nqm2eDctOhCGIQqG/EuoPL
- NGu7UWfPpnLvSdVYx+0dDFl7jlX0fu/cW+U6EmT4LBQICBc81bi/BaHI/Sqn/hBl
- HwHzemhcCntnLPJTnqj3lNgDWBvwmU7uPWuOajogiPjXdKBs/5+S0oiSTAaQ0HVR
- fg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC/TCCAeWgAwIBAgIJAIzIL6sO27tUMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEnRhbGxhZ2h0Lm5jbC5hYy51azAeFw0xMjEwMTIwODAxNDJaFw0yMjEwMTAw
- ODAxNDJaMB0xGzAZBgNVBAMTEnRhbGxhZ2h0Lm5jbC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAMXaAj+KYQTnQuDpw2qY1NeTfoss6fBRmHa/
- cydAzhECj2kcvgRl+n1dqH9bXLG3n7qnTXjogAr18bjIq/bMZhLGIqj5HkfymMGS
- 8Okxv4of/TNklJjh+G9eTpfwHItq6OlcTjSS/B0fzA4bGd2CjXCFAsAZjnyopazu
- rplfr1WJ07zk9apE0F95SbAjYGJAgT2KTcPFLRkd7Z0wopCKgdD9Qu0y4YqrO8m/
- 4/teSHCTJWL28qKOpfAfWf8qqrV6B9muoUk24CPezrO3WCEG0vRdItgKBhIrjvDQ
- h/ank8adFmPihhIUjkIl6rcC3SNp1c3OPksv2Y9ynDtQ7yXfVJ8CAwEAAaNAMD4w
- HQYDVR0RBBYwFIISdGFsbGFnaHQubmNsLmFjLnVrMB0GA1UdDgQWBBQgvAedBgPx
- u8A4lNDiLRCGhjpEVjANBgkqhkiG9w0BAQUFAAOCAQEAGrUmqI2A5NTAjzDQrnGV
- ZOc9IfzLYZ9e6zsz3er9I94WyaIDj++5m+pV3aLq63PLMR/0mE6j89OIJ23z9Euq
- /Z/4Fb4I1fkqiQANmcxSBrfDcniWH9Jj5HO1qgzF7JYh1LuzEn44pRMFUTynflZN
- rl2VGW2S+oOUCzFkvMUS7VACj+qwn6CdqxAyTGtPX3Nqm2eDctOhCGIQqG/EuoPL
- NGu7UWfPpnLvSdVYx+0dDFl7jlX0fu/cW+U6EmT4LBQICBc81bi/BaHI/Sqn/hBl
- HwHzemhcCntnLPJTnqj3lNgDWBvwmU7uPWuOajogiPjXdKBs/5+S0oiSTAaQ0HVR
- fg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://numbas-editor.mas.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Maths numbas-editor SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/maths/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Michael</GivenName>
- <SurName>Beaty</SurName>
- <EmailAddress>mailto:michael.beaty@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oalar.bexhillcollege.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oalar.bexhillcollege.ac.uk-oala-metadata.xml
deleted file mode 100644
index e3fc0bd0..00000000
--- a/swamid-interfederations-2.0/oalar.bexhillcollege.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oalar.bexhillcollege.ac.uk/oala/metadata">
- <!--
- This is an OpenAthens LA IdP for Bexhill College.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-07T17:52:27Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bexhillcollege.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUDCCAjigAwIBAgIIdBeTIc0BiScwDQYJKoZIhvcNAQEFBQAwPzEYMBYGA1UE
- CgwPQmV4aGlsbCBDb2xsZWdlMSMwIQYDVQQDDBpvYWxhci5iZXhoaWxsY29sbGVn
- ZS5hYy51azAeFw0xMzA0MjMxMDA0NTlaFw0yMzA0MjMxMDA0NTlaMD8xGDAWBgNV
- BAoMD0JleGhpbGwgQ29sbGVnZTEjMCEGA1UEAwwab2FsYXIuYmV4aGlsbGNvbGxl
- Z2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWugVQCrIg
- DiK9deORvN+8eNmrV/OyQOzfHG13J/Xw168vF5dwu35bhkUWpJgpRFJA8u39Upp7
- y3u427emLQ9mgXRQxG+oLIQZYUTI51eTG9FoTN6c9cS0PssnNxekWmxzzRkZnSlg
- PqGWtyBuARDSOUCfbTlZ28T9GVf06yLy8KHrxfG2yFMF0MDHGiqvqerEgPEMiXNn
- 3pT3M0MXh+W9WQ742+GbWbcD49UKxeNuoVZiB8pkcCzmBIOPzkGaqiDZPsXsu+iE
- YqmHbmCrmiCDZEtjEIEc1fj5224EgQ3ZzeMUrFaHiaCCe2aXXAgFQNaAxNyUvS+J
- e4rd9PmxH/cJAgMBAAGjUDBOMB0GA1UdDgQWBBTTRdHgjk41OT+Y1XdmJmu4TudW
- DjAfBgNVHSMEGDAWgBTTRdHgjk41OT+Y1XdmJmu4TudWDjAMBgNVHRMEBTADAQH/
- MA0GCSqGSIb3DQEBBQUAA4IBAQAt4tjyDorID8J8HSr0cQnX9NIvTrezbKNY3c1b
- 3KFVznSFlgwhFna26ku7g0ySbnQ1rhQoDkcaLwb1R4JiKxYtLvJVIPcgEGLxpA4m
- G5Sn5ALrK3uy4pE/1HmpREcRk0/xcVExUT0QU6roPrevDlP2NA+WgI2WOb5q5Mj1
- qhzZ975ZpO320r94JoenL3/o1g4kH4Xxgxto0Q3+/+1jsYFfh53TPek4zvu5WkcY
- p8ANcVBwMtxcGYaG9sF/rQI1+vSYYIKl1/lTi2Sx79THFXgewBzdgvKTOlDpS3l1
- MtDjf/HVlcSmRupYfdFPZrBj5amx/xInE9D/227lJfSUweXI
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUDCCAjigAwIBAgIIdBeTIc0BiScwDQYJKoZIhvcNAQEFBQAwPzEYMBYGA1UE
- CgwPQmV4aGlsbCBDb2xsZWdlMSMwIQYDVQQDDBpvYWxhci5iZXhoaWxsY29sbGVn
- ZS5hYy51azAeFw0xMzA0MjMxMDA0NTlaFw0yMzA0MjMxMDA0NTlaMD8xGDAWBgNV
- BAoMD0JleGhpbGwgQ29sbGVnZTEjMCEGA1UEAwwab2FsYXIuYmV4aGlsbGNvbGxl
- Z2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWugVQCrIg
- DiK9deORvN+8eNmrV/OyQOzfHG13J/Xw168vF5dwu35bhkUWpJgpRFJA8u39Upp7
- y3u427emLQ9mgXRQxG+oLIQZYUTI51eTG9FoTN6c9cS0PssnNxekWmxzzRkZnSlg
- PqGWtyBuARDSOUCfbTlZ28T9GVf06yLy8KHrxfG2yFMF0MDHGiqvqerEgPEMiXNn
- 3pT3M0MXh+W9WQ742+GbWbcD49UKxeNuoVZiB8pkcCzmBIOPzkGaqiDZPsXsu+iE
- YqmHbmCrmiCDZEtjEIEc1fj5224EgQ3ZzeMUrFaHiaCCe2aXXAgFQNaAxNyUvS+J
- e4rd9PmxH/cJAgMBAAGjUDBOMB0GA1UdDgQWBBTTRdHgjk41OT+Y1XdmJmu4TudW
- DjAfBgNVHSMEGDAWgBTTRdHgjk41OT+Y1XdmJmu4TudWDjAMBgNVHRMEBTADAQH/
- MA0GCSqGSIb3DQEBBQUAA4IBAQAt4tjyDorID8J8HSr0cQnX9NIvTrezbKNY3c1b
- 3KFVznSFlgwhFna26ku7g0ySbnQ1rhQoDkcaLwb1R4JiKxYtLvJVIPcgEGLxpA4m
- G5Sn5ALrK3uy4pE/1HmpREcRk0/xcVExUT0QU6roPrevDlP2NA+WgI2WOb5q5Mj1
- qhzZ975ZpO320r94JoenL3/o1g4kH4Xxgxto0Q3+/+1jsYFfh53TPek4zvu5WkcY
- p8ANcVBwMtxcGYaG9sF/rQI1+vSYYIKl1/lTi2Sx79THFXgewBzdgvKTOlDpS3l1
- MtDjf/HVlcSmRupYfdFPZrBj5amx/xInE9D/227lJfSUweXI
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oalar.bexhillcollege.ac.uk/oala/sso"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oalar.bexhillcollege.ac.uk/oala/sso"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Bexhill College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Bexhill College</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.bexhillcollege.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Tim</GivenName>
- <SurName>Atkins</SurName>
- <EmailAddress>mailto:timatkins@bexhillcollege.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Tim</GivenName>
- <SurName>Atkins</SurName>
- <EmailAddress>mailto:timatkins@bexhillcollege.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oauth.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/oauth.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 2b8ab416..00000000
--- a/swamid-interfederations-2.0/oauth.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oauth.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Computing Science Oauth Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-04T11:38:07Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC/TCCAeWgAwIBAgIJAO8R2oVH9YGaMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEmNzdm0wMDY5Lm5jbC5hYy51azAeFw0xNDA3MDMxMjU1MThaFw0yNDA2MzAx
- MjU1MThaMB0xGzAZBgNVBAMTEmNzdm0wMDY5Lm5jbC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBANNcfTXHaBFBIQs/EiEzeRoSApAomibdRnkj
- 8bTvcyK1IXayCL1BDE/aU53GS5Adznygxuui2xEOlu90hF5z0dXUk2+ZJG7a2+IJ
- fCDISQgwAQT6A7sb1ngo5/3yR5dkNTxBrEUmqdzYvwk9Aqgde+AFr2JSX7BccHSZ
- TQvgfbHnCBdZFxUCgGw8xRuigLy74UL8vLXj3t4SlmFygMiLEUBffwESoY3NEMss
- bY8GaelexvXiNOxMzdz9XyV9Rzfq34aBEWvI+rOSq8ntR9Mdfo3MQanuTJdJkeR9
- KMChysQbimA2lsh2/LVdWHmi6N4ocnrd0xGe+JX3ADBeCZCZsaECAwEAAaNAMD4w
- HQYDVR0RBBYwFIISY3N2bTAwNjkubmNsLmFjLnVrMB0GA1UdDgQWBBTTHbjC+6fu
- 0JX2gi5fs6UYkWETPDANBgkqhkiG9w0BAQUFAAOCAQEADoAGKQU0XA8KMP4M19IP
- Pg172Jdq5KA6Zb8k0UNu2QTNVTFwUfRKo5/QE8vZ206ma1KpPRTdPlJedeK9TdRy
- rRTQBmhQ+vT1Mnex11MCMp24JvH9+4zAPzQ2s3LD2somu2ZCQ95oLozyC44oxIi7
- DQFyQppJyZ32UMBfdHhN4dZGRWeAUCSPUMxOE8HADnLIqV2+RKRsbUmFKvb0+CoS
- xiVYs4a+McW2kK69H/Z+6m8HQqv1/MrvHF+uyAJx6yNNQSp6VW907OZsjq2dwUDu
- B7QOCbUJ8f1FMhulB1hUe/kwg2mj4LHB+IDAOb6u6kCfo6bFP1R0rgpBxct6+YDO
- Cw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oauth.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Computing Science Oauth Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/computing/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Jon</GivenName>
- <SurName>Dowland</SurName>
- <EmailAddress>mailto:jon.dowland@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/olaf.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/olaf.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index caa5db53..00000000
--- a/swamid-interfederations-2.0/olaf.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://olaf.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an "OnLine Assessment Forms" SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-29T16:07:36Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://olaf.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University OnLine Assessment Forms</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/opal.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/opal.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 16dcde13..00000000
--- a/swamid-interfederations-2.0/opal.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://opal.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2.2 SP for Newcastle University's Network Monitoring Server.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://opal.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0zCCAbugAwIBAgIJAMajGCItstjSMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
- BAMTBG9wYWwwHhcNMDkwODI4MTI1MjMwWhcNMTkwODI2MTI1MjMwWjAPMQ0wCwYD
- VQQDEwRvcGFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4lRTUSwb
- ER3lpqDYcx4W9ot4L/v/6XO5MOogNRuxEgIwJJ8MHug2RVwMDhNRrDbcnqnMaQOo
- Rd92ySVYQ1HuY+L8CpsmvSCgaNjCXy3wBm+M3BIEBGRpLZ6z/zsm3L3BFLtulIsE
- M3i4AQJKacNo+PQqidMrl787H+cBPM1x0AaRREy939FO7Oz0jIVO7N4kO6dIDER0
- 3GmxSHMduOKnzw/Qrap+02VcPdY9HV5RcXHp0i3XsBKME91UBEURB23sSgZLUr5M
- /mRX9HW1mjcGcdTuXc9eb51HUxwPAqfl6mBNsSYOUbxOC3GCzn9db5pxeZAKCs4m
- EY21OOb+WZFzWQIDAQABozIwMDAPBgNVHREECDAGggRvcGFsMB0GA1UdDgQWBBQS
- YMH8j8E3+m6eHtpKPuLL9zfieTANBgkqhkiG9w0BAQUFAAOCAQEAaxUuPB+kA8+Z
- De0w6rZM/758MRnp4Zey8us4waPJZo85zsUh2fEHHljtoNxiBrW9bVybIcif79py
- 8a9zmKnOTk+mRm4HTr9HDDmyiBkYGZ0JSE2UVoOl16hJ3nMyMhvtfz+w0ku3MEXp
- qPV3Gq5VlrIA3RklUc0TS5vDftwT2HoqJobDRVuoMrGC6M3nOO8CJIVPgxl63+KL
- /UxNh7rT31r1bC/uOnXTf4TnNiQcxrA3WtPCtQ+kZJ3v9mgxvu4whzxM2c2xmuus
- mhkFOoaGFZJNkQZTSSufu6H6vO4SXKz9Ouz216IOm/TQAHNpSTIowO5C9tOdyAJk
- z98fgeB+SQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0zCCAbugAwIBAgIJAMajGCItstjSMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
- BAMTBG9wYWwwHhcNMDkwODI4MTI1MjMwWhcNMTkwODI2MTI1MjMwWjAPMQ0wCwYD
- VQQDEwRvcGFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4lRTUSwb
- ER3lpqDYcx4W9ot4L/v/6XO5MOogNRuxEgIwJJ8MHug2RVwMDhNRrDbcnqnMaQOo
- Rd92ySVYQ1HuY+L8CpsmvSCgaNjCXy3wBm+M3BIEBGRpLZ6z/zsm3L3BFLtulIsE
- M3i4AQJKacNo+PQqidMrl787H+cBPM1x0AaRREy939FO7Oz0jIVO7N4kO6dIDER0
- 3GmxSHMduOKnzw/Qrap+02VcPdY9HV5RcXHp0i3XsBKME91UBEURB23sSgZLUr5M
- /mRX9HW1mjcGcdTuXc9eb51HUxwPAqfl6mBNsSYOUbxOC3GCzn9db5pxeZAKCs4m
- EY21OOb+WZFzWQIDAQABozIwMDAPBgNVHREECDAGggRvcGFsMB0GA1UdDgQWBBQS
- YMH8j8E3+m6eHtpKPuLL9zfieTANBgkqhkiG9w0BAQUFAAOCAQEAaxUuPB+kA8+Z
- De0w6rZM/758MRnp4Zey8us4waPJZo85zsUh2fEHHljtoNxiBrW9bVybIcif79py
- 8a9zmKnOTk+mRm4HTr9HDDmyiBkYGZ0JSE2UVoOl16hJ3nMyMhvtfz+w0ku3MEXp
- qPV3Gq5VlrIA3RklUc0TS5vDftwT2HoqJobDRVuoMrGC6M3nOO8CJIVPgxl63+KL
- /UxNh7rT31r1bC/uOnXTf4TnNiQcxrA3WtPCtQ+kZJ3v9mgxvu4whzxM2c2xmuus
- mhkFOoaGFZJNkQZTSSufu6H6vO4SXKz9Ouz216IOm/TQAHNpSTIowO5C9tOdyAJk
- z98fgeB+SQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://opal.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://opal.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opal.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opal.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://opal.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://opal.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opal.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opal.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opal.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://opal.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opal.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://opal.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://opal.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://opal.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Network Monitoring Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>ISS Helpline</GivenName>
- <EmailAddress>mailto:helpline@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ossdrtp.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ossdrtp.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 93857ecd..00000000
--- a/swamid-interfederations-2.0/ossdrtp.bsp.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ossdrtp.bsp.ox.ac.uk/shibboleth">
- <!--
- This is a Shib 2 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFKjCCBBKgAwIBAgIJAOGdpHcim9lzMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBwcm9qZWN0czEdMBsGA1UEAxMUb3NzZHJ0cC5ic3Aub3gu
- YWMudWsxITAfBgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azAeFw0xMDEw
- MTkxNDM2MjNaFw0yMDEwMTYxNDM2MjNaMIG+MQswCQYDVQQGEwJHQjEUMBIGA1UE
- CBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVy
- c2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFuZCBw
- cm9qZWN0czEdMBsGA1UEAxMUb3NzZHJ0cC5ic3Aub3guYWMudWsxITAfBgkqhkiG
- 9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBAMHXSYtSG4KRya6upjSdtJbWVk/eAdea6ShMz72IdL39fjTdvlGY
- lu0IzHeJMnOLA0TUkyeSOaf2/BmM8ZCdkvDDBzpkxradsG5y0qsQUOJbA33vHwc6
- LTsOyiiZ++lex/n3pugaomrnC3eNK5mJ8EiFBjwnq4tciiFuQvbONLi/reaN5JVL
- +abZKJ3zsOxRkDi0XdZRZXI5IRzpBK5qgFDrXJAClVQ5DyhBmFScDo3cghpHlJsZ
- VkMk6yoVCZQXQTTpW/oGZpzD89VNC+iGksDmkJvbfUrtXeENg13wuv7mkjAvV6fg
- PDlEjXdI2M3I+7ZiW83mo6bZe4nTTChLr2MCAwEAAaOCAScwggEjMB0GA1UdDgQW
- BBSGmZIySlgJQv1vsR7vlEA8Y88QVjCB8wYDVR0jBIHrMIHogBSGmZIySlgJQv1v
- sR7vlEA8Y88QVqGBxKSBwTCBvjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9y
- ZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2Yg
- T3hmb3JkMScwJQYDVQQLEx5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgcHJvamVjdHMx
- HTAbBgNVBAMTFG9zc2RydHAuYnNwLm94LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJv
- cHNAYWRtaW4ub3guYWMudWuCCQDhnaR3IpvZczAMBgNVHRMEBTADAQH/MA0GCSqG
- SIb3DQEBBQUAA4IBAQBeCxZRfURu5KMaPtleY7LxiVjRnG2JCuqlDSBKhAEgx7LW
- v6cRv0DydQq1xc1m+oRLKdb74ac9hDs0KiN+v7pizgQerR8Y6gout9Nq+GsEhzOC
- dXkzQlmg9svR0ZwA34VMAg6fnsiGdCEt1mnPpnpaBJvg0uOD7JOsb7T9OSUz+z0+
- 1Z5aatVsLnE51OUyI8dN1uIE48YJDmbm256rVuwNASpxRuPK4DiX6pj0/fNgRuch
- VlucTtpnWn+4c7QTTyXuuhHCXwpCVSZ6SXiw0QvlKZ5I5CzRuulEz4RmluQVNJ80
- caab0TE+Ku45bRD6EhiUMZVLix7bRYHxJMMIoK2/
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFKjCCBBKgAwIBAgIJAOGdpHcim9lzMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBwcm9qZWN0czEdMBsGA1UEAxMUb3NzZHJ0cC5ic3Aub3gu
- YWMudWsxITAfBgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azAeFw0xMDEw
- MTkxNDM2MjNaFw0yMDEwMTYxNDM2MjNaMIG+MQswCQYDVQQGEwJHQjEUMBIGA1UE
- CBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVy
- c2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFuZCBw
- cm9qZWN0czEdMBsGA1UEAxMUb3NzZHJ0cC5ic3Aub3guYWMudWsxITAfBgkqhkiG
- 9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBAMHXSYtSG4KRya6upjSdtJbWVk/eAdea6ShMz72IdL39fjTdvlGY
- lu0IzHeJMnOLA0TUkyeSOaf2/BmM8ZCdkvDDBzpkxradsG5y0qsQUOJbA33vHwc6
- LTsOyiiZ++lex/n3pugaomrnC3eNK5mJ8EiFBjwnq4tciiFuQvbONLi/reaN5JVL
- +abZKJ3zsOxRkDi0XdZRZXI5IRzpBK5qgFDrXJAClVQ5DyhBmFScDo3cghpHlJsZ
- VkMk6yoVCZQXQTTpW/oGZpzD89VNC+iGksDmkJvbfUrtXeENg13wuv7mkjAvV6fg
- PDlEjXdI2M3I+7ZiW83mo6bZe4nTTChLr2MCAwEAAaOCAScwggEjMB0GA1UdDgQW
- BBSGmZIySlgJQv1vsR7vlEA8Y88QVjCB8wYDVR0jBIHrMIHogBSGmZIySlgJQv1v
- sR7vlEA8Y88QVqGBxKSBwTCBvjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9y
- ZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2Yg
- T3hmb3JkMScwJQYDVQQLEx5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgcHJvamVjdHMx
- HTAbBgNVBAMTFG9zc2RydHAuYnNwLm94LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJv
- cHNAYWRtaW4ub3guYWMudWuCCQDhnaR3IpvZczAMBgNVHRMEBTADAQH/MA0GCSqG
- SIb3DQEBBQUAA4IBAQBeCxZRfURu5KMaPtleY7LxiVjRnG2JCuqlDSBKhAEgx7LW
- v6cRv0DydQq1xc1m+oRLKdb74ac9hDs0KiN+v7pizgQerR8Y6gout9Nq+GsEhzOC
- dXkzQlmg9svR0ZwA34VMAg6fnsiGdCEt1mnPpnpaBJvg0uOD7JOsb7T9OSUz+z0+
- 1Z5aatVsLnE51OUyI8dN1uIE48YJDmbm256rVuwNASpxRuPK4DiX6pj0/fNgRuch
- VlucTtpnWn+4c7QTTyXuuhHCXwpCVSZ6SXiw0QvlKZ5I5CzRuulEz4RmluQVNJ80
- caab0TE+Ku45bRD6EhiUMZVLix7bRYHxJMMIoK2/
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossdrtp.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: OSS Internal DR Test ossdrtp</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Tom</GivenName>
- <SurName>Livings</SurName>
- <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ossdrtpreg.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ossdrtpreg.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 0c377fa7..00000000
--- a/swamid-interfederations-2.0/ossdrtpreg.bsp.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ossdrtpreg.bsp.ox.ac.uk/shibboleth">
- <!--
- This is a Shib 2 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFMzCCBBugAwIBAgIJALB3rAFULo2OMA0GCSqGSIb3DQEBBQUAMIHBMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEgMB4GA1UEAxMXb3NzZHJ0cHJlZy5ic3Au
- b3guYWMudWsxITAfBgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azAeFw0x
- MDEwMTkxNDM5MzNaFw0yMDEwMTYxNDM5MzNaMIHBMQswCQYDVQQGEwJHQjEUMBIG
- A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5p
- dmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFu
- ZCBQcm9qZWN0czEgMB4GA1UEAxMXb3NzZHJ0cHJlZy5ic3Aub3guYWMudWsxITAf
- BgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
- BQADggEPADCCAQoCggEBAM7cZc4MT5z+qTG945r6wdhhy3uxIVXz/BgU1agAD14N
- MXfWW/brbHMJ/a0ApFMn8AtWMsx1Y4sVpGZJiDGzLNguE1l/mX1kq292yNV89jfy
- yhiDuDHAARiHYyhPOLEHQjheOBbnZw1+CJNo6kHho0A+GgygO/wBpbIBkMK+8bz/
- TcR4ICckbcCN6rClADcdUTKmie+PAAotvFkwk16loYeRFF7WxfsKIH4813K/2/0z
- 5sqV0iA9a55q/DoKuuOGxP6duJUL7SjJ6ux7gngKFCKg90ElxfkxLb0mcSBvoU0k
- 7hjt9/H+OePIpKMSqAn0s/4po4n9aQp9LQR8idPjQSECAwEAAaOCASowggEmMB0G
- A1UdDgQWBBQqSwZ6fLeXEQIuNcKBvqabZeFmtDCB9gYDVR0jBIHuMIHrgBQqSwZ6
- fLeXEQIuNcKBvqabZeFmtKGBx6SBxDCBwTELMAkGA1UEBhMCR0IxFDASBgNVBAgT
- C094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNp
- dHkgb2YgT3hmb3JkMScwJQYDVQQLEx5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJv
- amVjdHMxIDAeBgNVBAMTF29zc2RydHByZWcuYnNwLm94LmFjLnVrMSEwHwYJKoZI
- hvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQCwd6wBVC6NjjAMBgNVHRMEBTAD
- AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQC5d/nRvz2y5HjkFAtSuBpptr6B2Bp++JCy
- u1JfubabGYkiPPVoiZcwVoNHveMZLAZE1+M6KYk4B81iK2LpaDb5psYVt3eRwXfo
- Qav/FciN4ZgA1EZG4eBkuhIxw2016SZm1WNEZcmNOvqgAUrK1rsLF0sx7hZNyxFr
- sDAJT0+bgyPk9+kJmbOv2MCgYWfIG9BoNARfQu3K75z7ioC4/kr66HTZuStTvQFS
- FvblELAbdo3/IufD4aAc9jlt6lMAr+W0FpbG9YcPbb+68l10W10KFiPDSYe5Sx9V
- O2yf9OwoeFdD4faLnilsa5OGtVf6kcvjTCvBGbj8FepXZdBUzXoE
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFMzCCBBugAwIBAgIJALB3rAFULo2OMA0GCSqGSIb3DQEBBQUAMIHBMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEgMB4GA1UEAxMXb3NzZHJ0cHJlZy5ic3Au
- b3guYWMudWsxITAfBgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azAeFw0x
- MDEwMTkxNDM5MzNaFw0yMDEwMTYxNDM5MzNaMIHBMQswCQYDVQQGEwJHQjEUMBIG
- A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5p
- dmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFu
- ZCBQcm9qZWN0czEgMB4GA1UEAxMXb3NzZHJ0cHJlZy5ic3Aub3guYWMudWsxITAf
- BgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
- BQADggEPADCCAQoCggEBAM7cZc4MT5z+qTG945r6wdhhy3uxIVXz/BgU1agAD14N
- MXfWW/brbHMJ/a0ApFMn8AtWMsx1Y4sVpGZJiDGzLNguE1l/mX1kq292yNV89jfy
- yhiDuDHAARiHYyhPOLEHQjheOBbnZw1+CJNo6kHho0A+GgygO/wBpbIBkMK+8bz/
- TcR4ICckbcCN6rClADcdUTKmie+PAAotvFkwk16loYeRFF7WxfsKIH4813K/2/0z
- 5sqV0iA9a55q/DoKuuOGxP6duJUL7SjJ6ux7gngKFCKg90ElxfkxLb0mcSBvoU0k
- 7hjt9/H+OePIpKMSqAn0s/4po4n9aQp9LQR8idPjQSECAwEAAaOCASowggEmMB0G
- A1UdDgQWBBQqSwZ6fLeXEQIuNcKBvqabZeFmtDCB9gYDVR0jBIHuMIHrgBQqSwZ6
- fLeXEQIuNcKBvqabZeFmtKGBx6SBxDCBwTELMAkGA1UEBhMCR0IxFDASBgNVBAgT
- C094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNp
- dHkgb2YgT3hmb3JkMScwJQYDVQQLEx5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJv
- amVjdHMxIDAeBgNVBAMTF29zc2RydHByZWcuYnNwLm94LmFjLnVrMSEwHwYJKoZI
- hvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQCwd6wBVC6NjjAMBgNVHRMEBTAD
- AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQC5d/nRvz2y5HjkFAtSuBpptr6B2Bp++JCy
- u1JfubabGYkiPPVoiZcwVoNHveMZLAZE1+M6KYk4B81iK2LpaDb5psYVt3eRwXfo
- Qav/FciN4ZgA1EZG4eBkuhIxw2016SZm1WNEZcmNOvqgAUrK1rsLF0sx7hZNyxFr
- sDAJT0+bgyPk9+kJmbOv2MCgYWfIG9BoNARfQu3K75z7ioC4/kr66HTZuStTvQFS
- FvblELAbdo3/IufD4aAc9jlt6lMAr+W0FpbG9YcPbb+68l10W10KFiPDSYe5Sx9V
- O2yf9OwoeFdD4faLnilsa5OGtVf6kcvjTCvBGbj8FepXZdBUzXoE
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossdrtpreg.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: OSS Internal DR Test ossdrtpreg</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Tom</GivenName>
- <SurName>Livings</SurName>
- <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ossdrts.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ossdrts.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 32bce182..00000000
--- a/swamid-interfederations-2.0/ossdrts.bsp.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ossdrts.bsp.ox.ac.uk/shibboleth">
- <!--
- This is a Shib 2 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFKjCCBBKgAwIBAgIJAKgB58l4xp8FMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEdMBsGA1UEAxMUb3NzZHJ0cy5ic3Aub3gu
- YWMudWsxITAfBgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azAeFw0xMDEw
- MTkxNDQ3MzFaFw0yMDEwMTYxNDQ3MzFaMIG+MQswCQYDVQQGEwJHQjEUMBIGA1UE
- CBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVy
- c2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFuZCBQ
- cm9qZWN0czEdMBsGA1UEAxMUb3NzZHJ0cy5ic3Aub3guYWMudWsxITAfBgkqhkiG
- 9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBALNhdIG9d6dabBHPP/CvkVhnNFXj+hEQnzvBteYJyV624bU4IC3b
- YpRSLwyAnkLXDOg13G4kfWJvrLDTt+hgFLl9a8s6wsAlZQpUbxcu76TPemgQcTOR
- OqFnyyOok55+P9KCtO1i/2PNAWJt26fRXm586MXayneWLBbjfGGPPr1jptIyAivG
- QQ2GZ9y9ljpyKnPJHsObgSkCbqFm3Cb6CXbh2Vqq+vOO4CnKepbSXHsOE2qkLp2Z
- 9+oAtYQqC9/bi5vOgNu4QQiwoBafP0F2CJ7aJyzrlYNOUaBOJInpAfsDVVq7IudJ
- zMK7ZZQvnriXjGmuoXE7idwaMYDjCm0qBQECAwEAAaOCAScwggEjMB0GA1UdDgQW
- BBRavLtKwnSZEMPHxvPYNM6f0Yuh9jCB8wYDVR0jBIHrMIHogBRavLtKwnSZEMPH
- xvPYNM6f0Yuh9qGBxKSBwTCBvjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9y
- ZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2Yg
- T3hmb3JkMScwJQYDVQQLEx5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJvamVjdHMx
- HTAbBgNVBAMTFG9zc2RydHMuYnNwLm94LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJv
- cHNAYWRtaW4ub3guYWMudWuCCQCoAefJeMafBTAMBgNVHRMEBTADAQH/MA0GCSqG
- SIb3DQEBBQUAA4IBAQAd/lX1hnuhRoIv4ktIpVbYoZiYnICujmBLtySPIK8rbRF3
- QnFBLFPMjsND/J9ZKoxVVycq+dATIFU/w0DLjfLJMxnuzQZs/cr1ThdszqvSY62e
- g4kWHspDOoYWgGnFvXN43hMqVJ6S2z/8lw7dX0mW5ugGr+ZdhAlqQnrRtOKR7hgn
- R6spcdQWtG+qFkyRB5j/vP7kABXfsynq+6QEgoaaxFmHf6SPxCIKFe+Dmsc6d7vL
- libSuK6oLgcx7Gp+zqDCbBQumlCOpKkTtdWkuBIQ4UbOR5Oq5rXGmfS594pA455r
- tp8Kf50NGCEbGr/2F/SosB8HO0WGVSob/tPNxIsZ
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFKjCCBBKgAwIBAgIJAKgB58l4xp8FMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEdMBsGA1UEAxMUb3NzZHJ0cy5ic3Aub3gu
- YWMudWsxITAfBgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azAeFw0xMDEw
- MTkxNDQ3MzFaFw0yMDEwMTYxNDQ3MzFaMIG+MQswCQYDVQQGEwJHQjEUMBIGA1UE
- CBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVy
- c2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFuZCBQ
- cm9qZWN0czEdMBsGA1UEAxMUb3NzZHJ0cy5ic3Aub3guYWMudWsxITAfBgkqhkiG
- 9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBALNhdIG9d6dabBHPP/CvkVhnNFXj+hEQnzvBteYJyV624bU4IC3b
- YpRSLwyAnkLXDOg13G4kfWJvrLDTt+hgFLl9a8s6wsAlZQpUbxcu76TPemgQcTOR
- OqFnyyOok55+P9KCtO1i/2PNAWJt26fRXm586MXayneWLBbjfGGPPr1jptIyAivG
- QQ2GZ9y9ljpyKnPJHsObgSkCbqFm3Cb6CXbh2Vqq+vOO4CnKepbSXHsOE2qkLp2Z
- 9+oAtYQqC9/bi5vOgNu4QQiwoBafP0F2CJ7aJyzrlYNOUaBOJInpAfsDVVq7IudJ
- zMK7ZZQvnriXjGmuoXE7idwaMYDjCm0qBQECAwEAAaOCAScwggEjMB0GA1UdDgQW
- BBRavLtKwnSZEMPHxvPYNM6f0Yuh9jCB8wYDVR0jBIHrMIHogBRavLtKwnSZEMPH
- xvPYNM6f0Yuh9qGBxKSBwTCBvjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9y
- ZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2Yg
- T3hmb3JkMScwJQYDVQQLEx5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJvamVjdHMx
- HTAbBgNVBAMTFG9zc2RydHMuYnNwLm94LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJv
- cHNAYWRtaW4ub3guYWMudWuCCQCoAefJeMafBTAMBgNVHRMEBTADAQH/MA0GCSqG
- SIb3DQEBBQUAA4IBAQAd/lX1hnuhRoIv4ktIpVbYoZiYnICujmBLtySPIK8rbRF3
- QnFBLFPMjsND/J9ZKoxVVycq+dATIFU/w0DLjfLJMxnuzQZs/cr1ThdszqvSY62e
- g4kWHspDOoYWgGnFvXN43hMqVJ6S2z/8lw7dX0mW5ugGr+ZdhAlqQnrRtOKR7hgn
- R6spcdQWtG+qFkyRB5j/vP7kABXfsynq+6QEgoaaxFmHf6SPxCIKFe+Dmsc6d7vL
- libSuK6oLgcx7Gp+zqDCbBQumlCOpKkTtdWkuBIQ4UbOR5Oq5rXGmfS594pA455r
- tp8Kf50NGCEbGr/2F/SosB8HO0WGVSob/tPNxIsZ
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossdrts.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: OSS Internal DR Test ossdrts</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Tom</GivenName>
- <SurName>Livings</SurName>
- <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ossdrtsreg.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ossdrtsreg.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index a6c25dbc..00000000
--- a/swamid-interfederations-2.0/ossdrtsreg.bsp.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ossdrtsreg.bsp.ox.ac.uk/shibboleth">
- <!--
- This is a Shib 2 SP for the University of Oxford.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFMzCCBBugAwIBAgIJAPW8QEl9XqQHMA0GCSqGSIb3DQEBBQUAMIHBMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEgMB4GA1UEAxMXb3NzZHJ0c3JlZy5ic3Au
- b3guYWMudWsxITAfBgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azAeFw0x
- MDEwMTkxNDQ1MTZaFw0yMDEwMTYxNDQ1MTZaMIHBMQswCQYDVQQGEwJHQjEUMBIG
- A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5p
- dmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFu
- ZCBQcm9qZWN0czEgMB4GA1UEAxMXb3NzZHJ0c3JlZy5ic3Aub3guYWMudWsxITAf
- BgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
- BQADggEPADCCAQoCggEBAK4thceCJVAjSJCe32fEEw4A+YwJFMVHPOt/h4PJZ8ze
- nhON1fZG7D6Ne4bzr8xz/N3Uuh6YhAmJZwMz5NcqshZP17XIUDQHnX6yaARsyWhS
- auLASgenIdzqIhBynJoNvvwdlkhxP6i0StQNopoGMlwiCsXROPEQdzqVEY5qIMNW
- 6e4SU7LS2j5ao13o5pCZGwCLFMGSuFkYeLfTIB8/2mKDkyWToJYJPmKwrAcLov4N
- VZyjmDSpq+MjyshU72PZzDp7KDKydKzU5dKAn1K6yj2AV2uTEKqvWtWSNm0o9G1j
- wpcAP1sXwfG/4RYSdU/EugN/2896/pzILFoDf0hizwkCAwEAAaOCASowggEmMB0G
- A1UdDgQWBBRMidGvgaFbv0azcKBX4ZQKaN5KbDCB9gYDVR0jBIHuMIHrgBRMidGv
- gaFbv0azcKBX4ZQKaN5KbKGBx6SBxDCBwTELMAkGA1UEBhMCR0IxFDASBgNVBAgT
- C094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNp
- dHkgb2YgT3hmb3JkMScwJQYDVQQLEx5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJv
- amVjdHMxIDAeBgNVBAMTF29zc2RydHNyZWcuYnNwLm94LmFjLnVrMSEwHwYJKoZI
- hvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQD1vEBJfV6kBzAMBgNVHRMEBTAD
- AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA2ZB6CgXjceODPR/H6nCRfvbzrNCDS6M6L
- X3xqQn71+2dbpidt4flBeMg+SEsAu0J8L9LU9xuMx+Sr18AoEQOHKlGBrUGrmaB9
- c3x5ELOk7McO1mGyOACGj/XyzlkCnXc53q4t8qOWGhV2D6nHPGeU/zwGVR3eQJhH
- G+CNE+tki+n/2KjG7QXb8f8J+5sBHHSIqFe6JGAfHBbC4UBSR6c5uoysqr9lVuem
- AKcCdoDJHgT31lvgXxfFc6+W0NECvYyW4FKJYjQbc1JsA1vdwf+2gjl16onDGRqS
- vd0BeFvbB0syh/8TSPoYrNNQSbjpW54eQZFrzNRpM29dBS3t55MX
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFMzCCBBugAwIBAgIJAPW8QEl9XqQHMA0GCSqGSIb3DQEBBQUAMIHBMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
- IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEgMB4GA1UEAxMXb3NzZHJ0c3JlZy5ic3Au
- b3guYWMudWsxITAfBgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azAeFw0x
- MDEwMTkxNDQ1MTZaFw0yMDEwMTYxNDQ1MTZaMIHBMQswCQYDVQQGEwJHQjEUMBIG
- A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5p
- dmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFu
- ZCBQcm9qZWN0czEgMB4GA1UEAxMXb3NzZHJ0c3JlZy5ic3Aub3guYWMudWsxITAf
- BgkqhkiG9w0BCQEWEm9wc0BhZG1pbi5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
- BQADggEPADCCAQoCggEBAK4thceCJVAjSJCe32fEEw4A+YwJFMVHPOt/h4PJZ8ze
- nhON1fZG7D6Ne4bzr8xz/N3Uuh6YhAmJZwMz5NcqshZP17XIUDQHnX6yaARsyWhS
- auLASgenIdzqIhBynJoNvvwdlkhxP6i0StQNopoGMlwiCsXROPEQdzqVEY5qIMNW
- 6e4SU7LS2j5ao13o5pCZGwCLFMGSuFkYeLfTIB8/2mKDkyWToJYJPmKwrAcLov4N
- VZyjmDSpq+MjyshU72PZzDp7KDKydKzU5dKAn1K6yj2AV2uTEKqvWtWSNm0o9G1j
- wpcAP1sXwfG/4RYSdU/EugN/2896/pzILFoDf0hizwkCAwEAAaOCASowggEmMB0G
- A1UdDgQWBBRMidGvgaFbv0azcKBX4ZQKaN5KbDCB9gYDVR0jBIHuMIHrgBRMidGv
- gaFbv0azcKBX4ZQKaN5KbKGBx6SBxDCBwTELMAkGA1UEBhMCR0IxFDASBgNVBAgT
- C094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNp
- dHkgb2YgT3hmb3JkMScwJQYDVQQLEx5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJv
- amVjdHMxIDAeBgNVBAMTF29zc2RydHNyZWcuYnNwLm94LmFjLnVrMSEwHwYJKoZI
- hvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQD1vEBJfV6kBzAMBgNVHRMEBTAD
- AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA2ZB6CgXjceODPR/H6nCRfvbzrNCDS6M6L
- X3xqQn71+2dbpidt4flBeMg+SEsAu0J8L9LU9xuMx+Sr18AoEQOHKlGBrUGrmaB9
- c3x5ELOk7McO1mGyOACGj/XyzlkCnXc53q4t8qOWGhV2D6nHPGeU/zwGVR3eQJhH
- G+CNE+tki+n/2KjG7QXb8f8J+5sBHHSIqFe6JGAfHBbC4UBSR6c5uoysqr9lVuem
- AKcCdoDJHgT31lvgXxfFc6+W0NECvYyW4FKJYjQbc1JsA1vdwf+2gjl16onDGRqS
- vd0BeFvbB0syh/8TSPoYrNNQSbjpW54eQZFrzNRpM29dBS3t55MX
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossdrtsreg.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford: OSS Internal DR Test ossdrtsreg</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Operations Team</GivenName>
- <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Tom</GivenName>
- <SurName>Livings</SurName>
- <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pds-login.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/pds-login.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index f20c00ca..00000000
--- a/swamid-interfederations-2.0/pds-login.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pds-login.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a 'SMART Project Server 2' JBOSS PicketLink SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-11T09:49:21Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIE1zCCA7+gAwIBAgIRAMWeZx1G7lbDu7qyvQeDekIwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjA4MjAwMDAwMDBaFw0xNTA4MjAyMzU5NTlaMIGtMQswCQYD
- VQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEcMBoGA1UEBxMTTmV3Y2FzdGxlIHVw
- b24gVHluZTEqMCgGA1UEChMhVW5pdmVyc2l0eSBvZiBOZXdjYXN0bGUgdXBvbiBU
- eW5lMSQwIgYDVQQLExtTY2hvb2wgb2YgQ29tcHV0aW5nIFNjaWVuY2UxHDAaBgNV
- BAMTE3Bkcy1sb2dpbi5uY2wuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
- ggEKAoIBAQDkO2U3HoOiy+IfOJFLS946UJfzme0D9J79uE2xSXq9b0qsT/M74Seq
- uRXT6zCqBhiGJ7dya9K4lA8S6udJRJrzMkxAnZIPEPM9aYCJLLo7sZGgqbLEKfSg
- uXGspEXT7XBNt5hj/nBQe1hIB75mCADRsgF5j4YjwuMdFicEffbCvzG7jQInouK2
- yB7oDzAySwdd7MAzdyF5XwOJh9wGR6zTwNDj3tqyQeeJguOKQUivH0Et+Y7PNVa+
- dVNaRR5o6gwwTXBYfSCEssuiLqeMO/c9RwmIp6/u1h3LWlnNgtCWGCX3yqRf5qzy
- U40KXTSKK9VmvLCKJsFQNoA2wO/QaT9jAgMBAAGjggFmMIIBYjAfBgNVHSMEGDAW
- gBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUS+DFNUPC97lY0OwaCihM
- P9X6mgIwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYI
- KwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYD
- VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
- U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
- LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
- cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITcGRzLWxvZ2luLm5j
- bC5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAK81/VPze5vAlxuzZtbrJ6q/qCLMB
- JKSVwYnsrYzxiWtXoIhgl9IPgGtUmbyu+rzXac6Gb4FfID7crN8L2edTog3gv3YJ
- wR6C1EUoGnirHix2z9PDaTz44ayfGCR7m8ihzshWyIVyPOABdX9Tp2EQ1Dh+miml
- V9Qf8yPfjNlAGw7ouqnK2Jmsq+dX8IrI0DJ/amcBh0Fx5f7ZRN2Aq2oapWKr3Yp9
- kIBIpQNZB1Gk19BxE4d5Y7/RIL2JW0T80WH1x4b3KGqI70NhkkQbsIlfJvNRovfO
- Ltf/8F0z2I8EkfirLBwUjyLvFDV3T1h4oSAvYl4kKqKxW6i6Ub8jbr/jZA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pds-login.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pds-login.ncl.ac.uk/shibboleth/metadata" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pds-login.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pds-login.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pds-login.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pds-login.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University SMART Project Server 2</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/computing/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Maciej</GivenName>
- <SurName>Machulak</SurName>
- <EmailAddress>mailto:maciej.machulak@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pencil.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/pencil.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 17d80b4f..00000000
--- a/swamid-interfederations-2.0/pencil.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pencil.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a pencil Shibboleth 2 SP owned by The University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC2TCCAcGgAwIBAgIJALkHd4AxDKQpMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
- BAMTBnBlbmNpbDAeFw0wOTExMjcxMTA3MThaFw0xOTExMjUxMTA3MThaMBExDzAN
- BgNVBAMTBnBlbmNpbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZ4
- 97B2RYudMlL1+WaGZMAXC0WBz9SYtisicLSUC3NdpmaHWsrEZQZRgSp0WizXwGkb
- 84pq88WNsyxq6eaZREjmRPyhQ5kIn92HFsa46slNM0ppexpYnCmKNSm2fWaPgQcG
- NZtT7mt4aCURtLG2DK/YRJdKjc91NQyw+PYrgzreNSPienU91Nkg49RZy6ctIfSL
- +JHpAYCO5jM8siXzTohUuPwHC04MKJN1MbmYigBMxexJOh0Y/CjukgkapFeIIb9J
- eYvTSyyJgmpjwHFnvQ/2l3Rl4DFeTB54XbWLBbTSyUwTZk6+sy8vYPbivezO66YC
- 7z/HUYoOlMPGMHF5ABMCAwEAAaM0MDIwEQYDVR0RBAowCIIGcGVuY2lsMB0GA1Ud
- DgQWBBTB+DeiyORWSzD/GantLsYWPIHBYjANBgkqhkiG9w0BAQUFAAOCAQEAHFxK
- bJMIszyGyG6zzEFlj9zjkDvXzb43DqdmPtwzo0cesHUiW//nk3JGrP/kLc08Wblq
- zzALtqgvIJZ4Q17MGoN+0HezkOBpMoTJdH9RuKLquJRO/XJVMFnbOf8FCixU0OkH
- GU/OSAF9VpG5LbWyCSZ7hFYW+Lu2Ltefx2SMQSsWSLbw37gxwBI1ruceWbs3D6iT
- F92rqnUJyEBCbGC9DYcHGOeMVp+tbeYP2QaV661zgK93Tx54GKZB1d4MbWxgYf8A
- trl9+J1CL+xy0nfXZNT8TEcaGaxMGdhBUvyRlOYBaMswfrxa98zehRQKiryOm1qx
- U5E8eNJbegzNnVocrA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC2TCCAcGgAwIBAgIJALkHd4AxDKQpMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
- BAMTBnBlbmNpbDAeFw0wOTExMjcxMTA3MThaFw0xOTExMjUxMTA3MThaMBExDzAN
- BgNVBAMTBnBlbmNpbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZ4
- 97B2RYudMlL1+WaGZMAXC0WBz9SYtisicLSUC3NdpmaHWsrEZQZRgSp0WizXwGkb
- 84pq88WNsyxq6eaZREjmRPyhQ5kIn92HFsa46slNM0ppexpYnCmKNSm2fWaPgQcG
- NZtT7mt4aCURtLG2DK/YRJdKjc91NQyw+PYrgzreNSPienU91Nkg49RZy6ctIfSL
- +JHpAYCO5jM8siXzTohUuPwHC04MKJN1MbmYigBMxexJOh0Y/CjukgkapFeIIb9J
- eYvTSyyJgmpjwHFnvQ/2l3Rl4DFeTB54XbWLBbTSyUwTZk6+sy8vYPbivezO66YC
- 7z/HUYoOlMPGMHF5ABMCAwEAAaM0MDIwEQYDVR0RBAowCIIGcGVuY2lsMB0GA1Ud
- DgQWBBTB+DeiyORWSzD/GantLsYWPIHBYjANBgkqhkiG9w0BAQUFAAOCAQEAHFxK
- bJMIszyGyG6zzEFlj9zjkDvXzb43DqdmPtwzo0cesHUiW//nk3JGrP/kLc08Wblq
- zzALtqgvIJZ4Q17MGoN+0HezkOBpMoTJdH9RuKLquJRO/XJVMFnbOf8FCixU0OkH
- GU/OSAF9VpG5LbWyCSZ7hFYW+Lu2Ltefx2SMQSsWSLbw37gxwBI1ruceWbs3D6iT
- F92rqnUJyEBCbGC9DYcHGOeMVp+tbeYP2QaV661zgK93Tx54GKZB1d4MbWxgYf8A
- trl9+J1CL+xy0nfXZNT8TEcaGaxMGdhBUvyRlOYBaMswfrxa98zehRQKiryOm1qx
- U5E8eNJbegzNnVocrA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pencil.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: development machine (on campus only)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ppub.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/ppub.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 1768e763..00000000
--- a/swamid-interfederations-2.0/ppub.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ppub.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Newcastle University Personal Web Publishing Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-13T18:48:20Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0zCCAbugAwIBAgIJAIZF6MaskKxyMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
- BAMTBHBwdWIwHhcNMTQwMzEzMTMwNjQ3WhcNMjQwMzEwMTMwNjQ3WjAPMQ0wCwYD
- VQQDEwRwcHViMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv1osjgrk
- sOtRmtOlSIDwrK4c2K9q8OyZGXvD59NxmCe6+uyZpY/PM5PP1iWyIRPYCKOLmJ+w
- B/otpMHfX/DGy6aVbsNmnzpoUUEUHBLScClp/Fel5TNuHEsgmfxuBqefdkzQF5We
- Zcrp9JYeg5tAytKXGQ1xNrHN3LyXbq6hIBfr8idYhj8zC9NU9daetWJk0slqWg4K
- lgOGTBiK44WaAWT3Xm/WYb4uV/vjY2T8j4Ejc9HKy47CHYHilHaIZS3EV69JbkcH
- vBILR1HgQ57AO78cWQA1pQXkniyLcdqJTEyloaozbgpiX0qbzapFdsPwQrycIW0j
- cpq5uQ8TEJeL8wIDAQABozIwMDAPBgNVHREECDAGggRwcHViMB0GA1UdDgQWBBQI
- Q8D3PxTVT0EAovfqnEc/YqItHTANBgkqhkiG9w0BAQUFAAOCAQEAdNtAARhJlSrQ
- Zgt+uK6B4JU9rI8v9VmYtTpx3VI6Aj3Rf+5ohs340vuEMGcDw0+JHOj4iWe+Qybm
- oYIO/00+OX/bQwNVbuY1qo4Mle5a9y8gJq5QSPA+3NT54ft+5y78znEsUxygKOln
- YZDFCO1t0+PeTev7eBBc/HHa+VSbCNhuTq1KeyASHs1IY9b12O/0Bw+jiZ43HFAl
- RMSovOnTglYSbv+PnDnJz7lSGDyj0Gxbny8PD6ObsoyVrzbpmMMPashOrl6q82ZJ
- x6aZNeDrE1Ze6VQ0fZDYBWhh2zmu2tl63jm1KHB9nuVZZdqAOzzgtCkErkz1NbPi
- 0atNy8Sv4w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ppub.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Personal Web Publishing Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pre-register-ci.nii.ac.jp-shibboleth-sp.xml b/swamid-interfederations-2.0/pre-register-ci.nii.ac.jp-shibboleth-sp.xml
deleted file mode 100644
index 3435c4cb..00000000
--- a/swamid-interfederations-2.0/pre-register-ci.nii.ac.jp-shibboleth-sp.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pre-register-ci.nii.ac.jp/shibboleth-sp">
- <!--
- This is a "CiNii" Shibboleth SP for the National Institute of Informatics.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-08T12:25:00Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/auth/action/shibLogin"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/auth/action/shibLogin" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIERjCCAy4CCQCPS/MN6mbaoTANBgkqhkiG9w0BAQUFADCB5DELMAkGA1UEBhMC
- SlAxDjAMBgNVBAgMBVRva3lvMRMwEQYDVQQHDApDaGl5b2RhLWt1MSowKAYDVQQK
- DCFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxPTA7BgNVBAsMNEN5
- YmVyIFNjaWVuY2UgSW5mcmFzdHJ1Y3R1cmUgRGV2ZWxvcHRtZW50IERlcGFydG1l
- bnQxIjAgBgNVBAMMGXByZS1yZWdpc3Rlci1jaS5uaWkuYWMuanAxITAfBgkqhkiG
- 9w0BCQEWEnN5cy1kZXNrQG5paS5hYy5qcDAeFw0xMzAxMjgwMjMyNDhaFw0xODAx
- MjcwMjMyNDhaMIHkMQswCQYDVQQGEwJKUDEOMAwGA1UECAwFVG9reW8xEzARBgNV
- BAcMCkNoaXlvZGEta3UxKjAoBgNVBAoMIU5hdGlvbmFsIEluc3RpdHV0ZSBvZiBJ
- bmZvcm1hdGljczE9MDsGA1UECww0Q3liZXIgU2NpZW5jZSBJbmZyYXN0cnVjdHVy
- ZSBEZXZlbG9wdG1lbnQgRGVwYXJ0bWVudDEiMCAGA1UEAwwZcHJlLXJlZ2lzdGVy
- LWNpLm5paS5hYy5qcDEhMB8GCSqGSIb3DQEJARYSc3lzLWRlc2tAbmlpLmFjLmpw
- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt6ojkMit0inFe10Kteh7
- 6IseNbqGnIEUVj+pWL34FmadNLn2iiWJf76BfZ4ycH+hOYfoiChYjSADAfyo+hu6
- 2MCJasaTEuzshcqi2H8nJS7rmBvdD0pn5zcLHg2SLtA9orlNI4zk7c9114Lj3yMg
- qnL2WiQ4+y9/IGxkPEbbh9t0P/POZA82D60MIPmFgBJ0NBEiplEvhUoeb5p1FXO5
- FCsbNLiDZthlFWWvN/SoHPb14aLxHOTV+xByeQoAv4lGxnt0quR33i8EgqdmF4L8
- BKw8ou0gMWzHsplkhRYdAX4RNm4MeZ9E5Ll4hui3YmoJ41BZvesXGYobBSqTM0V1
- XQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBEpA9zQ8oI5bMVEruMG0f8TlvB9+al
- CAmtO67cX4qyyhun5Jf6D/WLVC22+z029hqxGkGtAFpmSe2lLX9nRNo0VENS/prJ
- gdsArXpZKQO/geMcl4MJmaQUj6NZMwux7bqX+0S5mrDfyskswdnR1bjc88A2r9KJ
- LOoGlAI65EtGUjtb21TRasd3mC66f0AJzyVXxfWCn1Q0UX3N2lb320E571YQ4oXf
- UDgftgtC742fe+Cg/dI5WYNp0LU7IL3c8YxunZMJ4+QnwWbaQLGH041/AEUpIbKu
- myC6oBXhiegdCQCL1ajyrg/+CJy/LRWT2N2AKrDkURIX9BFeiok2BNgG
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pre-register-ci.nii.ac.jp/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">National Institute of Informatics</OrganizationName>
- <OrganizationDisplayName xml:lang="en">CiNii (SP for system migration)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.nii.ac.jp/en/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Portal Service Unit</GivenName>
- <EmailAddress>mailto:co_portal@nii.ac.jp</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Portal Service Unit</GivenName>
- <EmailAddress>mailto:co_portal@nii.ac.jp</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/printing.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/printing.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 76ce5272..00000000
--- a/swamid-interfederations-2.0/printing.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://printing.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 SP for University of Newcastle upon Tyne
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://printing.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC+zCCAeOgAwIBAgIBADANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDExRwc3dl
- Yi1zYjEyLm5jbC5hYy51azAeFw0wOTA5MTUxMDI2MDZaFw0xOTA5MTMxMDI2MDZa
- MB8xHTAbBgNVBAMTFHBzd2ViLXNiMTIubmNsLmFjLnVrMIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAwUF4CqNxqa50S6Pc8bCrY2r5qWgtmy1vE9fVBAxH
- m/J8Z91i43WskbCCJBUo6GkgRx0Z+HWJA7tFQEw689fsbm0/GvEcLMDC2Wu8ZxTL
- yM3QJVQuXSPSXPA8URKPdWyZ0uHv/KdHWONm6j4xVV0uYtYUZyKCO5jVs8c6pmCg
- ItPu6hczdJ3d0az9au4Sw0rnFwpEyrDqvnuf8MyHkGlCz7UO9z833WOXFpm5OfFD
- grFw+9c/LMdb5Kgz+ZKHpE3huPIhI9B/179mXUgrNrZmIBWbq0hzNW/35tqgQKK+
- HQDPH78EuH6DsCuyKkBJbN4issLlzGyV+G5iT2VgMCDUOQIDAQABo0IwQDAfBgNV
- HREEGDAWghRwc3dlYi1zYjEyLm5jbC5hYy51azAdBgNVHQ4EFgQUhzfwAwLmiLwe
- sovryhe/jDU7Zd8wDQYJKoZIhvcNAQEFBQADggEBAFv/84ir1sNPAQB97xJ65vj5
- 7n6p9XHS320Nc8P8C6E66ZpZteTY/zRWE3AAWrDnxTi52Sq2Uf4adW6IA1UlOlsl
- LeAmLzwY473TnLGxQ671dmbWPFNvtBEvP/XiGY3xvJrJ3w/RdwVFSNjBWdaRtXiJ
- 0Jh4dHVur09rTXJk8GhIBQKdJIio79MB9eNuRw1rgUbunagK9wblDPDfybMuqcz5
- eXZ7G2F8obIzp7TJTRGKCnbXZpWmFS/buCe/BMXHyK1t8yXU+0tw1L5GD+Wl7zqN
- 4iA08vE/yrm9EFhip9QPjADE9b0065LscwIz8yk9IrVOHFDTxeirRW5Q+OTI2zQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC+zCCAeOgAwIBAgIBADANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDExRwc3dl
- Yi1zYjEyLm5jbC5hYy51azAeFw0wOTA5MTUxMDI2MDZaFw0xOTA5MTMxMDI2MDZa
- MB8xHTAbBgNVBAMTFHBzd2ViLXNiMTIubmNsLmFjLnVrMIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAwUF4CqNxqa50S6Pc8bCrY2r5qWgtmy1vE9fVBAxH
- m/J8Z91i43WskbCCJBUo6GkgRx0Z+HWJA7tFQEw689fsbm0/GvEcLMDC2Wu8ZxTL
- yM3QJVQuXSPSXPA8URKPdWyZ0uHv/KdHWONm6j4xVV0uYtYUZyKCO5jVs8c6pmCg
- ItPu6hczdJ3d0az9au4Sw0rnFwpEyrDqvnuf8MyHkGlCz7UO9z833WOXFpm5OfFD
- grFw+9c/LMdb5Kgz+ZKHpE3huPIhI9B/179mXUgrNrZmIBWbq0hzNW/35tqgQKK+
- HQDPH78EuH6DsCuyKkBJbN4issLlzGyV+G5iT2VgMCDUOQIDAQABo0IwQDAfBgNV
- HREEGDAWghRwc3dlYi1zYjEyLm5jbC5hYy51azAdBgNVHQ4EFgQUhzfwAwLmiLwe
- sovryhe/jDU7Zd8wDQYJKoZIhvcNAQEFBQADggEBAFv/84ir1sNPAQB97xJ65vj5
- 7n6p9XHS320Nc8P8C6E66ZpZteTY/zRWE3AAWrDnxTi52Sq2Uf4adW6IA1UlOlsl
- LeAmLzwY473TnLGxQ671dmbWPFNvtBEvP/XiGY3xvJrJ3w/RdwVFSNjBWdaRtXiJ
- 0Jh4dHVur09rTXJk8GhIBQKdJIio79MB9eNuRw1rgUbunagK9wblDPDfybMuqcz5
- eXZ7G2F8obIzp7TJTRGKCnbXZpWmFS/buCe/BMXHyK1t8yXU+0tw1L5GD+Wl7zqN
- 4iA08vE/yrm9EFhip9QPjADE9b0065LscwIz8yk9IrVOHFDTxeirRW5Q+OTI2zQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://printing.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://printing.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://printing.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://printing.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://printing.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://printing.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://printing.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://printing.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://printing.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://printing.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://printing.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://printing.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://printing.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://printing.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Print Credits Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pss-teamweb.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/pss-teamweb.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index ce712f61..00000000
--- a/swamid-interfederations-2.0/pss-teamweb.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pss-teamweb.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/shibboleth-idp/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SSO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/DS"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC6DCCAdCgAwIBAgIJAPeCWjj+fIPwMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
- BAMTC3Bzcy10ZWFtd2ViMB4XDTExMTEyODE2MTk0OFoXDTIxMTEyNTE2MTk0OFow
- FjEUMBIGA1UEAxMLcHNzLXRlYW13ZWIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
- ggEKAoIBAQDEU3sovq1miL61IwuXt0St5fI1KVM41Y/LV+rgi56r9uR9PeMrsjrJ
- qshg7FCliZ19N4uaWpG01t++j6u0u2ozxqLLQC6B47C406eoOTHl0VYH1tV+7Uc1
- EygAJ5K390qKWLlSdpYz2xJT2GkrUYycIG05tGi29GplPkVgly4VdWPVHa0L0uOm
- aO08iGh1tpf6ayIMNkHHIWfq53QtGjxS+rJz9X0zG5W3BZ/XM+eASCC2bkum0DbZ
- 1xYxh3G2T8Il7MkrF2WMzxDM+CpUz9WuY5RsLaEA84dUlaftLQmQhkQw5cAYLty2
- WLCZBK+NtyAdRL3gDp1Gx1dCn1lrLYoZAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Bz
- cy10ZWFtd2ViMB0GA1UdDgQWBBRjNyIgrj/mqfqoBFkxqKWnPIDliDANBgkqhkiG
- 9w0BAQUFAAOCAQEARW5tnlcL4Qe4HfogRv32NVEhhikHIPQoQaFhKOWmwSzOnrt8
- m4jogESc+1O6W37kD6KX4W+ligdfRChDMRqSnAvG27qAkNLv3fcitVsFMqEdNu+o
- eZGSab5/BASxhe10Aze+vhqJpcs2RKu6aLEjlGew1qSnx43ZTcKF71CCfzcvxpKI
- mgbr1HlBJy9+qeJxDNCGgoc4mUBXY/p52xD+jG36+EN5C5VJaJLGUPfGO99ZscPt
- uc22Pj8QhuNVpbC0/BJRqE8zxQGRy+obxkMQFvlQQSQVdfuPqmLiq2c/yx7XvZtT
- xe4uwBFHtKtggC8zPs4mWu7k93BlhXUXYKnfYQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pss-teamweb.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Newcastle upon Tyne: Professional Support Service SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rattler-new.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/rattler-new.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 7a1306e0..00000000
--- a/swamid-interfederations-2.0/rattler-new.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rattler-new.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Library Development Server Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-23T15:28:47Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGzCCAgOgAwIBAgIJAP9P2LuuAvfdMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
- BAMTHHJhdHRsZXItbmV3LmNhbXB1cy5uY2wuYWMudWswHhcNMTIwNDIzMTUwMzU3
- WhcNMjIwNDIxMTUwMzU3WjAnMSUwIwYDVQQDExxyYXR0bGVyLW5ldy5jYW1wdXMu
- bmNsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoEPNh5eN
- FPA9j8vVTeHF+Zv5Kw5gPSQ1+jg8VZapKKa+Qe9NqZoQ05H6tAshPUZ2t4uhEaMD
- KnP3MSJqGd5NsLiRMOnDtP4WPIYTQriKzd1BOvz8JNzwaD0jwwLFwyL2aVLVG/eO
- 4CcfruhireA4CS5ic2tPaXLIzGOeYqPUakjzNQ00JENxluEzmvACczkHSsaMJic5
- gfP4Jkb9WY5kRW6Hp0B7pun6qkMab6ZVi+mj4blNf9RpD8WmQ1xeDWtHrF5KA9qX
- pEwRra/DfAd9qb+1izWz2e9PC59aGencR4WS6VlAg0eqmc94AHQLRfSC6sajiWk2
- 7XnWtV2sEqoNWwIDAQABo0owSDAnBgNVHREEIDAeghxyYXR0bGVyLW5ldy5jYW1w
- dXMubmNsLmFjLnVrMB0GA1UdDgQWBBTpD8sHlXj0JOEUxe4ILNduoiRCzzANBgkq
- hkiG9w0BAQUFAAOCAQEAX0Sot4gsnc6k+FkRtIMhAhwP9hxTU/algBzzT+EVQtwJ
- q2F/PwVvvaYx/hR8vhHInamNFhUJ0JY7z3i6JCctvL0sou55N31NXs0il2IFcahh
- YI+AbtrVidWPQBhuP5oWxvcFOGNw1FyRoRntsW2fXKct6h/XpFlxm7XxBE+8GqI7
- r6gHD6J6pndGslBvk6aBwYKkxfHJlzWgDMTMr+/EC/qbKcyKnseoJh0FMb3nzoAO
- MP/nbK5Fk6D8c05LY4GVGUp9HlOnsNpmj5SJZYW0FSJ9As794E6EVyWMxi0ItpGq
- eaq2nCW72oiba00UpDKDRkoskYLgRkjA7Aia7Ni+EQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rattler-new.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Library Development Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rattler.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/rattler.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 7bc40f78..00000000
--- a/swamid-interfederations-2.0/rattler.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rattler.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Newcastle Library Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJAOUZCDYizdJCMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGHJhdHRsZXIuY2FtcHVzLm5jbC5hYy51azAeFw0xMjAzMjIwOTQzMTNaFw0y
- MjAzMjAwOTQzMTNaMCMxITAfBgNVBAMTGHJhdHRsZXIuY2FtcHVzLm5jbC5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKk7sLkPCZ+ZH0rnHG50
- ZqxB3OzlVzDy5CI3NEdhzT5b8CbwpyNMLby7CSudzT+0HgU3PcBIa9CYwiIdQPhr
- 6R14z4aMOWpqFRDvuCqr3vUyLD1gQsaIMli4IeIG4C0j+kXCk4HlLcA7daUCuY1H
- t204b3OJyfdS35aMrwyuFsHpn5UX4lq09MCOrz2HFL0U+nZbH+pGYcHUAb8otTdq
- RX+e47TyHLCZlELmF7dZJFh5HLknta7GFwkgTbWF2ZoUWAHKvUqCL2qiuOzw7udr
- f5tiw/3073hy26Fj+E2Xcv5iDFqGCkNoVjcGxLErOsrRnSggxWMaoPiKDHh8SyV+
- pOkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYcmF0dGxlci5jYW1wdXMubmNsLmFjLnVr
- MB0GA1UdDgQWBBT5VrE6UF/2Wf80XCLXjs4VpPoCaDANBgkqhkiG9w0BAQUFAAOC
- AQEAlpC/KwQa2mV1/dLhF3zAsZsE85uTlUNHNzcu/5z02Ajns18d7yQc9TJ4bkjr
- 4IHuQ0XElrN3jlfrnHhqSknguFmcZ+WGat1yofqFYeOyrNRZUkGuw+9+IvOAYY3o
- vrMWEzk7OIfHWagQ+2aPGqaDI2YslWsoBnmBQu0KxCtKblrEuQPUMSAFQKG+YO3p
- /TqeUsDxCrUOOAd0aKoA3zSLuRXXsemPAn8qlBS++MPV+4bRvHrdfYZXasMCgfuI
- EldvhX8jmxI1IqAqmLNrCFhiQApDiEkfwIzK9scVC48uaL1gDiaCjADwHqiwXewe
- xpHusJCgb5q1qOeOjxAIl30B4g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rattler.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rattler.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Newcastle Library Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT service desk</GivenName>
- <EmailAddress>mailto:it.servicedesk@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/recap-dev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/recap-dev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 9a0cac1f..00000000
--- a/swamid-interfederations-2.0/recap-dev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://recap-dev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 dev Recap server SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC2jCCAcKgAwIBAgIBADANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlyZWNh
- cC1kZXYwHhcNMTAwOTE3MTM1MTE5WhcNMjAwOTE0MTM1MTE5WjAUMRIwEAYDVQQD
- EwlyZWNhcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkELHY
- 2TRXSyyB5O1ZY7z4QcsLWdCoaZHrHfjFEu2SuLNHTqfgYS4pwrjwRMM6yk1hnU0g
- DaAL/b6X/BiA1knpPSDQLl9Sa3OFEbqofLKE/W7clzYdeIHcHPKV8yd+sEGW44jt
- nOocHXSjykr6Oy4WzhPWL4ZZ3y/7SpM8nyNL/kXP5uwEK8xfAJBfn6Ni8wskTrlP
- /ElATRPzjttSCuDyo9vrvlJIaJTYigavviEYBWETtMCLkaufIcKLjOS1bjGIObL5
- HglBs7eFLefZuRMNg1o8lgRGMlazEybTP2SG9WFEtniRWywnQWQ+YqU5XRyi+pSh
- h6kNmIRGsnnYn/0DAgMBAAGjNzA1MBQGA1UdEQQNMAuCCXJlY2FwLWRldjAdBgNV
- HQ4EFgQUUwPobw2nbrYHXR9PXuCR1U1S7qowDQYJKoZIhvcNAQEFBQADggEBABN6
- i+zxwBwa/D9gkCRjXuXuJ8ztC7oVGaFLVSkZDvwoQxI1Z5o58a0DpvyGvuJSJxwD
- 2ueELxoxE2a/CpncpocbzFvfBhaWBoUSZmoBXd+H4jhu5AS2MXF33yHR01EySnGP
- ttI9IThgBruNA1qrRcOwysQBi27ts9BFWYV9ZMwVEj0/3ik2rpniPEr+nkrev6kp
- tCL0KJh0jK2IIugKlRH8T+4Inqga+mj123IW2t4EFhp+wCKNS1Gc8iS0D9NQxLhl
- X7CZsQO5hcZFrpbkzaSSUX9deyD/1IDZEbqrpfuu5xniKwIok7Ogk8xaANo6EufS
- 4sjl/MRW5fMJJXuzqhI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC2jCCAcKgAwIBAgIBADANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlyZWNh
- cC1kZXYwHhcNMTAwOTE3MTM1MTE5WhcNMjAwOTE0MTM1MTE5WjAUMRIwEAYDVQQD
- EwlyZWNhcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkELHY
- 2TRXSyyB5O1ZY7z4QcsLWdCoaZHrHfjFEu2SuLNHTqfgYS4pwrjwRMM6yk1hnU0g
- DaAL/b6X/BiA1knpPSDQLl9Sa3OFEbqofLKE/W7clzYdeIHcHPKV8yd+sEGW44jt
- nOocHXSjykr6Oy4WzhPWL4ZZ3y/7SpM8nyNL/kXP5uwEK8xfAJBfn6Ni8wskTrlP
- /ElATRPzjttSCuDyo9vrvlJIaJTYigavviEYBWETtMCLkaufIcKLjOS1bjGIObL5
- HglBs7eFLefZuRMNg1o8lgRGMlazEybTP2SG9WFEtniRWywnQWQ+YqU5XRyi+pSh
- h6kNmIRGsnnYn/0DAgMBAAGjNzA1MBQGA1UdEQQNMAuCCXJlY2FwLWRldjAdBgNV
- HQ4EFgQUUwPobw2nbrYHXR9PXuCR1U1S7qowDQYJKoZIhvcNAQEFBQADggEBABN6
- i+zxwBwa/D9gkCRjXuXuJ8ztC7oVGaFLVSkZDvwoQxI1Z5o58a0DpvyGvuJSJxwD
- 2ueELxoxE2a/CpncpocbzFvfBhaWBoUSZmoBXd+H4jhu5AS2MXF33yHR01EySnGP
- ttI9IThgBruNA1qrRcOwysQBi27ts9BFWYV9ZMwVEj0/3ik2rpniPEr+nkrev6kp
- tCL0KJh0jK2IIugKlRH8T+4Inqga+mj123IW2t4EFhp+wCKNS1Gc8iS0D9NQxLhl
- X7CZsQO5hcZFrpbkzaSSUX9deyD/1IDZEbqrpfuu5xniKwIok7Ogk8xaANo6EufS
- 4sjl/MRW5fMJJXuzqhI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://recap-dev.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University dev Recap server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/requester-login.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/requester-login.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index d7f192ac..00000000
--- a/swamid-interfederations-2.0/requester-login.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://requester-login.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a 'SMART Project Server 3' JBOSS PicketLink SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-11T09:56:52Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIE4jCCA8qgAwIBAgIQVdDIchipYw/OOmq2ExtNNTANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMDgyMDAwMDAwMFoXDTE1MDgyMDIzNTk1OVowgbMxCzAJBgNV
- BAYTAkdCMRAwDgYDVQQIEwdFbmdsYW5kMRwwGgYDVQQHExNOZXdjYXN0bGUgdXBv
- biBUeW5lMSowKAYDVQQKEyFVbml2ZXJzaXR5IG9mIE5ld2Nhc3RsZSB1cG9uIFR5
- bmUxJDAiBgNVBAsTG1NjaG9vbCBvZiBDb21wdXRpbmcgU2NpZW5jZTEiMCAGA1UE
- AxMZcmVxdWVzdGVyLWxvZ2luLm5jbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
- ggEPADCCAQoCggEBALpWqL+XrYnXVHGfDgNKcbX3LcuQC7sif9rOVR6D1fEbj/8w
- ERO4X4sRFhemwtNwKrLr/ds2VgXC7uGhhvfmMZE/6RHeiCI4lpqoofzC7kh6Y9n3
- FmBlpD1jp/EzBw0YPjBFl06xJxQLoJFpVf7rkzzGAJ1zYFi2JZAGD6L8rsq5J2pP
- 8hzK9A7JippbVPnh9oeuZjGGpDLv2LLpF4cAc1MHU/firRFPkGttMe7C74EM3hZQ
- XFJ6L7Xyuww5JN5ld8bAZ0s6vbtWk6viLXBrMJ3AzyElGhWQCM08mGcDmBfSESIv
- NdQss8VRzEF+Jf80yFFkFAfiAYODqso3yt6qLuUCAwEAAaOCAWwwggFoMB8GA1Ud
- IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSMakkABsxO86jH
- AemL9PdTzBmfSjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
- FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQIC
- HTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
- UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
- Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
- hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlyZXF1ZXN0
- ZXItbG9naW4ubmNsLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQCIfXJkr7LdRfkZ
- x9V+zP8xx9/LlpBczbav/kb7o1F8hV1ORWYS+hsM6Cb58gc6pZxa0uAaFsEe/fhc
- uE5XOelzoR7iL3E8+uDTv/SoukGp7ndRrTomtP+QB4kFSthESqvCW0le21N1xPxm
- 8Q6znQgH8dSQxZFFUxZfwEEcfvLBzeyeyXwc612XIp00jD8BrdfRvs1v57J68NNC
- RjZufMHK/yoW5cB6EW1AkdOzHwqRLSMRyEhGZE2iL3pXGX806fjnxZeahAkhyVSy
- HY56bXvwi2qy8bBLUu8hjY8LFRi8fvlZ5MBkgnRCewFU/r6xnF/B/SMREO+ZFBuU
- UFI3zVsd
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://requester-login.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://requester-login.ncl.ac.uk/shibboleth/metadata" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://requester-login.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://requester-login.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://requester-login.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://requester-login.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University SMART Project Server 3</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/computing/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Maciej</GivenName>
- <SurName>Machulak</SurName>
- <EmailAddress>mailto:maciej.machulak@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/research.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/research.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index a901f81c..00000000
--- a/swamid-interfederations-2.0/research.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://research.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 Research WebServer SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://research.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC+jCCAeKgAwIBAgIJAL7+fGJOilOIMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWVtcGVyb3IubmNsLmFjLnVrMB4XDTExMDExODExNDc1N1oXDTIxMDExNTEx
- NDc1N1owHDEaMBgGA1UEAxMRZW1wZXJvci5uY2wuYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQCs3JwYytLb3spzJQ51O8LJymZoGSQKG2l6Udu2
- L9lb0vxFya8FSLSJiFeXxDRQU0rIILx+uj+Tblkgz5yxWww2q/TQsYJe3iip0FNu
- d6dln/4o9Lj0yV9WCuoNMP0Iu+sC/WY5wvdrJ2SLeUwRlWwL/WQp7r+gsUVJ6wWL
- KzlwgR9OQR6aFUVY8kfsumbGu0KEv6NxRwVhguGu+y8D4m2cjYmrcSLEgI+KFAOm
- /v45oQbtdtSxlFfOArtepbNA9YRL549w7BLrYy3CvSy/swvxXkATjrSTkbTHOXZ4
- 5jh3ybt6ksgGcl1n1vaCoFVAug6Rbx2V8pJgkrGGeHi2iv59AgMBAAGjPzA9MBwG
- A1UdEQQVMBOCEWVtcGVyb3IubmNsLmFjLnVrMB0GA1UdDgQWBBQfz7hrUWmNAD5k
- EW2hX1eyyGtDUjANBgkqhkiG9w0BAQUFAAOCAQEAqMQoznAIKzNwqLuuln2sYsiZ
- SzkydDG0isdbZHFe0t/PA+vUOSlgZ5UA6nufwPPOgLRWOA1CjvQ5CKuRiZqLiPFF
- ToBNMTToP5yyEDpGvToRx4l4ZKJStSFGeEzmzkvPAg8Ss8TH+ozmb6p6XnlpBQy+
- 5f52ITO+t2sW87dPLTo1pSHMONd0lfNf8tBQzdqxNG3XwrS4Yx1tCYLyVOxmRY+Q
- dKhBe68MKamfromD6+dIHihYSTm+TcvRiaEkmLzDerjT1jxYGXt3VQdyIc7CXQ9g
- Tl3pqSNhtWbeM0zLHTHC3p5hKjtSqrThEnYyOBUcGPE79FUinWzNZccWpoifRA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC+jCCAeKgAwIBAgIJAL7+fGJOilOIMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEWVtcGVyb3IubmNsLmFjLnVrMB4XDTExMDExODExNDc1N1oXDTIxMDExNTEx
- NDc1N1owHDEaMBgGA1UEAxMRZW1wZXJvci5uY2wuYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQCs3JwYytLb3spzJQ51O8LJymZoGSQKG2l6Udu2
- L9lb0vxFya8FSLSJiFeXxDRQU0rIILx+uj+Tblkgz5yxWww2q/TQsYJe3iip0FNu
- d6dln/4o9Lj0yV9WCuoNMP0Iu+sC/WY5wvdrJ2SLeUwRlWwL/WQp7r+gsUVJ6wWL
- KzlwgR9OQR6aFUVY8kfsumbGu0KEv6NxRwVhguGu+y8D4m2cjYmrcSLEgI+KFAOm
- /v45oQbtdtSxlFfOArtepbNA9YRL549w7BLrYy3CvSy/swvxXkATjrSTkbTHOXZ4
- 5jh3ybt6ksgGcl1n1vaCoFVAug6Rbx2V8pJgkrGGeHi2iv59AgMBAAGjPzA9MBwG
- A1UdEQQVMBOCEWVtcGVyb3IubmNsLmFjLnVrMB0GA1UdDgQWBBQfz7hrUWmNAD5k
- EW2hX1eyyGtDUjANBgkqhkiG9w0BAQUFAAOCAQEAqMQoznAIKzNwqLuuln2sYsiZ
- SzkydDG0isdbZHFe0t/PA+vUOSlgZ5UA6nufwPPOgLRWOA1CjvQ5CKuRiZqLiPFF
- ToBNMTToP5yyEDpGvToRx4l4ZKJStSFGeEzmzkvPAg8Ss8TH+ozmb6p6XnlpBQy+
- 5f52ITO+t2sW87dPLTo1pSHMONd0lfNf8tBQzdqxNG3XwrS4Yx1tCYLyVOxmRY+Q
- dKhBe68MKamfromD6+dIHihYSTm+TcvRiaEkmLzDerjT1jxYGXt3VQdyIc7CXQ9g
- Tl3pqSNhtWbeM0zLHTHC3p5hKjtSqrThEnYyOBUcGPE79FUinWzNZccWpoifRA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://research.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://research.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://research.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://research.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://research.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://research.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://research.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://research.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://research.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://research.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://research.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://research.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://research.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://research.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Research WebServer</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rlo.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/rlo.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index d7eddb5e..00000000
--- a/swamid-interfederations-2.0/rlo.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rlo.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an SP for Newcastle University's Library Reading Lists Server.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJANn+1TPCg8NhMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA3JsbzAeFw0xMDEwMDcxNDAxMjNaFw0yMDEwMDQxNDAxMjNaMA4xDDAKBgNV
- BAMTA3JsbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKM+sOTZU3QO
- vMtesG2jKSFdrmYesy8AOfswToTJZwbVzsImz1EpnipYC92uYW9YVBnzSBMI7LP6
- EtdzHI1Pu5X7HeJyVM8snBk1s0Blf+BFGEgSfv3jhvNILFHkJDVgONympFCnlpaA
- zJvIxTWzhowznkqnbwpKEtwyOW0+GtW8CvYgeKrE2SN5hzYy2YSrP+V5nyzTD5Wr
- 3i7SrQM/iAJma3LH+BAbANz5DQQWYIY66XuM9RGUWmMDj2B76ChaentbY0+3oglI
- qzw6YC1iWCM8+QDBVhOBQUB5oRHbceRxgVRDOl7zzfG1J1O7Tu92XGCga+o0fuv9
- i+lmTsZ5VrUCAwEAAaMxMC8wDgYDVR0RBAcwBYIDcmxvMB0GA1UdDgQWBBQogJZb
- M+uVgJw9DH9i7pXL0UMY2zANBgkqhkiG9w0BAQUFAAOCAQEAjbkKr4xUHZgzAt9c
- kYOrIimS9FCrn3Xav4L/3ezA8ECax83zx5AhkwkZydkRQ80K8mT1bwWvVxEAbz1t
- 2qQJdPgRZQinKCLuRYgUjetUarNZrIkOWgfyJ8Q+161tRQJSJouTT1dWMdJ0OpZ+
- tR5wgxPMsbh2UWvS68ER5ID7HWM2VLnlwVzMFBoKVdfUUfpMo0ge5MMez1x9vXjU
- zwieA3/Sv5zLVyItdnvE84qCzlwCj07EcR2tAeHvP8hyAjEaqFXHGSoIPeI3kqEZ
- pszwHe1tmKiY8JiYBmob6R81wi328l9F+pASF33F5SZ2A7m/6PApvBaXIi/MlIS2
- dOj6RA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJANn+1TPCg8NhMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA3JsbzAeFw0xMDEwMDcxNDAxMjNaFw0yMDEwMDQxNDAxMjNaMA4xDDAKBgNV
- BAMTA3JsbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKM+sOTZU3QO
- vMtesG2jKSFdrmYesy8AOfswToTJZwbVzsImz1EpnipYC92uYW9YVBnzSBMI7LP6
- EtdzHI1Pu5X7HeJyVM8snBk1s0Blf+BFGEgSfv3jhvNILFHkJDVgONympFCnlpaA
- zJvIxTWzhowznkqnbwpKEtwyOW0+GtW8CvYgeKrE2SN5hzYy2YSrP+V5nyzTD5Wr
- 3i7SrQM/iAJma3LH+BAbANz5DQQWYIY66XuM9RGUWmMDj2B76ChaentbY0+3oglI
- qzw6YC1iWCM8+QDBVhOBQUB5oRHbceRxgVRDOl7zzfG1J1O7Tu92XGCga+o0fuv9
- i+lmTsZ5VrUCAwEAAaMxMC8wDgYDVR0RBAcwBYIDcmxvMB0GA1UdDgQWBBQogJZb
- M+uVgJw9DH9i7pXL0UMY2zANBgkqhkiG9w0BAQUFAAOCAQEAjbkKr4xUHZgzAt9c
- kYOrIimS9FCrn3Xav4L/3ezA8ECax83zx5AhkwkZydkRQ80K8mT1bwWvVxEAbz1t
- 2qQJdPgRZQinKCLuRYgUjetUarNZrIkOWgfyJ8Q+161tRQJSJouTT1dWMdJ0OpZ+
- tR5wgxPMsbh2UWvS68ER5ID7HWM2VLnlwVzMFBoKVdfUUfpMo0ge5MMez1x9vXjU
- zwieA3/Sv5zLVyItdnvE84qCzlwCj07EcR2tAeHvP8hyAjEaqFXHGSoIPeI3kqEZ
- pszwHe1tmKiY8JiYBmob6R81wi328l9F+pASF33F5SZ2A7m/6PApvBaXIi/MlIS2
- dOj6RA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rlo.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Library Reading Lists</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rt.idp.stanmore.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/rt.idp.stanmore.ac.uk-oala-metadata.xml
deleted file mode 100644
index ed462261..00000000
--- a/swamid-interfederations-2.0/rt.idp.stanmore.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rt.idp.stanmore.ac.uk/oala/metadata">
- <!--
- This is an OpenAthens LA IdP for Stanmore College.
- -->
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-10T11:44:41Z"/>
- </Extensions>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stanmore.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDlzCCAn+gAwIBAgIJAMP0vztMFrfnMA0GCSqGSIb3DQEBBQUAMDsxGTAXBgNV
- BAoTEFN0YW5tb3JlIENvbGxlZ2UxHjAcBgNVBAMTFXJ0LmlkcC5zdGFubW9yZS5h
- Yy51azAeFw0xMjA0MjUxMjI3NTdaFw0yMjA0MjMxMjI3NTdaMDsxGTAXBgNVBAoT
- EFN0YW5tb3JlIENvbGxlZ2UxHjAcBgNVBAMTFXJ0LmlkcC5zdGFubW9yZS5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgNapJ35yJfZAcg8tDf
- k5XIX3I9HHZbMdpTBpnjUgI72a/2EegOXSoedcav1MAJ/oxMshTr3qyNcjbnhkuB
- t6dQx+V9Yk8M2M5UXtcnfJ/84G3YR8tfNz1DpeT3o++bTCHe7igBq9fWM75rCxWR
- PvoXrkZOqt1VwxJ2tQVfsWkqzpy18iTkLoTqMmlZczW+XePCC7FBXctLHy2sk73F
- 06FjfMXtxtCANUdMZdhU7yMyObUbOiAlC3mVK8jy/TCyabudC2XW0iOJKALkn0i6
- l7r5ObCJxfD2/H4FNGj+Sz0LVkDEPJX3drnh9dfixm18wCWEt7NpA7P6ENv0BecN
- PQ8CAwEAAaOBnTCBmjAdBgNVHQ4EFgQUIxeDTguJBveW8Segf1LD1m87ZQAwawYD
- VR0jBGQwYoAUIxeDTguJBveW8Segf1LD1m87ZQChP6Q9MDsxGTAXBgNVBAoTEFN0
- YW5tb3JlIENvbGxlZ2UxHjAcBgNVBAMTFXJ0LmlkcC5zdGFubW9yZS5hYy51a4IJ
- AMP0vztMFrfnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIEqZFKH
- jobqGhqVEeNemrApDov4HAvGk+J9jK5rp4BoSaJrROTKDvS0Yqad37NYEA+hoGEF
- kAX+HoKA2pY5kc70xSKWnpgLJDkI+0GkgktVjloC54sc3Y2dYzkulRnb7YqVguom
- dEEBeVT1GP3STiQMKzVwMMewhZY3NTYyoXdFegBYMHtTuCcYfjSZo/tkooxqM+zT
- 3RgS661ZJA6iGnyWqBy+3LjIFXqzmd4pdVdw2a5Nrtz0J6PYYaskGjKz2qFVV2KG
- nMS88T16ayPSG4iqFLdwRhwhzZH6iRjacESKpesJaOeqA0eEOxCHwfNzl9xfhC1Z
- FNY6LW3zFDsFF5U=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDlzCCAn+gAwIBAgIJAMP0vztMFrfnMA0GCSqGSIb3DQEBBQUAMDsxGTAXBgNV
- BAoTEFN0YW5tb3JlIENvbGxlZ2UxHjAcBgNVBAMTFXJ0LmlkcC5zdGFubW9yZS5h
- Yy51azAeFw0xMjA0MjUxMjI3NTdaFw0yMjA0MjMxMjI3NTdaMDsxGTAXBgNVBAoT
- EFN0YW5tb3JlIENvbGxlZ2UxHjAcBgNVBAMTFXJ0LmlkcC5zdGFubW9yZS5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgNapJ35yJfZAcg8tDf
- k5XIX3I9HHZbMdpTBpnjUgI72a/2EegOXSoedcav1MAJ/oxMshTr3qyNcjbnhkuB
- t6dQx+V9Yk8M2M5UXtcnfJ/84G3YR8tfNz1DpeT3o++bTCHe7igBq9fWM75rCxWR
- PvoXrkZOqt1VwxJ2tQVfsWkqzpy18iTkLoTqMmlZczW+XePCC7FBXctLHy2sk73F
- 06FjfMXtxtCANUdMZdhU7yMyObUbOiAlC3mVK8jy/TCyabudC2XW0iOJKALkn0i6
- l7r5ObCJxfD2/H4FNGj+Sz0LVkDEPJX3drnh9dfixm18wCWEt7NpA7P6ENv0BecN
- PQ8CAwEAAaOBnTCBmjAdBgNVHQ4EFgQUIxeDTguJBveW8Segf1LD1m87ZQAwawYD
- VR0jBGQwYoAUIxeDTguJBveW8Segf1LD1m87ZQChP6Q9MDsxGTAXBgNVBAoTEFN0
- YW5tb3JlIENvbGxlZ2UxHjAcBgNVBAMTFXJ0LmlkcC5zdGFubW9yZS5hYy51a4IJ
- AMP0vztMFrfnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIEqZFKH
- jobqGhqVEeNemrApDov4HAvGk+J9jK5rp4BoSaJrROTKDvS0Yqad37NYEA+hoGEF
- kAX+HoKA2pY5kc70xSKWnpgLJDkI+0GkgktVjloC54sc3Y2dYzkulRnb7YqVguom
- dEEBeVT1GP3STiQMKzVwMMewhZY3NTYyoXdFegBYMHtTuCcYfjSZo/tkooxqM+zT
- 3RgS661ZJA6iGnyWqBy+3LjIFXqzmd4pdVdw2a5Nrtz0J6PYYaskGjKz2qFVV2KG
- nMS88T16ayPSG4iqFLdwRhwhzZH6iRjacESKpesJaOeqA0eEOxCHwfNzl9xfhC1Z
- FNY6LW3zFDsFF5U=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rt.idp.stanmore.ac.uk/oala/sso"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rt.idp.stanmore.ac.uk/oala/sso"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Stanmore College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Stanmore College TEST</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.stanmore.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Ashok</GivenName>
- <SurName>Jain</SurName>
- <EmailAddress>mailto:a.jain@stanmore.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Himesh</GivenName>
- <SurName>Gohil</SurName>
- <EmailAddress>mailto:support@stanmore.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rummage-dev.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/rummage-dev.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 4bbbbb46..00000000
--- a/swamid-interfederations-2.0/rummage-dev.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rummage-dev.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth SP for University of Newcastle upon Tyne
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC6DCCAdCgAwIBAgIJAPan4y/h6gl3MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
- BAMTC3J1bW1hZ2UtZGV2MB4XDTEzMDkwNjA5NTM0M1oXDTIzMDkwNDA5NTM0M1ow
- FjEUMBIGA1UEAxMLcnVtbWFnZS1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
- ggEKAoIBAQDbcX5iL15qAH4UekiBi2mz/j72IGMZGpTB+4IrOB4KjF2dZPoATrlg
- vVpvpFaSdo1NSJaYop4yE3M6IsJGIc9tY037gIVMl44kv6ovlXCiZqVzYE6PZRRK
- zaJHTiOGaUwZdAYKIj/+5JYSFYbiK1c1ub1oJ6SqGbdOllqLoEIaajTIHxXqaxQJ
- tXXGuP9OBEJpUAirYyURSp2CI6czUwqsn9K93FdXu2WDdFFfBoNjswUei/FhjB69
- Px36UOZuCj6LTqhMaxNo2/eck/4y1a8M9BIphHrv2ceh6uDiD7Ef+gHwd5IiGfks
- vBk4ccGNKFuAPdDVw2hW+FN7+Smyz94BAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3J1
- bW1hZ2UtZGV2MB0GA1UdDgQWBBTZK/nmmTkBFdJyoKBEk6qtM+l9LDANBgkqhkiG
- 9w0BAQUFAAOCAQEAZbsKj2iGf5XVAWXn32vG3OgUa54TWdGhGTeAOsgUlQ5Lx8CW
- 69cc4wBr97FyT6XeyfNqE5A0G+l+uTuOY3OUASmTJZDmi0bhIRx/kqneISp2fGMq
- v4b1X9pFraf4voR4J3GSzvhtW8tajKspil7WPtm6Zmv+GRzk+k4RjnfL+2Hp9aZP
- h5/9YSAomSaJ4/i+7qVXlt+getR5JqWE5q2S8ljS9fnQE6Ih+bCi08y+O5Ubix90
- tZqI7Evc8suaAUOmS0vKJtw9sroIufvn6Wy6qI66/kN2ACXamwZW049BtY85/oU4
- krqNQNbf3DGg5enu2swezwsEgXqi9A29IXxcKg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rummage-dev.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Newcastle upon Tyne: Development ResearchTools SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/safety.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/safety.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index d6c2b2f9..00000000
--- a/swamid-interfederations-2.0/safety.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://safety.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Safety Office Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-05T12:10:48Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://safety.ncl.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://safety.ncl.ac.uk/Shibboleth.sso/ncldur"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://safety.ncl.ac.uk/Shibboleth.sso/SPNEGO"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAP2gLdgHSWHTMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmRhbnRvb2luZS5jYW1wdXMubmNsLmFjLnVrMB4XDTEwMTIxMDE1MjMxMloX
- DTIwMTIwNzE1MjMxMlowJTEjMCEGA1UEAxMaZGFudG9vaW5lLmNhbXB1cy5uY2wu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC96j7lMubJp+aX
- DqwLGDzxcrm2bxvKU3WjWK91L5rD0P0HYle7yr2VcuXsChz7jyFrMNZ+tCUhfvlA
- gRuhiKjXC9PRDf18NRx43UhPlRnwrvjN5OFhOH1Mvq4QFkpnTtqPHQ5RM7T3+U0l
- /lacgZtzhmXiCbY9KLOF0Qc5iLjD+ISwErSd6N1ovhIyNsZ4/44Cquz0fcFyV1PN
- BIzj1toMubMqStVY98OnKCVIDccOsKeZW7RPevLP4T5uglP88hgiFhN5auJDWy2B
- fm/AA9pjD/u9BsAggdVfrAE0WvatR+a6cpxngNTFjht9UUoxBlUq844RFZBqXf/v
- xLmipJUlAgMBAAGjSDBGMCUGA1UdEQQeMByCGmRhbnRvb2luZS5jYW1wdXMubmNs
- LmFjLnVrMB0GA1UdDgQWBBTHyeqX+oU3dzZx3e1+nYbV7evjejANBgkqhkiG9w0B
- AQUFAAOCAQEAIzxIXH09GMjE+nIpbGIACTI9ERepMQMzNnO+M8JugkhEhrLWXWvu
- XoswtdvxBH3rKMKZp1tJIk7T1toLDn3vCvn60S/6AjzQbyYzQ+qfDBij7X7kBU71
- jlfFn8dFGGcYNdPkl2EjrtWQ/pOTJiJAqal0rPQTcqmrFmi3UeDw+gtncRDIBEGx
- JvjufLt4NSdyg7ZHLLjLv2ntSGPk4ZFLjw0ihpigI6LLzhNv3zxuH/x/y1pIyolC
- MQHLbJL5+WUpb/syt6lRETX5WxKuJHTirlgkjz1edzAPDZ8SIKD3O/TcnKXB/rpF
- HitJuYtcRIR/YxPrydq4GCsFy99FLz336A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://safety.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://safety.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://safety.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safety.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://safety.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://safety.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://safety.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safety.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://safety.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safety.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://safety.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://safety.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://safety.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://safety.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://safety.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Safety Office Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
deleted file mode 100644
index db7932d1..00000000
--- a/swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml-1.sys.kth.se/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kth.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Kungliga Tekniska Högskolan (KTH)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
- <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
- <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
- <mdui:Logo height="82" width="82">https://saml-1.sys.kth.se/logo-main.png</mdui:Logo>
- <mdui:Keywords xml:lang="sv">kth kungliga+tekniska+högskolan kungliga+tekniska+hogskolan royal+institute+of+technology stockholm</mdui:Keywords>
- <mdui:Keywords xml:lang="en">kth kungliga+tekniska+högskolan kungliga+tekniska+hogskolan royal+institute+of+technology stockholm</mdui:Keywords>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>kth.se</mdui:DomainHint>
- <mdui:IPHint>130.237.0.0/18</mdui:IPHint>
- <mdui:IPHint>130.237.64.0/20</mdui:IPHint>
- <mdui:IPHint>130.237.80.0/22</mdui:IPHint>
- <mdui:IPHint>130.237.84.0/24</mdui:IPHint>
- <mdui:IPHint>130.237.202.0/23</mdui:IPHint>
- <mdui:IPHint>130.237.206.0/24</mdui:IPHint>
- <mdui:IPHint>130.237.209.0/24</mdui:IPHint>
- <mdui:IPHint>130.237.210.0/23</mdui:IPHint>
- <mdui:IPHint>130.237.212.0/22</mdui:IPHint>
- <mdui:IPHint>130.237.216.0/24</mdui:IPHint>
- <mdui:IPHint>130.237.218.0/23</mdui:IPHint>
- <mdui:IPHint>130.237.220.0/22</mdui:IPHint>
- <mdui:IPHint>130.237.224.0/22</mdui:IPHint>
- <mdui:IPHint>130.237.228.0/22</mdui:IPHint>
- <mdui:IPHint>130.237.232.0/21</mdui:IPHint>
- <mdui:IPHint>130.237.249.0/24</mdui:IPHint>
- <mdui:IPHint>130.237.250.0/23</mdui:IPHint>
- <mdui:IPHint>130.237.255.0/24</mdui:IPHint>
- <mdui:IPHint>130.229.128.0/18</mdui:IPHint>
- <mdui:IPHint>193.10.37.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.38.0/24</mdui:IPHint>
- <mdui:IPHint>193.10.39.0/24</mdui:IPHint>
- <mdui:IPHint>2001:6b0:1::/48</mdui:IPHint>
- <mdui:GeolocationHint>geo:59.346123,18.072305</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVALx4XVtH3sOyM28YH834f5bbuHNlMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNhbWwtMS5zeXMua3RoLnNlMB4XDTEwMTExNzE1NTYz
-OFoXDTMwMTExNzE1NTYzOFowHDEaMBgGA1UEAxMRc2FtbC0xLnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDxtJdcAOVTCIq6UQlCpqm
-XbagnXzhINClFn/+XS3+KH0mb5HnLLugIQ12hH0SFfD7KgVh3mRwBZsbs0Q8QJoZ
-YkOfTii/I5Buvw6l4N36m58VLZGv2W0fFAQLMk2IeRqHd32wGyaVro0DojCKj+Wi
-C7pyHkMRQdofNNgS5tV6/Ls/FJUhK4P45u2MYQwGZR00u84ngQaQ+uw1xEoLGbpt
-H1Ic0ZqGH/7E6EhRs82taWCHUBy/qbFNuTsXKzRDQDAvnKvtosrpBfFqZ3wvJdIW
-4Q63jUFk9d84+h5xWe1rJD46MXUti55PYWPzzweIeXUE0vpPnlCWt2C5BzOFqeCt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMS5zeXMua3RoLnNlhihodHRwczov
-L3NhbWwtMS5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSHF1tH
-0Si0nenf53KeBzfw0JFKMTANBgkqhkiG9w0BAQUFAAOCAQEAfMDHG/jm+HsQo2t6
-if67Cs0iX2d0kridHeHE02BzAUTKSFQ0ywA+jXlJRmYnRXQqnl8qh1V4Qw6PmHKJ
-Im5rjNRUA72a9Vo42QBPXVy8UJOxTHMQhK6aFG0UXTofo5lzroz39YqaNGo6k5zx
-oBDagUCJ+Mfu4tOQ+j2ZbP1syTgCroX0XsRsdU/KXEdmPtQBAdEgWB0siCI31sOc
-JWNDZOy2Zm1yPdryCtJD56IwYEXRi9ACLDUYteoqypxq+Cjp4gkJNe+fsvyCjuCf
-jLJfoU/KdGJJcfuMirPEC2mfSdMWK3XDCvaxKU9Or2ZV6FjitQDPt9V2n/qNe5mu
-sdhdXg==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml-1.sys.kth.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-1.sys.kth.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-1.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-1.sys.kth.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kth.se</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVALx4XVtH3sOyM28YH834f5bbuHNlMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNhbWwtMS5zeXMua3RoLnNlMB4XDTEwMTExNzE1NTYz
-OFoXDTMwMTExNzE1NTYzOFowHDEaMBgGA1UEAxMRc2FtbC0xLnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDxtJdcAOVTCIq6UQlCpqm
-XbagnXzhINClFn/+XS3+KH0mb5HnLLugIQ12hH0SFfD7KgVh3mRwBZsbs0Q8QJoZ
-YkOfTii/I5Buvw6l4N36m58VLZGv2W0fFAQLMk2IeRqHd32wGyaVro0DojCKj+Wi
-C7pyHkMRQdofNNgS5tV6/Ls/FJUhK4P45u2MYQwGZR00u84ngQaQ+uw1xEoLGbpt
-H1Ic0ZqGH/7E6EhRs82taWCHUBy/qbFNuTsXKzRDQDAvnKvtosrpBfFqZ3wvJdIW
-4Q63jUFk9d84+h5xWe1rJD46MXUti55PYWPzzweIeXUE0vpPnlCWt2C5BzOFqeCt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMS5zeXMua3RoLnNlhihodHRwczov
-L3NhbWwtMS5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSHF1tH
-0Si0nenf53KeBzfw0JFKMTANBgkqhkiG9w0BAQUFAAOCAQEAfMDHG/jm+HsQo2t6
-if67Cs0iX2d0kridHeHE02BzAUTKSFQ0ywA+jXlJRmYnRXQqnl8qh1V4Qw6PmHKJ
-Im5rjNRUA72a9Vo42QBPXVy8UJOxTHMQhK6aFG0UXTofo5lzroz39YqaNGo6k5zx
-oBDagUCJ+Mfu4tOQ+j2ZbP1syTgCroX0XsRsdU/KXEdmPtQBAdEgWB0siCI31sOc
-JWNDZOy2Zm1yPdryCtJD56IwYEXRi9ACLDUYteoqypxq+Cjp4gkJNe+fsvyCjuCf
-jLJfoU/KdGJJcfuMirPEC2mfSdMWK3XDCvaxKU9Or2ZV6FjitQDPt9V2n/qNe5mu
-sdhdXg==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
- <OrganizationName xml:lang="en">KTH</OrganizationName>
- <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska Högskolan</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
- <Company>KTH Royal Institute of Technology</Company>
- <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
- <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
- <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
- <Company>KTH Royal Institute of Technology</Company>
- <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
- <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
- <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
- <Company>KTH Royal Institute of Technology</Company>
- <SurName>KTH IT-Support</SurName>
- <EmailAddress>it-support@kth.se</EmailAddress>
- <TelephoneNumber>+46 8 790 6600</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scitationnew.aip.org-shibboleth.xml b/swamid-interfederations-2.0/scitationnew.aip.org-shibboleth.xml
deleted file mode 100644
index 250cf450..00000000
--- a/swamid-interfederations-2.0/scitationnew.aip.org-shibboleth.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://scitationnew.aip.org/shibboleth">
- <!--
- This is a "Scitation" OpenAthens SP for Publishing Technology plc.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-01T14:14:07Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDnDCCAoSgAwIBAgIEUdvRkTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
- R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
- BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
- bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDcwOTA5
- MDIwOVoXDTE2MDcwODA5MDIwOVowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
- eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
- IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
- FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
- AQoCggEBAIqfzThQ2R8sCWiSeU7PeibXuB31/Ey51i4rdZwIcTeNRRcDxH5PYjLD
- NjSwarBEIgTyFxmByOrkAZzaExBpdGtNrDo7b6fyI7966gCDEYO4Sh1ZKZxWQsbu
- zQwQjovDrlqUnGa3z/h2UfilQY8wtc/2wF1/rZbqRnqMjVCwJsaFyo2OlwUh2xWu
- gPL2usYYVkBr0qdYfjs3zxy7U+dWN1oYu3Ing9GUx7ueT/9nWUQX+4TzSCjzGb3Z
- xRrjkEwUrRu6KXuaMVqrZbAzQboEh4HVXp7VKJijCG0gisXdcEMqBblsCtthRYkw
- 7V59Q/K8owmELbi0vaii1t0c0GQg3GMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
- hiHnQS4R1ji95KCr9u+67dPdC9qTwFpo8/znSwFAC6aGbMX68swzifkIqDbgSAOY
- NPGZCyRV4wz2gpBnVXOm9wVJvdGylmrk8dfakKwzljTKEm2+Xqq6CHD3QSQpjRrG
- X7eKZgK+HyDDiVmFAenAzSkAHazV0I0wWOFnZp5lgrU66YggtaZMHk19Nf4ZXJuD
- dYsGoaLN6fCVEuPStNGZ32wu4CH6sUWhi2OhlJl+rF/Z7zBFpydwMFSfd+DFUUlg
- GOvb1z0peq8ppMqO8yvvnURF4k8T2Lzt8COgRkumpQztylohokSI0GrtCbsntZn8
- Q0pEiZ1n5ClvAkHcGhpYog==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://scitationnew.aip.org/session/shib" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://scitationnew.aip.org/session/shib" index="2"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Scitation</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://scitation.aip.org/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Service</GivenName>
- <EmailAddress>mailto:service@asmusa.org</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Talvinder</GivenName>
- <SurName>Matharu</SurName>
- <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-test.cup.cam.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/shib-test.cup.cam.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index a0026d74..00000000
--- a/swamid-interfederations-2.0/shib-test.cup.cam.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-test.cup.cam.ac.uk/shibboleth-sp">
- <!--
- This is a "Cambridge University Press" Test Shibboleth SP for the University of Cambridge.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDOzCCAiOgAwIBAgIJAO1ec6PhCf+bMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF3NoaWItdGVzdC5jdXAuY2FtLmFjLnVrMB4XDTEzMDEzMDAyMzQwMVoXDTE2
- MDEzMTAyMzQwMVowIjEgMB4GA1UEAxMXc2hpYi10ZXN0LmN1cC5jYW0uYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxW01OGcdUphtACtaNyHCZ
- Er9sAk2s5R+AEUIgmZfD1gCQPrO92L25hqQgdeEXfmC4NV6PNoUGeLUCC09vsnYS
- /IgNwNKNb3wvGd05LG0BzzwCB4sawJT8OR3kFci7q9RekhVsWdB4GDX26w8XO8hB
- e5Nhv3qjhjudsVRIqmUn+NT9wH8UO4KKneM8TmYKT5Avtel0qlR+4YVjIMqrjN6m
- aPcHBqJFtzZcaZnr2zJpYxA3Dc9KSLGnkJe/AxqmG8p97IdRPK6ZVL4KsEwW0X22
- EVHu4FsyKflbaVGgBU3AF9NDV2qpk1tKCelSEw1REHsdX5P0vIwy+Tl1Nl8RR7nV
- AgMBAAGjdDByMFEGA1UdEQRKMEiCF3NoaWItdGVzdC5jdXAuY2FtLmFjLnVrhi1o
- dHRwczovL3NoaWItdGVzdC5jdXAuY2FtLmFjLnVrL3NoaWJib2xldGgtc3AwHQYD
- VR0OBBYEFG9b+M3wbCKgtExmiWhfUBSrrIG1MA0GCSqGSIb3DQEBBQUAA4IBAQAX
- Bp/uPl6n3aZoBiIFdwGCROa3U27Kx+YRfjOtRMKa+kX+r6SBaBy/1CWTklnB9ymy
- S5oCSx3nv/bzigdevxyDqg8AHhMT2/kk0gR5bV0Ax6rYg5qc+lIvQhtqq+AEb6LT
- Z3xHi/z+v8zS/NbVIVwK4WFjH+F4nzUK1Thi7Dv67cETra7Ax2bIaQD1jqoFh2nH
- ee/wbHDHDbuyTU81kcgRYRozLin4n1FihdSQWXwrX/y2PkLPHd0gl32is0JSJs7m
- aZasR1LS/PR4OC9pFQK6yjdoAhVL/F8i4qmfcoaIs4R/cu8maNSCOcjNuKWpHTYT
- dwqXeguTx+yDKMNal01s
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDOzCCAiOgAwIBAgIJAO1ec6PhCf+bMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF3NoaWItdGVzdC5jdXAuY2FtLmFjLnVrMB4XDTEzMDEzMDAyMzQwMVoXDTE2
- MDEzMTAyMzQwMVowIjEgMB4GA1UEAxMXc2hpYi10ZXN0LmN1cC5jYW0uYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxW01OGcdUphtACtaNyHCZ
- Er9sAk2s5R+AEUIgmZfD1gCQPrO92L25hqQgdeEXfmC4NV6PNoUGeLUCC09vsnYS
- /IgNwNKNb3wvGd05LG0BzzwCB4sawJT8OR3kFci7q9RekhVsWdB4GDX26w8XO8hB
- e5Nhv3qjhjudsVRIqmUn+NT9wH8UO4KKneM8TmYKT5Avtel0qlR+4YVjIMqrjN6m
- aPcHBqJFtzZcaZnr2zJpYxA3Dc9KSLGnkJe/AxqmG8p97IdRPK6ZVL4KsEwW0X22
- EVHu4FsyKflbaVGgBU3AF9NDV2qpk1tKCelSEw1REHsdX5P0vIwy+Tl1Nl8RR7nV
- AgMBAAGjdDByMFEGA1UdEQRKMEiCF3NoaWItdGVzdC5jdXAuY2FtLmFjLnVrhi1o
- dHRwczovL3NoaWItdGVzdC5jdXAuY2FtLmFjLnVrL3NoaWJib2xldGgtc3AwHQYD
- VR0OBBYEFG9b+M3wbCKgtExmiWhfUBSrrIG1MA0GCSqGSIb3DQEBBQUAA4IBAQAX
- Bp/uPl6n3aZoBiIFdwGCROa3U27Kx+YRfjOtRMKa+kX+r6SBaBy/1CWTklnB9ymy
- S5oCSx3nv/bzigdevxyDqg8AHhMT2/kk0gR5bV0Ax6rYg5qc+lIvQhtqq+AEb6LT
- Z3xHi/z+v8zS/NbVIVwK4WFjH+F4nzUK1Thi7Dv67cETra7Ax2bIaQD1jqoFh2nH
- ee/wbHDHDbuyTU81kcgRYRozLin4n1FihdSQWXwrX/y2PkLPHd0gl32is0JSJs7m
- aZasR1LS/PR4OC9pFQK6yjdoAhVL/F8i4qmfcoaIs4R/cu8maNSCOcjNuKWpHTYT
- dwqXeguTx+yDKMNal01s
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-test.cup.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Cambridge University Press test service provider</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.cambridge.org/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Godofredo</GivenName>
- <SurName>Avena</SurName>
- <EmailAddress>mailto:gavena@cambridge.org</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Godofredo</GivenName>
- <SurName>Avena</SurName>
- <EmailAddress>mailto:gavena@cambridge.org</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Jarvy</GivenName>
- <SurName>Alvarez</SurName>
- <EmailAddress>mailto:jalvarez@cambridge.org</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.fusiondev.co.uk-sp-shibboleth.xml b/swamid-interfederations-2.0/shib.fusiondev.co.uk-sp-shibboleth.xml
deleted file mode 100644
index 6f94ef0e..00000000
--- a/swamid-interfederations-2.0/shib.fusiondev.co.uk-sp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.fusiondev.co.uk/sp/shibboleth">
- <!--
- This is a Shibboleth 2 SP for Cardiff University.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDAzCCAeugAwIBAgIJALnrilHsvjTrMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFGNvc3NhY2suZnVzaW9uLmNvLnVrMB4XDTEwMDExNDA5MjcxOVoXDTIwMDEx
- MjA5MjcxOVowHzEdMBsGA1UEAxMUY29zc2Fjay5mdXNpb24uY28udWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDO34Wr48RixKc338aT/vcau0mu9mVI
- 9JMcPwzSZArGrdW2XyDg4JWhA1MvtR7orqzlYakx3q4zYTAyOtrr6sgAkVMgc+tB
- 2E6cQs7Dcw+AswRy5wBbAdg4J5JDI1BL3i+AwLNo9HwkhNtnahc3JYKqv34Zn6mG
- MPT2Zj9h4xsI9RZ960twBaJJUnJ7ahL0ik1G+9S2I9ARXmJ5VLsLkSPdkGDytNY3
- NcrBqC53f/6EAiAeI9hihCbUUGF9fxrniUq46Cx5W1kdsEQi3wjyJk7jdyOTS/WD
- yPskDImCWkYn3SMhoLFAoRsgSZbBCm4HYpPwe0bLDLr2uPz4uRyJ7m3BAgMBAAGj
- QjBAMB8GA1UdEQQYMBaCFGNvc3NhY2suZnVzaW9uLmNvLnVrMB0GA1UdDgQWBBSN
- TA3Q466kMtTN81a/jHuM2/ZJpjANBgkqhkiG9w0BAQUFAAOCAQEASQQBwA4y/I+e
- pPahdSftLFulON+M5jHUDx7zOFLrwO6xY73+iTQMI1YfvKj9K+RxYqtWissuMCjR
- WdhVFnyMM6dgSxLTxmesQyiG9Mw1HuAc9Ly1d8WCNBYBjUCd6cG6vJtut/7hmlBf
- /hxvpMR0M6au7EJ+qaxh2q52V2W54fnAtvZbw4M4Ysim9+eASAFk2PUWFd3MiYhJ
- SdXdr7TM89qYLh8+R+OCFLlSX9b3q7OahvXynmQO31bKGxsRysBk4Y7SNdOJwVZa
- Wg0fp++YHXnfruREM/4wojbM/JR/E4VOml/cwYgr11gbvNvQjU89oV+xztOLac6Y
- jsUC17MwDA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDAzCCAeugAwIBAgIJALnrilHsvjTrMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFGNvc3NhY2suZnVzaW9uLmNvLnVrMB4XDTEwMDExNDA5MjcxOVoXDTIwMDEx
- MjA5MjcxOVowHzEdMBsGA1UEAxMUY29zc2Fjay5mdXNpb24uY28udWswggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDO34Wr48RixKc338aT/vcau0mu9mVI
- 9JMcPwzSZArGrdW2XyDg4JWhA1MvtR7orqzlYakx3q4zYTAyOtrr6sgAkVMgc+tB
- 2E6cQs7Dcw+AswRy5wBbAdg4J5JDI1BL3i+AwLNo9HwkhNtnahc3JYKqv34Zn6mG
- MPT2Zj9h4xsI9RZ960twBaJJUnJ7ahL0ik1G+9S2I9ARXmJ5VLsLkSPdkGDytNY3
- NcrBqC53f/6EAiAeI9hihCbUUGF9fxrniUq46Cx5W1kdsEQi3wjyJk7jdyOTS/WD
- yPskDImCWkYn3SMhoLFAoRsgSZbBCm4HYpPwe0bLDLr2uPz4uRyJ7m3BAgMBAAGj
- QjBAMB8GA1UdEQQYMBaCFGNvc3NhY2suZnVzaW9uLmNvLnVrMB0GA1UdDgQWBBSN
- TA3Q466kMtTN81a/jHuM2/ZJpjANBgkqhkiG9w0BAQUFAAOCAQEASQQBwA4y/I+e
- pPahdSftLFulON+M5jHUDx7zOFLrwO6xY73+iTQMI1YfvKj9K+RxYqtWissuMCjR
- WdhVFnyMM6dgSxLTxmesQyiG9Mw1HuAc9Ly1d8WCNBYBjUCd6cG6vJtut/7hmlBf
- /hxvpMR0M6au7EJ+qaxh2q52V2W54fnAtvZbw4M4Ysim9+eASAFk2PUWFd3MiYhJ
- SdXdr7TM89qYLh8+R+OCFLlSX9b3q7OahvXynmQO31bKGxsRysBk4Y7SNdOJwVZa
- Wg0fp++YHXnfruREM/4wojbM/JR/E4VOml/cwYgr11gbvNvQjU89oV+xztOLac6Y
- jsUC17MwDA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.fusiondev.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Cardiff University: Procureweb Development Gateway</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.procureweb.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Joseph</GivenName>
- <SurName>Wells</SurName>
- <EmailAddress>mailto:WellsJ3@cardiff.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rhys</GivenName>
- <SurName>Smith</SurName>
- <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml
index 2764aed6..dad580bf 100644
--- a/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml
@@ -4,6 +4,11 @@
This is a Shibboleth test IdP for the University of Liverpool.
-->
<Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T11:14:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/signage.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/signage.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index c52ec8d3..00000000
--- a/swamid-interfederations-2.0/signage.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signage.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an "Internal Signage" Shibboleth SP for University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-30T09:50:43Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://signage.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC1jCCAb6gAwIBAgIJAIvVFGx9xCvvMA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
- BAMTBWNtZGV2MB4XDTE0MDEzMDA5MDAyMVoXDTI0MDEyODA5MDAyMVowEDEOMAwG
- A1UEAxMFY21kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw7Foa
- eJoBbTfXdi33RAHKYl9aT1U6UFfVKrGM8Ja6yC5i6pbPK4ay0lkXIoYhJCCyYgcn
- OppBJuULd1fCrcgsQJzq1N3EWOJ9ItvuosGj7R6kt3RJAqBimf9dk11lV9aPKd+h
- HqTSKrC9lkjR2y3cfP25ei3VEKKbWRyGE8A1eNf0aVQCQP4OhOJIVyV6xWiYsFHI
- sRMEA93VQuD8I9f2VljwH6nTA3g4JoVWeQDu/2gbkgg8w1ToTO1p8+8ScV0H0Xri
- X+/oQnlIjeDQEr4RAJWoTiEJhvpRajadBQwEtjZfnAWNcvoMXSgAEWMu9ogEJxxf
- iwiWf+kQ17J7kNk5AgMBAAGjMzAxMBAGA1UdEQQJMAeCBWNtZGV2MB0GA1UdDgQW
- BBRjNsH8GclsEbMVU1LaLx+7PIqjAzANBgkqhkiG9w0BAQUFAAOCAQEAIQwFE2Ft
- FSS8FQW8GAZ1u7huC6LpIwaUYzNhkbaS9ZVUaF4uSuScpdz+fe/sWXSfXl1F1Da6
- b6Dpmf4WnTDMu72nZubn7zRtv/rdZ1IJ33DHF1RfG23ySp/T3bMXNHE7SkM5x8e7
- vhWQMS4fKpw7uGNfCPx/HXeVgu9dk7ZzXnltjwH4RJwOcg7KmBRBZR2ovp5zD/RT
- BTq5vajfxqNe1tZfnN3oRd/amSFx3g7JRm6IdiOFTEyh3AknPz+/7vRsEds3ga1y
- LbOJcgykgojwPVSWzO9Bk6u9/kavq8naNxay/ZCYAxJ+nBkwK1UX2vpO7u/nF0ht
- yvVs/NRCUT1wxQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signage.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signage.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signage.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signage.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://signage.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signage.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://signage.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://signage.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://signage.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signage.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://signage.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Internal Signage Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-idp-simplesamlphp.xml b/swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-idp-simplesamlphp.xml
deleted file mode 100644
index d8f2c2a4..00000000
--- a/swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-idp-simplesamlphp.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://simplesamlphp-dev.cf.ac.uk/idp/simplesamlphp">
- <!--
- This is a development simpleSAMLphp IdP for Cardiff University.
- -->
- <Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEnjCCA4agAwIBAgIJAM8N1T2uybrgMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
- VQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxGzAZBgNV
- BAoTEkNhcmRpZmYgVW5pdmVyc2l0eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2Vy
- dmljZXMxIzAhBgNVBAMTGnNpbXBsZXNhbWxwaHAtZGV2LmNmLmFjLnVrMB4XDTEw
- MDkzMDEyMTQ1MloXDTIwMDkyNzEyMTQ1MlowgZAxCzAJBgNVBAYTAkdCMQ4wDAYD
- VQQIEwVXYWxlczEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UEChMSQ2FyZGlmZiBV
- bml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEjMCEGA1UE
- AxMac2ltcGxlc2FtbHBocC1kZXYuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
- A4IBDwAwggEKAoIBAQC7FqickAesyb1d3o+3hGK42XWfcJTlzJmr1A6s2t8qUYxL
- Th4VjR9QkKK8hO6d8i3nGx0klu/w820tT6nkB7zVrzUt/t7axKW/KsBIjIzXpwqG
- Tc4xt+RiGZ5ChtPw7nl2ZdTX5caA2i8xKwNk2NWkOzpnlHoDGhGu5nBs1mVGc3NT
- kvsDIVh6XrSYvLbKnrjrT1uo6uKHkysO84qTjRHseIV3PaJzBaTi2B64N8iA/jyH
- 6/dA/8vJOaTxiB3O4XQhN62U0nZNSfXMTum3sLZF6wD5gi1eePfyR5CnvQ/jbCi5
- IUsr5tiSMqvURYWIEXYJX5Miwo1TKKpbIhMzadv1AgMBAAGjgfgwgfUwHQYDVR0O
- BBYEFGXSweXQPGsE6axzqT9hUNWUICJIMIHFBgNVHSMEgb0wgbqAFGXSweXQPGsE
- 6axzqT9hUNWUICJIoYGWpIGTMIGQMQswCQYDVQQGEwJHQjEOMAwGA1UECBMFV2Fs
- ZXMxEDAOBgNVBAcTB0NhcmRpZmYxGzAZBgNVBAoTEkNhcmRpZmYgVW5pdmVyc2l0
- eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxIzAhBgNVBAMTGnNpbXBs
- ZXNhbWxwaHAtZGV2LmNmLmFjLnVrggkAzw3VPa7JuuAwDAYDVR0TBAUwAwEB/zAN
- BgkqhkiG9w0BAQUFAAOCAQEAZUNyWIdLz0755cOkgT9EBY3Ruh2j/qbpbH/AEMjj
- uPxk957HnYuuYCL2gj5aKiUtsA5Mmw5czlPt/CNZE1jOwwF/fA1F6VuG++tSsPdM
- I9ZhPmiyffja5a03KbOQ1xaYaUZ89zMPtj1t8Tj9yIXKAohGeREmjxk5dSe5wGaf
- wZSMYLUjTvi5cwQAiltDkcncTcvOp8befMv9PPQH/QzrSP0gRkQv2m4OngxI961X
- M+FzpAGw1iu5mPjDNoTATmI8hxYMYVZXPEKnNW6/R3IBCzYFRhstvYlB/MBJ5fbu
- keNhYHmJh+FyuRZvl5Hw13qk/uCV84N2XLReaA1EkItzmQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEnjCCA4agAwIBAgIJAM8N1T2uybrgMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
- VQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxGzAZBgNV
- BAoTEkNhcmRpZmYgVW5pdmVyc2l0eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2Vy
- dmljZXMxIzAhBgNVBAMTGnNpbXBsZXNhbWxwaHAtZGV2LmNmLmFjLnVrMB4XDTEw
- MDkzMDEyMTQ1MloXDTIwMDkyNzEyMTQ1MlowgZAxCzAJBgNVBAYTAkdCMQ4wDAYD
- VQQIEwVXYWxlczEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UEChMSQ2FyZGlmZiBV
- bml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEjMCEGA1UE
- AxMac2ltcGxlc2FtbHBocC1kZXYuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
- A4IBDwAwggEKAoIBAQC7FqickAesyb1d3o+3hGK42XWfcJTlzJmr1A6s2t8qUYxL
- Th4VjR9QkKK8hO6d8i3nGx0klu/w820tT6nkB7zVrzUt/t7axKW/KsBIjIzXpwqG
- Tc4xt+RiGZ5ChtPw7nl2ZdTX5caA2i8xKwNk2NWkOzpnlHoDGhGu5nBs1mVGc3NT
- kvsDIVh6XrSYvLbKnrjrT1uo6uKHkysO84qTjRHseIV3PaJzBaTi2B64N8iA/jyH
- 6/dA/8vJOaTxiB3O4XQhN62U0nZNSfXMTum3sLZF6wD5gi1eePfyR5CnvQ/jbCi5
- IUsr5tiSMqvURYWIEXYJX5Miwo1TKKpbIhMzadv1AgMBAAGjgfgwgfUwHQYDVR0O
- BBYEFGXSweXQPGsE6axzqT9hUNWUICJIMIHFBgNVHSMEgb0wgbqAFGXSweXQPGsE
- 6axzqT9hUNWUICJIoYGWpIGTMIGQMQswCQYDVQQGEwJHQjEOMAwGA1UECBMFV2Fs
- ZXMxEDAOBgNVBAcTB0NhcmRpZmYxGzAZBgNVBAoTEkNhcmRpZmYgVW5pdmVyc2l0
- eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxIzAhBgNVBAMTGnNpbXBs
- ZXNhbWxwaHAtZGV2LmNmLmFjLnVrggkAzw3VPa7JuuAwDAYDVR0TBAUwAwEB/zAN
- BgkqhkiG9w0BAQUFAAOCAQEAZUNyWIdLz0755cOkgT9EBY3Ruh2j/qbpbH/AEMjj
- uPxk957HnYuuYCL2gj5aKiUtsA5Mmw5czlPt/CNZE1jOwwF/fA1F6VuG++tSsPdM
- I9ZhPmiyffja5a03KbOQ1xaYaUZ89zMPtj1t8Tj9yIXKAohGeREmjxk5dSe5wGaf
- wZSMYLUjTvi5cwQAiltDkcncTcvOp8befMv9PPQH/QzrSP0gRkQv2m4OngxI961X
- M+FzpAGw1iu5mPjDNoTATmI8hxYMYVZXPEKnNW6/R3IBCzYFRhstvYlB/MBJ5fbu
- keNhYHmJh+FyuRZvl5Hw13qk/uCV84N2XLReaA1EkItzmQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://simplesamlphp-dev.cf.ac.uk/simplesaml/saml2/idp/SingleLogoutService.php"/>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://simplesamlphp-dev.cf.ac.uk/simplesaml/saml2/idp/SSOService.php"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Cardiff University (Test - Dev SSP)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://iam.cardiff.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Rhys</GivenName>
- <SurName>Smith</SurName>
- <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rhys</GivenName>
- <SurName>Smith</SurName>
- <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-simplesamlphp-sp.xml b/swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-simplesamlphp-sp.xml
deleted file mode 100644
index 6043e3fe..00000000
--- a/swamid-interfederations-2.0/simplesamlphp-dev.cf.ac.uk-simplesamlphp-sp.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://simplesamlphp-dev.cf.ac.uk/simplesamlphp-sp">
- <!--
- This is a simpleSAMLphp SP for Cardiff University.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEnjCCA4agAwIBAgIJAKIkrx4gPfn7MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
- VQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxGzAZBgNV
- BAoTEkNhcmRpZmYgVW5pdmVyc2l0eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2Vy
- dmljZXMxIzAhBgNVBAMTGnNpbXBsZXNhbWxwaHAtZGV2LmNmLmFjLnVrMB4XDTEw
- MDkzMDEyMTQzMVoXDTIwMDkyNzEyMTQzMVowgZAxCzAJBgNVBAYTAkdCMQ4wDAYD
- VQQIEwVXYWxlczEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UEChMSQ2FyZGlmZiBV
- bml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEjMCEGA1UE
- AxMac2ltcGxlc2FtbHBocC1kZXYuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
- A4IBDwAwggEKAoIBAQDMf8Owbg5C327iqDyjZT4pUxT1wIxmX3iow6ijEE+aayD7
- +PYykaC5ULMPjmeByRYMNTYEjwdnuq7+BkT2Yf8zQf8w/vVwDHjsw4KLCThhCGP5
- mQQnq2dutVLdq2tLH+W2sPKUiam8nIFBAIEKFiHUDkgKZgMfOgRUZm8aABSw3/tE
- qKwHzBeO8jhOlJDRTrkRZnf4rd/m+Fm6HdIuM9FsU3N0hpnOja5YkQA6585vr0e4
- 0VumN+gs0o8lHpEYH1l6kOuncybQHm+zd8mG24g8CGVn3aHp9HiSA9/c1bl9A+Gj
- 9uAuTG48xthY/x04bN6s3YtpiX4kLctVmQErs0DjAgMBAAGjgfgwgfUwHQYDVR0O
- BBYEFBClxYa2s0VRyXZ6kIbRuoRyRhxYMIHFBgNVHSMEgb0wgbqAFBClxYa2s0VR
- yXZ6kIbRuoRyRhxYoYGWpIGTMIGQMQswCQYDVQQGEwJHQjEOMAwGA1UECBMFV2Fs
- ZXMxEDAOBgNVBAcTB0NhcmRpZmYxGzAZBgNVBAoTEkNhcmRpZmYgVW5pdmVyc2l0
- eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxIzAhBgNVBAMTGnNpbXBs
- ZXNhbWxwaHAtZGV2LmNmLmFjLnVrggkAoiSvHiA9+fswDAYDVR0TBAUwAwEB/zAN
- BgkqhkiG9w0BAQUFAAOCAQEAN7xqn/bDzojMTLv0wF7k85CYGQgKWswPBY+vlBLt
- fe/v84bfWvn+Rw6vl8KUrsOsFiIAjYt44xlgbQ87pyafEN46qG5rpotemLX57N23
- SjIZsSdD24ao342DFoUwNS29YAVcfvLfqIsy3oyEvgF2riT7mif5rJ5xvbhHcQKZ
- 1WCtx2kFp/T9j0mCqdoPxPr+0JWTBJAPjRYhNs1bsOYqwt8BB+vZ21z4z0Zsf0i2
- s3Uxx8FtidCZQok9Ot0/2NgeWIsTC1m1YPmF3NMTNuiSoq+/hGryh/J3a72Vx+un
- wh0vlgC8uZ7a1bHAHbG76Ydoo2bT1/dfJ3L3uRWVOoy7Eg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEnjCCA4agAwIBAgIJAKIkrx4gPfn7MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
- VQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxGzAZBgNV
- BAoTEkNhcmRpZmYgVW5pdmVyc2l0eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2Vy
- dmljZXMxIzAhBgNVBAMTGnNpbXBsZXNhbWxwaHAtZGV2LmNmLmFjLnVrMB4XDTEw
- MDkzMDEyMTQzMVoXDTIwMDkyNzEyMTQzMVowgZAxCzAJBgNVBAYTAkdCMQ4wDAYD
- VQQIEwVXYWxlczEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UEChMSQ2FyZGlmZiBV
- bml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEjMCEGA1UE
- AxMac2ltcGxlc2FtbHBocC1kZXYuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
- A4IBDwAwggEKAoIBAQDMf8Owbg5C327iqDyjZT4pUxT1wIxmX3iow6ijEE+aayD7
- +PYykaC5ULMPjmeByRYMNTYEjwdnuq7+BkT2Yf8zQf8w/vVwDHjsw4KLCThhCGP5
- mQQnq2dutVLdq2tLH+W2sPKUiam8nIFBAIEKFiHUDkgKZgMfOgRUZm8aABSw3/tE
- qKwHzBeO8jhOlJDRTrkRZnf4rd/m+Fm6HdIuM9FsU3N0hpnOja5YkQA6585vr0e4
- 0VumN+gs0o8lHpEYH1l6kOuncybQHm+zd8mG24g8CGVn3aHp9HiSA9/c1bl9A+Gj
- 9uAuTG48xthY/x04bN6s3YtpiX4kLctVmQErs0DjAgMBAAGjgfgwgfUwHQYDVR0O
- BBYEFBClxYa2s0VRyXZ6kIbRuoRyRhxYMIHFBgNVHSMEgb0wgbqAFBClxYa2s0VR
- yXZ6kIbRuoRyRhxYoYGWpIGTMIGQMQswCQYDVQQGEwJHQjEOMAwGA1UECBMFV2Fs
- ZXMxEDAOBgNVBAcTB0NhcmRpZmYxGzAZBgNVBAoTEkNhcmRpZmYgVW5pdmVyc2l0
- eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxIzAhBgNVBAMTGnNpbXBs
- ZXNhbWxwaHAtZGV2LmNmLmFjLnVrggkAoiSvHiA9+fswDAYDVR0TBAUwAwEB/zAN
- BgkqhkiG9w0BAQUFAAOCAQEAN7xqn/bDzojMTLv0wF7k85CYGQgKWswPBY+vlBLt
- fe/v84bfWvn+Rw6vl8KUrsOsFiIAjYt44xlgbQ87pyafEN46qG5rpotemLX57N23
- SjIZsSdD24ao342DFoUwNS29YAVcfvLfqIsy3oyEvgF2riT7mif5rJ5xvbhHcQKZ
- 1WCtx2kFp/T9j0mCqdoPxPr+0JWTBJAPjRYhNs1bsOYqwt8BB+vZ21z4z0Zsf0i2
- s3Uxx8FtidCZQok9Ot0/2NgeWIsTC1m1YPmF3NMTNuiSoq+/hGryh/J3a72Vx+un
- wh0vlgC8uZ7a1bHAHbG76Ydoo2bT1/dfJ3L3uRWVOoy7Eg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://simplesamlphp-dev.cf.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://simplesamlphp-dev.cf.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://simplesamlphp-dev.cf.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://simplesamlphp-dev.cf.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://simplesamlphp-dev.cf.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Cardiff University: Development simpleSAMLphp Service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://iam.cardiff.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Rhys</GivenName>
- <SurName>Smith</SurName>
- <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Rhys</GivenName>
- <SurName>Smith</SurName>
- <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/smartam-login.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/smartam-login.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index bf765102..00000000
--- a/swamid-interfederations-2.0/smartam-login.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://smartam-login.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a SMART Project Server JBOSS PicketLink SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-22T13:08:28Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDVzCCAj+gAwIBAgIJALREyIa2ytSFMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNV
- BAYTAlVLMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg
- Q29tcGFueSBMdGQwHhcNMTIwODEzMTQwMjI5WhcNMjIwODExMTQwMjI5WjBCMQsw
- CQYDVQQGEwJVSzEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MRwwGgYDVQQKDBNEZWZh
- dWx0IENvbXBhbnkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 0PWeoS7obIlM2vwNhPRCrf2UFnndZCRELda+vxGSiaJtae3l0swggfxKEqaWUfPc
- YGffyQ3vZMySBwTewIsR30JeFy6tOIsgo2ImRd7Ye4uLiHwaKJ8a3deGD8qR/M9e
- 2uOtgFHs94hyenosJMDYpK+o1CVpuGaa/X8VLd+PrJX/85a72cU5xAONROy46U2V
- 3+f+YpX6ubXty4sx6wRp7oIqK+hGq5JTBjmDvkQ5mHVAOPqE4fTO7UAKtiYlz6Ss
- R/1lBrdvjhmnw+O/q3zoEixKtEIUp98+vWg1ONU4ppXbX1+jxiBz+1Zy1Xpph0jC
- 4liVzrcXcquzMjaRBEX90wIDAQABo1AwTjAdBgNVHQ4EFgQUbnSWVvCHIkkjMS+z
- YClo084gL3AwHwYDVR0jBBgwFoAUbnSWVvCHIkkjMS+zYClo084gL3AwDAYDVR0T
- BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAT8MF6Nhqbk+NRpRiM/LZVuU279+S
- izV8aNjJVUOftezLTxNLIgmJVlHb4e/Pd07DI4kqd/HlbzfEYvT7Ta/vi+3mA6Kj
- NousxeCm+HkwEyB4DMmolrVA+on9t0EbEgTyKyUBLRv1UwVz6x/W5bELQs+ZV3hS
- g/7/3XdXt3AR4esQm1y3uGhtUKVF6wf5kUJ9se4d2lR07AK50wnhOqYTcpk61hx6
- EHgolZyOHIgiUGOWI6v1Ui5a3VGjS7zNZFhs4XOk6RfnXDo2owk88kN0AH2iWXXS
- DnOotlwqKjiDV5j3iUgYW+pL0i1il85fPKqCdtkcJ34YbIAH9yAJMKPBYw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smartam-login.ncl.ac.uk/shibboleth/metadata" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://smartam-login.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University SMART Project Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/computing/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Maciej</GivenName>
- <SurName>Machulak</SurName>
- <EmailAddress>mailto:maciej.machulak@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/solo2.bodleian.ox.ac.uk-shib.xml b/swamid-interfederations-2.0/solo2.bodleian.ox.ac.uk-shib.xml
deleted file mode 100644
index e4142674..00000000
--- a/swamid-interfederations-2.0/solo2.bodleian.ox.ac.uk-shib.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://solo2.bodleian.ox.ac.uk/shib">
- <!--
- This is a Shibboleth "Bodleian Test" SP for the University of Oxford.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-19T10:28:05Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEwDCCA6igAwIBAgIRANlfuH+u1KAhip8Sn8GSMhswDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjA3MTMwMDAwMDBaFw0xNTA3MTMyMzU5NTlaMIGSMQswCQYD
- VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
- MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsTEkJvZGxlaWFu
- IExpYnJhcmllczEgMB4GA1UEAxMXc29sbzIuYm9kbGVpYW4ub3guYWMudWswggEi
- MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaB6kaVAyRyXkjpSkeeHomGe3
- iUUPM7h9im+HSbZS0Xq9O8n+FsjoGEbZx8iFR3i8nt2BRe5sTHexknot2JU0WpSc
- TUbILRlsZ1+Lkf6zXAgoeTnRrSyTgSmCDWtajgjTbKx1KjgWYM/YltNwOvSaPhh6
- GW3zpkRAWLvojdcc7X15epeTITW0kGozHPSPBx0CNtYaYDA5O+573xz24qqc62kM
- oqmAhSOImoFxJdqwSIK+Pp+SN90+6jT+Dg/TfwFNErBiUs0gbEGoMRbIWb1tW/OV
- CCS28Q5q/22Gw+oMrDukyqWF98r9SfOOn8E630H7hzyNthzPjhwxXY8n+NmpAgMB
- AAGjggFqMIIBZjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
- HQ4EFgQUkuwKFhe4yLTJhlaPxiKeIy2+w7AwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
- EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
- MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
- Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
- CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
- LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYD
- VR0RBBswGYIXc29sbzIuYm9kbGVpYW4ub3guYWMudWswDQYJKoZIhvcNAQEFBQAD
- ggEBAH2NmAgTq9X409o7z5jE+Z72ajFBrxzSOrKUrTb6zgeNO7541E8Ac0M8W4ZM
- ELqnHINCfLTaOYzbKYwPb7m8tWElS0bsUfkCojDVUY+Qtfd3DCDEDB6vT5JZpyJ3
- khB1H7dx52bTEk1OsM2v5G+0rHgkTqtnrN+bzLTkZ10+ky5LkKLUvej4x3Jh7Oog
- KK1xWsEB1slflzYSakfCD3M9pH2XpayoCYrVgUW5acBpmIk8Ahiglr2e8fXeU2L2
- 1X9y/Gq21N635TX+nHA2tJ1UFDBPH0UyHBd3haNPvvNRMIDyQdsCcBciWfFZPKwC
- UK0c3gVQ0obMO+sWe5zYQVleepo=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo2.bodleian.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Oxford, Bodleian Test SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Masud</GivenName>
- <SurName>Khokhar</SurName>
- <EmailAddress>mailto:ils-tech@maillist.ox.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Masud</GivenName>
- <SurName>Khokhar</SurName>
- <EmailAddress>mailto:ils-tech@maillist.ox.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml b/swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml
deleted file mode 100644
index f1ee1523..00000000
--- a/swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.dev.clarin.inl.nl/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFWDCCBECgAwIBAgIQJ/7FXBoKUGe92mfIdkjkTzANBgkqhkiG9w0BAQUFADCB
-iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-BAMTJkNPTU9ETyBIaWdoIEFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTA5
-MDYxNTAwMDAwMFoXDTE0MDYxNTIzNTk1OVowgdkxCzAJBgNVBAYTAk5MMRAwDgYD
-VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
-aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
-EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTEaMBgG
-A1UECxMRQ29tb2RvIEluc3RhbnRTU0wxHTAbBgNVBAMTFHNwLmRldi5jbGFyaW4u
-aW5sLm5sMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo9rdfDu13+/wOF5/f
-AyUVKFtr2lTIEXdafTiYNzddM4A8adWmpaMxhkUeGdviz97L4m23KxI/Pf/J/wq2
-mmHtOEAYwmQgXb+ltT8Gf9aknvyphzEiH/hNYp+qoOxQ1RSFMCnX3QLl5VMrLyHM
-orAwTQL0uLr/EuzMcViolKcOnwIDAQABo4IB7DCCAegwHwYDVR0jBBgwFoAUYFnN
-gMfF46uML/xr5VsK9Q/eS/8wHQYDVR0OBBYEFC7a6OPUS99Y35xiMz3fPk2ilJTF
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMDQGA1UdJQQtMCsGCCsGAQUF
-BwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMEYGA1UdIAQ/MD0w
-OwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNv
-bW9kby5uZXQvQ1BTME4GA1UdHwRHMEUwQ6BBoD+GPWh0dHA6Ly9jcmwuY29tb2Rv
-Y2EuY29tL0NvbW9kb0hpZ2hBc3N1cmFuY2VTZWN1cmVTZXJ2ZXJDQS5jcmwwfwYI
-KwYBBQUHAQEEczBxMEkGCCsGAQUFBzAChj1odHRwOi8vY3J0LmNvbW9kb2NhLmNv
-bS9Db21vZG9IaWdoQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUF
-BzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIwMIIUc3AuZGV2
-LmNsYXJpbi5pbmwubmyCGHd3dy5zcC5kZXYuY2xhcmluLmlubC5ubDANBgkqhkiG
-9w0BAQUFAAOCAQEAjtEgHw+TblkdTK5utNytnxEuQ3lPT5eEMyN+o6V00L51u+F6
-uh+yPdTH5UBXnTWbAc+RRlfYQDE+5x6v8FDyyO1Znf5pKYFoquO9ym8JqjHXEZQY
-s9z/lt6TM7NKiCZO7S7FC8HHzPrnU0kwzgmf6f+Y7fRzOAuDfLxnUZwlpAaGs1R6
-nS2MgFakP+X/ZNjrWETQriNNGSBGbYfcdB1QuoMgJuXkU6zs7DhmHP838uFAQjYi
-OC/70RsuE1f4nsgjJ+jT9x/DoVqV2YbW0gGNyGpWPTH4csvE23Z1dFINIymVUlt9
-MLV2RZ8HHAgA9AeBjEdJIavF9Q9H6a59eFcx4A==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Browsable TST-LRs</md:ServiceName>
- <md:ServiceName xml:lang="en">Browsable TST-LRs</md:ServiceName>
- <md:ServiceName xml:lang="sv">Browsable TST-LRs</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Marco</md:GivenName>
- <md:SurName>Van der Laan</md:SurName>
- <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-jiscelcat.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-jiscelcat.xml
deleted file mode 100644
index 0a416603..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-jiscelcat.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/jiscelcat">
- <!--
- This is a Shibboleth JISC ELCAT SP for the University of Edinburgh.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-29T09:55:41Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">JISC ELCAT</mdui:DisplayName>
- <mdui:Description xml:lang="en">JISC Electronic Licence Comparison and Analysis Tool.</mdui:Description>
- <mdui:Logo height="64" width="318">https://vsp2.edina.ac.uk/public/images/splogos/jiscelcat.png</mdui:Logo>
- </mdui:UIInfo>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/UKDA"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/WAYF/EDINASchools"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/WAYF/UKFederation"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/WAYF/UKall"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
- VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
- MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
- RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
- ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
- pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
- YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
- A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
- 9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
- RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
- igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
- asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
- rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
- w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
- SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
- FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
- 4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
- gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
- u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
- iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
- xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
- TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/SLO/Artifact"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/SLO/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/NIM/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/NIM/SOAP"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/SAML/POST" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/SAML2/Artifact" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/SAML2/ECP" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/SAML2/POST" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/jiscelcat/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
- <OrganizationDisplayName xml:lang="en">JISC ELCAT</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.jisc-collections.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>EDINA Helpdesk</GivenName>
- <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ben</GivenName>
- <SurName>Soares</SurName>
- <EmailAddress>mailto:ben.soares@ed.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-neocar.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-neocar.xml
deleted file mode 100644
index 43781b25..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-neocar.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/neocar">
- <!--
- This is a University of Edinburgh Service Provider for EDINA NEOCaR.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
- VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
- MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
- RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
- ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
- pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
- YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
- A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
- 9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
- RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
- igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
- asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
- rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
- w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
- SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
- FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
- 4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
- gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
- u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
- iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
- xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
- TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/neocar/Shibboleth.sso/SAML/POST" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/neocar/Shibboleth.sso/SAML/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/neocar/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/neocar/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/neocar/Shibboleth.sso/SAML/POST" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/neocar/Shibboleth.sso/SAML/Artifact" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/neocar/Shibboleth.sso/SAML/POST" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/neocar/Shibboleth.sso/SAML/Artifact" index="10"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
- <OrganizationDisplayName xml:lang="en">EDINA NEOCaR</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://edina.ac.uk/neocar/description.html</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>EDINA Helpdesk</GivenName>
- <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ben</GivenName>
- <SurName>Soares</SurName>
- <EmailAddress>mailto:ben.soares@ed.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.moodle-pp.ucl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.moodle-pp.ucl.ac.uk-shibboleth.xml
deleted file mode 100644
index b6a3aca9..00000000
--- a/swamid-interfederations-2.0/sp.moodle-pp.ucl.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.moodle-pp.ucl.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2 "Moodle (test) SP for the University College London.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDODCCAiACAQAwDQYJKoZIhvcNAQEEBQAwYjELMAkGA1UEBhMCR0IxDzANBgNV
- BAcTBkxvbmRvbjEiMCAGA1UEChMZVW5pdmVyc2l0eSBDb2xsZWdlIExvbmRvbjEe
- MBwGA1UEAxMVbW9vZGxlLXRlc3QudWNsLmFjLnVrMB4XDTExMDExNzEzMzcwOVoX
- DTIxMDExNDEzMzcwOVowYjELMAkGA1UEBhMCR0IxDzANBgNVBAcTBkxvbmRvbjEi
- MCAGA1UEChMZVW5pdmVyc2l0eSBDb2xsZWdlIExvbmRvbjEeMBwGA1UEAxMVbW9v
- ZGxlLXRlc3QudWNsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
- AQEAuRlOe44W4doKBLw8klfnawIV4h3NTC57l993bCcZ3g5Ir8EiIMd4oSVHOOf3
- +imylBx+toMJsuR9oOvtG9YXtINqaLE5V4bVIfOfLGo8DPyM0KxGCd9/M5ZHeiPi
- aaS21/XzQKqEkCNu7Uj7z8Oc8Rr57+ax/l0XvRty09qbnV6uXfDbc+hfhh0o6hch
- 9LTE2LkgsYxC4+Cdpblt8FTohuncr9vcU+SZC2TmODutD3Fgu4+NvSIjcK6ap6jS
- q28HhxX9Rm9hbkwttx7nwNNvpGx1erqVdsdnP8Ts6ksk4kd7hFDvdsXPC5EKY4C4
- 6qecO/f57Hm5BKxCHmMKe6XvcQIDAQABMA0GCSqGSIb3DQEBBAUAA4IBAQCX1yog
- 3/Pbbi8OmRjjSHNYhVlHqOxqya6qpD7Q/21hj3izchpXFBHPi1GeH03Y/bZXWA8e
- 7NXEizEIN48acC11rJIqVkNAljtcj02JDMBExZcTlDtKyOMQxStR1UK7QMX5gewj
- 9i/BiKbpbNJvzChz2UYIWOkDUBOxHcjIyf6IRy/K+3UFTfgveTurVyw4AUyoZsW1
- DNc60fmpw3srpROv+cAEHQHLNJDtWErWsEM32UPp6gi1n1F0vSUzFu3ZyjE+Oc6o
- ED+f2zIFze+KyOhn4if+JGnGy/MN54vpXOaKKmolo0gkU+iuvH9IoNjkywyBAkr4
- j/K/PsAz/f88ulRv
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDODCCAiACAQAwDQYJKoZIhvcNAQEEBQAwYjELMAkGA1UEBhMCR0IxDzANBgNV
- BAcTBkxvbmRvbjEiMCAGA1UEChMZVW5pdmVyc2l0eSBDb2xsZWdlIExvbmRvbjEe
- MBwGA1UEAxMVbW9vZGxlLXRlc3QudWNsLmFjLnVrMB4XDTExMDExNzEzMzcwOVoX
- DTIxMDExNDEzMzcwOVowYjELMAkGA1UEBhMCR0IxDzANBgNVBAcTBkxvbmRvbjEi
- MCAGA1UEChMZVW5pdmVyc2l0eSBDb2xsZWdlIExvbmRvbjEeMBwGA1UEAxMVbW9v
- ZGxlLXRlc3QudWNsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
- AQEAuRlOe44W4doKBLw8klfnawIV4h3NTC57l993bCcZ3g5Ir8EiIMd4oSVHOOf3
- +imylBx+toMJsuR9oOvtG9YXtINqaLE5V4bVIfOfLGo8DPyM0KxGCd9/M5ZHeiPi
- aaS21/XzQKqEkCNu7Uj7z8Oc8Rr57+ax/l0XvRty09qbnV6uXfDbc+hfhh0o6hch
- 9LTE2LkgsYxC4+Cdpblt8FTohuncr9vcU+SZC2TmODutD3Fgu4+NvSIjcK6ap6jS
- q28HhxX9Rm9hbkwttx7nwNNvpGx1erqVdsdnP8Ts6ksk4kd7hFDvdsXPC5EKY4C4
- 6qecO/f57Hm5BKxCHmMKe6XvcQIDAQABMA0GCSqGSIb3DQEBBAUAA4IBAQCX1yog
- 3/Pbbi8OmRjjSHNYhVlHqOxqya6qpD7Q/21hj3izchpXFBHPi1GeH03Y/bZXWA8e
- 7NXEizEIN48acC11rJIqVkNAljtcj02JDMBExZcTlDtKyOMQxStR1UK7QMX5gewj
- 9i/BiKbpbNJvzChz2UYIWOkDUBOxHcjIyf6IRy/K+3UFTfgveTurVyw4AUyoZsW1
- DNc60fmpw3srpROv+cAEHQHLNJDtWErWsEM32UPp6gi1n1F0vSUzFu3ZyjE+Oc6o
- ED+f2zIFze+KyOhn4if+JGnGy/MN54vpXOaKKmolo0gkU+iuvH9IoNjkywyBAkr4
- j/K/PsAz/f88ulRv
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodle-pp.ucl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle-test.ucl.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://moodle-test.ucl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle-test.ucl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodle-test.ucl.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle-test.ucl.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodle-test.ucl.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University College London</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University College London Moodle (Test)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Adrian</GivenName>
- <SurName>Barker</SurName>
- <EmailAddress>mailto:systems@ucl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Adrian</GivenName>
- <SurName>Barker</SurName>
- <EmailAddress>mailto:systems@ucl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nuservice.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml
index 8265889f..842068bf 100644
--- a/swamid-interfederations-2.0/nuservice.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nuservice.ncl.ac.uk/shibboleth/metadata">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/esbates/production/shibboleth">
<!--
- This is a "Newcastle University IT Service Management Server" Shibboleth SP for the University of Newcastle upon Tyne.
+ This is a "Silverchair Production: Wolters Kluwer Bates Visual Guide Spanish" Shibboleth SP for Silverchair Science + Communications, LLC.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -20,35 +20,35 @@
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-17T11:09:41Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-05T09:19:39Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://batesguiavisual.com/Shibboleth.sso/Login"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDEjCCAfqgAwIBAgIJALkyNaaq41MzMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
- BAMTGWl0c213YTAxLmNhbXB1cy5uY2wuYWMudWswHhcNMTMxMDE2MDcxMTAyWhcN
- MjMxMDE0MDcxMTAyWjAkMSIwIAYDVQQDExlpdHNtd2EwMS5jYW1wdXMubmNsLmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8AWz4PzpB33dTDYC
- D5MwsJE0Ep/DL3bTIlBEODYUi9/Cyj1+lRWZpwKYi2Glz+AAKoiSAtI+DgiGTfeP
- 6ytVVIr7eqy6kpoB67mBnAYlhzncMKakAXoSIPpElHHIBZEvC8m+ViZHpwNVYde7
- H5UvbpjwSEf/euot3PUIqO3JzBn31WTSSsCny1/L+EYZn5guDUXUWrWD3MLi8ASL
- CUAzeoYUaEDnqunXOArQYyUsG6IUajg/hNeAuuMfMtpg2CyB92xoNYUF2FgzeK+n
- Be45IX51jcDswDqlnaCLZtVb8UWo+B4ICnLhwOJGGTVhWjmllCkQk8wIv64Rpsf0
- JdklxwIDAQABo0cwRTAkBgNVHREEHTAbghlpdHNtd2EwMS5jYW1wdXMubmNsLmFj
- LnVrMB0GA1UdDgQWBBSKR4LKZb415VLYzCahbQfYqv1r/zANBgkqhkiG9w0BAQUF
- AAOCAQEAMnGW3NBkUMDUX2KAjR4zh1iDMxG52GX5P/igxzTD0HyD4UAbdIms6ZFp
- KnDuOjzIl3V7fhy5O9GKrsXMOiL6NqhYHypK4tueAP4eBRal2BjC2r5P+riThLku
- Ap5HhpJPxjtKu4YNZwI83OjS+3eF4fN5xxYY/MBanz+A6SjMI32GvbMjIbm7JqaZ
- VhVgMU4zgwyETV50MT+jl8eREvpkrHs86NT7hknn92a74eGKrIWAl52lF5Tu7CNj
- nEFUnCVSzXGXSQuoRnrsYNP7Ps0c3nZFfGSB2zgIqKpgn+UmbMhAJKAcUJzdrhHY
- NpiAOcQWc0faILktwIXrTPrxPCniVg==
+ MIIDBjCCAe6gAwIBAgIJALin0XFwb82yMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+ BAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjAeFw0xNTAzMDMxNTQyNDJaFw0yNTAy
+ MjgxNTQyNDJaMCAxHjAcBgNVBAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjCCASIw
+ DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALsi9y2ljlDuMGn64lhRsO1Q7MYo
+ ppIQ2Mm49zT3/7b9eEW+8DLIdhJocmwturiTb7Z+3LqVhuoRsBtAFq2xb3rh7Tv3
+ xc9jAeig/M3Sf4lEdr51hkQMZ2lfIyQNXEwCejKt8/al3i3CBAedBf/M3GeU53AC
+ lAKWbfs6jHbN2kE2rWbex8YxazX1tJARdbtBx9tujie7W/tOj2iVd5C6eqpsU5Zu
+ PvKKsmUQ8I0jIJa+eF/FSp+cKW8uXWLWx1l2S9HJme4vOBi1XGtLpjSn4VGOsF2p
+ bs5sHMyV5eApcSLVBaqZnHcE9HMoHhsjKLnme6JbJ826rtaCxLRXqr59lF0CAwEA
+ AaNDMEEwIAYDVR0RBBkwF4IVc2NtLXByb2R3ZWIwMS5zaXMubGFuMB0GA1UdDgQW
+ BBS2/5NIi4BwDPX6NXCg/cdzKP1RYjANBgkqhkiG9w0BAQUFAAOCAQEAcfRfLZgf
+ sZJ4U3auPGf6GCBzs1QjJUzNgIiL7IZOEHPE1ezvRMbBpxu5iXfuXU8mxFPTDtXE
+ KgRl0qPEZrtW5h/LZd97CcbA71WohAznkjzIAUOCHVBSfOCcstr3HbnCQ3LglCrC
+ YJQNwFhNRu0e2gbapN4xlKap+YS9akyd4i+ODD3Rj5jbxDbqlErDkwII6923Jo+s
+ HeKVBNQD3godVRJn/UlzOYvLfN4l3aS8VpRv1plf9gMPe1TF2ei+1LX1sRspFqqm
+ bCcqOJmtKjzk1/DIfnKQ4av6pqbdsJCtZI2gFo2qTPtZK3mJJjew8qOmIqUnbEIj
+ j3IeauG38pyehw==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -62,31 +62,30 @@
<EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nuservice.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesguiavisual.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://batesguiavisual.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://batesguiavisual.com/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University IT Service Management Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
+ <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Silverchair Production: Wolters Kluwer Bates Visual Guide Spanish</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://batesguiavisual.com/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
+ <GivenName>Shibboleth Admin</GivenName>
+ <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
+ <GivenName>Kevin</GivenName>
+ <SurName>Hirst</SurName>
+ <EmailAddress>mailto:khirst@silverchair.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml
index 9d077a16..753479bc 100644
--- a/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml
@@ -3,7 +3,6 @@
<md:Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/sso.u-psud.fr-idp.xml b/swamid-interfederations-2.0/sso.u-psud.fr-idp.xml
deleted file mode 100644
index f9cea3aa..00000000
--- a/swamid-interfederations-2.0/sso.u-psud.fr-idp.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.u-psud.fr/idp">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-02-09T10:08:41Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-psud.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Paris-Sud</mdui:DisplayName>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDIDCCAgigAwIBAgIVAIUJk6EXza7L7QSpNoIN24P1I8rlMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNzby51LXBzdWQuZnIwHhcNMTAwMjA4MTAwOTA0WhcN
-MzAwMjA4MTAwOTA0WjAYMRYwFAYDVQQDEw1zc28udS1wc3VkLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAroxa30hNBV4PaO3ESgOkEjFPCtg1MaOo
-L55D4a/hiuuuv4Lfa25MNaiAmUx26o7x575VkYv6UJb9BQmXGUZPwHH0EQDXw/ZZ
-LGuW8M9K7L1ZYSLfjFVYWBY1jGsUhQjsEkG+G2zpmluUnWh5WUS6Px8wCS+1KbHP
-HXyR5l/WZoNnH/7A1GLMRokGIt5ZTYDLw9hD3JA9oACCP8c3PgNrZRnQc4kw1/Rl
-GKAncAfde8U0kv6BhCcjr7M2LDEBVP+gC3wEIO+UOAuSbRpD7ECSJVAc8GqR20b4
-5FRFPgKptk9dtoxpyyA3wyPp6DHHiywG24B+GF4xEMv1yUczX1weIQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zc28udS1wc3VkLmZyhiRodHRwczovL3Nzby51LXBzdWQu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAhfKZQU4qijehvftE595ElwwPE5
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjeft61T2pXsTQ+7s/q9nCI3jGTtSjRcA2Pjkx
-RmlmfmCoJfR1U0eG0bZKjjydBoezTGr5WRGpGPGq9Ta7q5t3tmSFTowq60ZKJwSh
-CpXXvrIi9lRHMxoTGC2XyxgP9QmzIG/jR/er1zOCbAhTJBiBThdGFCnBwlPmZDIk
-VwYSV7zlyGtzh7cSldKwIkvifFOh9Op376MhuPAmFqUnfEJGzJbyttrolQ2I4oUw
-wKiyOu3VYdTiu+FcCFVdKWOOIqV+v/8cWHlaUTS1+RC+exL6305K8Kkv5xhpyxCR
-QUfLusw8PKdnTW45JL7EEdO48zPq2va8ihPE82nrZVK0wt/q
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.u-psud.fr/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.u-psud.fr/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.u-psud.fr/idp/profile/Shibboleth/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Université de Paris-Sud</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Université de Paris-Sud</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Laubenberger Stéphane</md:SurName>
- <md:EmailAddress>stephane.laubenberger@u-psud.fr</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:SurName>Lambert Dominique</md:SurName>
- <md:EmailAddress>dominique.lambert@u-psud.fr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/di.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml
index c2957b94..4fc9dda5 100644
--- a/swamid-interfederations-2.0/di.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://di.ncl.ac.uk/shibboleth/metadata">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://stats-qa.ukdataservice.ac.uk/shibboleth">
<!--
- This is a "Digital Institute Server " Shibboleth SP for the University of Newcastle upon Tyne.
+ This is a "UK Data Service Dotstat Quality Assurance server" Shibboleth SP for the University of Essex.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -20,34 +20,36 @@
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-21T13:21:52Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-06T10:10:02Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://di.ncl.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/Login" index="1"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIC6DCCAdCgAwIBAgIJAOLk+RUTNNixMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
- BAMTC2RpZy1nYXRld2F5MB4XDTE0MTAyMTExMTkzMVoXDTI0MTAxODExMTkzMVow
- FjEUMBIGA1UEAxMLZGlnLWdhdGV3YXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
- ggEKAoIBAQDQkpfcntmQ+2c+rJ12klqoGir8dFKzSFRJQ8t/Z5A7YOJ5O9qjW1G9
- iPwDR06bgSTv66Q8wbpnlZPhOybYlRtNPvgJ9fCOF6CRJgGtodnU35oQlnmxhLl/
- aBzeq5tjKLXQIs1LP6p/hb63SXNXDuqvljlVjMQXSHsDIM2Tsn3EYiX7szsq5k1E
- FIYbSbody3hYMpxZNGGKLgLruqAhZvGQ9VjcczwrMIJo/LKwrVh1BiJif3avImyT
- XbDWpgC0hZ6/u6KwHb7p74gKNlzLWCveEyjwLFPWRSvsM1Gy+/WrUW8cebxHCKnH
- Hu7KpT2SeM8R4MijHlmDlt3ntDkjCkd5AgMBAAGjOTA3MBYGA1UdEQQPMA2CC2Rp
- Zy1nYXRld2F5MB0GA1UdDgQWBBQFn5Un7i7JtWX0u2rDGRlsDHVS0zANBgkqhkiG
- 9w0BAQUFAAOCAQEAAVJXcoFf8COo9nSotW++qvPyAONeIUrpj3xW3kDPFhavAX98
- RsxpCSpAM2v5gHi+75CDd3KQ+75CvRHkcdRJ9lZsAUDbXlW1xRi5/n9vPrPid6V8
- Y6z8MEtxVNSKPhm5JbWwDI1AIgdRaYQyFfdy5HtV1EYzn85HEhIF29XGi+cqnHxY
- qrBHTzqDiy9tGWOL6HRkLxoGxM0emea2g7XO87osZtm8PmnKyeqecII7w7b8KTJY
- 7Bs2jVW3Vvyjbdr73gPw2x14/loLFMYDXTGESkt1KPiikPyw0hbNN/whK/fdDvlB
- a7190cAA6DmDa95ye4jT320QdFGyb0GpW50tOg==
+ MIIDDDCCAfSgAwIBAgIJAPpH6NVGj1XdMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+ BAMTF2RhZG90c3dlYnN0LmVzc2V4LmFjLnVrMB4XDTE1MDIxMjE0NTQxM1oXDTI1
+ MDIwOTE0NTQxM1owIjEgMB4GA1UEAxMXZGFkb3Rzd2Vic3QuZXNzZXguYWMudWsw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsGGwsGqLlefqf9/trBWbE
+ xMSEW2OX4wNs+z2HTDqknWz3iMsiGiKwWCHWX1ZoQ/wtTNWm2ZrwJEoJaddI7Sz4
+ GM2TA4P21HdYjzXrW1pjU0kiZSU+pxVXVK4PXvuUwB6kxBaKe308r6GBMHItLh7F
+ hGe9A2SvWgDBBlblyw+edNw4L8CebjXhqy9FjySpMYbSOf5EPgSZk65F0nJpAWNP
+ VJGORlYolNR/ida5zT6nrNZNKkNONGJNecduaA4Gz8wpdh/130MFdkvxfcubPSA6
+ zj/2gx1YSKiX21GFTwJ6IpbgfCEbva0AUoeqiUnDQeMj9tDRJsvig++n4IyXvgYb
+ AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RhZG90c3dlYnN0LmVzc2V4LmFjLnVrMB0G
+ A1UdDgQWBBS+yIbRvhlwfAoaYco+n9wYnqCH6TANBgkqhkiG9w0BAQUFAAOCAQEA
+ W5xAKRmFGiobOWK3XSS7vVIdw53mxNeX8V7ktOPPZfc7btPc9+T72YPS5E+qEGyg
+ GbyhL1KhZQl7TBeXVurcU8ZiSZcqhBKlW2e35OXh2ayt1s7dZI4FRwmlwnCWYrWV
+ 4L0omNrpUJehBBN8YocDnewHmOxgdwp8xEg+8sQwJGCOUgIEW7RqPz9Ac1jUQYeI
+ lA45WldwBjDa9kEY+2RWISHZ1suZU3lZiSZuev8MT6OWGn5p7+Jg0Kp9DjZB/92L
+ 6W8wXxM6Bx2xperc3d0sbkT3cbAnZwz5BWQHhsGZjHjRY/NzVLGwXgvG5w3VfDby
+ yMJeeTVd+zS0q0I6Z0aHYA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -61,35 +63,31 @@
<EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://di.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://di.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://di.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://di.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://di.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://di.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://di.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://di.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://di.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://di.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://di.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://di.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://di.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://di.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://di.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Digital Institute Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/computing/</OrganizationURL>
+ <OrganizationName xml:lang="en">University of Essex</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">UK Data Service Dotstat Quality Assurance server</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://ukdataservice.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
+ <GivenName>Susan</GivenName>
+ <SurName>Noble</SurName>
+ <EmailAddress>mailto:Susan.Noble@manchester.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Sebastion</GivenName>
- <SurName>Mellor</SurName>
- <EmailAddress>mailto:s.j.i.mellor@newcastle.ac.uk</EmailAddress>
+ <GivenName>Nick</GivenName>
+ <SurName>Syrotiuk</SurName>
+ <EmailAddress>mailto:syrotiuk@manchester.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/teaching.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/teaching.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index af49d20e..00000000
--- a/swamid-interfederations-2.0/teaching.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://teaching.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an SP for Newcastle University's Teaching Support Server.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://teaching.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Teaching Support</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.rpharms.com-entity.xml b/swamid-interfederations-2.0/test.rpharms.com-entity.xml
new file mode 100644
index 00000000..87f2041b
--- /dev/null
+++ b/swamid-interfederations-2.0/test.rpharms.com-entity.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.rpharms.com/entity">
+ <!--
+ This is a "CBCL Test Site" OpenAthens SP for the Royal Pharmaceutical Society of Great Britain.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-04T12:21:55Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">CBCL Test Site</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Development site for CBCL</mdui:Description>
+ <mdui:Logo height="64" width="139">https://staging.cbcl.co.uk/ukfed/cbcl_logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDgjCCAmqgAwIBAgIJALwx9tll+qVcMA0GCSqGSIb3DQEBBQUAMDQxFTATBgNV
+ BAoTDHN0YWdpbmctY2JjbDEbMBkGA1UEAxMSc3RhZ2luZy5jYmNsLmNvLnVrMB4X
+ DTE1MDIyNTEyNTgxNVoXDTI1MDIyMjEyNTgxNVowNDEVMBMGA1UEChMMc3RhZ2lu
+ Zy1jYmNsMRswGQYDVQQDExJzdGFnaW5nLmNiY2wuY28udWswggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQC8udH1d2ZZEL/BDN30QIMSKtmpY7UEwFN/sUeV
+ dZ0Gy3g/INtPq7sD652of1/oL2wAFIAy3DDtn8AvxtZPq6YpXwa4YQFO+jdns95F
+ srPIYsNf07WMgiU+9RyPMlRisuQ6aP2vSmYKuCVClNsSqCUg75La9WoeCCwPVWpk
+ 68PUmU2BnWn28SJh+PS6HCH1I5VNhxEI6HK3EiJn7GfYOYLYSUXT6h5vmiPs//Se
+ iIjgPVmp5WYp1C6Nll4W3zRYEHKDsoP17Q4J2xSLs29wV+E5KKtiGCVXlo3mmAKV
+ QEsSKZnOU2fctnZIT3XSR3boh2HPEbnRT44xE2f5ETqIg1ZtAgMBAAGjgZYwgZMw
+ HQYDVR0OBBYEFAzPDnpVwkT1SW2m+/wIUPwjc7unMGQGA1UdIwRdMFuAFAzPDnpV
+ wkT1SW2m+/wIUPwjc7unoTikNjA0MRUwEwYDVQQKEwxzdGFnaW5nLWNiY2wxGzAZ
+ BgNVBAMTEnN0YWdpbmcuY2JjbC5jby51a4IJALwx9tll+qVcMAwGA1UdEwQFMAMB
+ Af8wDQYJKoZIhvcNAQEFBQADggEBACB9SbHspWAUl22utozAqjRJrzQIAZpm3F/f
+ TJ5rSauNjMmynolPErFiK6r2vEZTognGfA4xNgwRzj7Pv9T6fYcZSgju6CLnTtKM
+ visn0gZI8/FbtZtcSRvDREeiq3khk8shExS5y2QF/yIPE9p7dsJzofIabcwNOi+L
+ 3UmF4Wx9nQ/e6QqgVou2j1C4IUkLkTnomdtA0Azgc/IYHLD83q2v6aTucGndVhEe
+ lZykRhgMXr+w93jt0q0k8Teq3TwMBZPl1Qqwp/UbbXm4zf3uRhlKqnJaS75Xx7Yq
+ DEV9gsXy2u5SnEMxi5z04whSE1/zOY+XRy3xUBbh9doePRw91wE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDgjCCAmqgAwIBAgIJALwx9tll+qVcMA0GCSqGSIb3DQEBBQUAMDQxFTATBgNV
+ BAoTDHN0YWdpbmctY2JjbDEbMBkGA1UEAxMSc3RhZ2luZy5jYmNsLmNvLnVrMB4X
+ DTE1MDIyNTEyNTgxNVoXDTI1MDIyMjEyNTgxNVowNDEVMBMGA1UEChMMc3RhZ2lu
+ Zy1jYmNsMRswGQYDVQQDExJzdGFnaW5nLmNiY2wuY28udWswggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQC8udH1d2ZZEL/BDN30QIMSKtmpY7UEwFN/sUeV
+ dZ0Gy3g/INtPq7sD652of1/oL2wAFIAy3DDtn8AvxtZPq6YpXwa4YQFO+jdns95F
+ srPIYsNf07WMgiU+9RyPMlRisuQ6aP2vSmYKuCVClNsSqCUg75La9WoeCCwPVWpk
+ 68PUmU2BnWn28SJh+PS6HCH1I5VNhxEI6HK3EiJn7GfYOYLYSUXT6h5vmiPs//Se
+ iIjgPVmp5WYp1C6Nll4W3zRYEHKDsoP17Q4J2xSLs29wV+E5KKtiGCVXlo3mmAKV
+ QEsSKZnOU2fctnZIT3XSR3boh2HPEbnRT44xE2f5ETqIg1ZtAgMBAAGjgZYwgZMw
+ HQYDVR0OBBYEFAzPDnpVwkT1SW2m+/wIUPwjc7unMGQGA1UdIwRdMFuAFAzPDnpV
+ wkT1SW2m+/wIUPwjc7unoTikNjA0MRUwEwYDVQQKEwxzdGFnaW5nLWNiY2wxGzAZ
+ BgNVBAMTEnN0YWdpbmcuY2JjbC5jby51a4IJALwx9tll+qVcMAwGA1UdEwQFMAMB
+ Af8wDQYJKoZIhvcNAQEFBQADggEBACB9SbHspWAUl22utozAqjRJrzQIAZpm3F/f
+ TJ5rSauNjMmynolPErFiK6r2vEZTognGfA4xNgwRzj7Pv9T6fYcZSgju6CLnTtKM
+ visn0gZI8/FbtZtcSRvDREeiq3khk8shExS5y2QF/yIPE9p7dsJzofIabcwNOi+L
+ 3UmF4Wx9nQ/e6QqgVou2j1C4IUkLkTnomdtA0Azgc/IYHLD83q2v6aTucGndVhEe
+ lZykRhgMXr+w93jt0q0k8Teq3TwMBZPl1Qqwp/UbbXm4zf3uRhlKqnJaS75Xx7Yq
+ DEV9gsXy2u5SnEMxi5z04whSE1/zOY+XRy3xUBbh9doePRw91wE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.cbcl.co.uk/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.cbcl.co.uk/ukfed/oa/auth/rcv/saml2/post" index="2"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Royal Pharmaceutical Society of Great Britain</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">CBCL Test Site</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.cbcl.co.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Micah</GivenName>
+ <SurName>Edwards</SurName>
+ <EmailAddress>mailto:micah@cbcl.co.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Micah</GivenName>
+ <SurName>Edwards</SurName>
+ <EmailAddress>mailto:micah@cbcl.co.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/timetables.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/timetables.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index eb37fb46..00000000
--- a/swamid-interfederations-2.0/timetables.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://timetables.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Newcastle University Timetable Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-12T10:30:56Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC2TCCAcGgAwIBAgIJANZvxVng1zNjMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
- BAMTBnR0aG9zdDAeFw0xMzA5MzAxMjUzNTVaFw0yMzA5MjgxMjUzNTVaMBExDzAN
- BgNVBAMTBnR0aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMri
- M7TaiW/12U+KxnNcJckFCmCFGnG4vDLHCw5y1XyiXLQOPQFxyaD3Fh03YNtqrQTQ
- Dq0CE0O1EIGCfKFBJlPGs/zifdBSbU8gXz2nASxAw13hUkqs2MqMmPbeEUDxenBy
- OEmNbt7ivknL9JNx8qp/hCzP8C6iOuw2dp+VJgEtiXL/2IpHBBmSXumlsq2jQLDD
- ZrUfgtRxKt37pzKdLNBPP9zGgCl/cP3kAEq07z6uEL1PlZc1328UJoUUVM0j9Pk5
- q6WDY3qjc7S4BrFIQ/An9Zx5ExLapyFyyzG6jH8N/PJ/1qs9iKwlBOGn2ux9wiwZ
- LVhvucTpxY0P5I4ZJdsCAwEAAaM0MDIwEQYDVR0RBAowCIIGdHRob3N0MB0GA1Ud
- DgQWBBSZ8NZ+9yXyA71j7Mrn5wjhRCnKWzANBgkqhkiG9w0BAQUFAAOCAQEAQ2Q5
- K24q5Zx/AXpOZUtdRsIUf1En/x4pUW1rytytFAQcIfc3GxPmdFXUQj1IwdP+lp85
- Sv7aVCFNpywlv2PYLF/Uk5fGI7JXpkZ4OHTVA3qjoTNl9sRpLt/v1+Nrb1egOGZh
- 3MlH9B4rcbj2/soqQu8gBCIF9mCgRFMSMBf4aw3p6rA1IiUuRqxsel/oSaHkPGL9
- 1wq/saPEDJB+dlzmyiQ3pc4qOU52Z5Rbw2HbRriT9wsXAHsDryHOcTtYcNAl3oQL
- 37pg5ktVKKMB8ws4YQIKQaX+JC3afFe041s6lTd4269z0nh0Z6sjakCRMchF6HSJ
- VSTUdKYGgdNkPhvY7w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://timetables.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Timetable Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/timetableservices.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/timetableservices.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 1d970130..00000000
--- a/swamid-interfederations-2.0/timetableservices.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://timetableservices.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 Timetabling SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGDCCAgCgAwIBAgIJAN+Y+CbGSNuJMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
- BAMTG3NwbHVzd2ViMDIuY2FtcHVzLm5jbC5hYy51azAeFw0xMjAyMTAxMDAxMjNa
- Fw0yMjAyMDcxMDAxMjNaMCYxJDAiBgNVBAMTG3NwbHVzd2ViMDIuY2FtcHVzLm5j
- bC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZskSamVDTV
- uPe9q4u/cdRayk753l4eOPOjV6KTyk+z7Vm97Z8SyvXA296OIQhc95zRw22vpPKZ
- HIJG3To8XcG5RPKkOGD3s2gSSZ0PHPnakcSKrmIwzrtCFfAxrcQsVUCSJ593p2aq
- HrC9zhWtBio7YF6h3KO6LQt7L4qc5UZ/mX3OKdZnQWI3oQNuwpuy5DTLsWdBBx2D
- BX5tE6LfvPhwhkhgOBXJr9UFm0K+lSW4BvZptEVvPlm6d+Z7AJh5nlU48sLxYvox
- dK+MV7dzZjjzfSOHS4QFbSRTTgSDGms61xZwuVyD73d5dUW+D9wCrBbNezp/0Q/u
- 1fBe08A0EnsCAwEAAaNJMEcwJgYDVR0RBB8wHYIbc3BsdXN3ZWIwMi5jYW1wdXMu
- bmNsLmFjLnVrMB0GA1UdDgQWBBQr1+kp2DXAdXKcI1hd5nQeKm1t9jANBgkqhkiG
- 9w0BAQUFAAOCAQEAIDliyrd8JT91mkh4wZEJccwD38YGYEXf0jyy0OR4FLFLQyHf
- kBSl4imV9smL68Ko3NcjgOFB7J6dfFq7GKV7wUXYLgqOteLslHbfnsBHx0x7TJx5
- ke7wQYY4JqY5w4y2MxNRJhEE/GbsJ5dgjG19RpjcdZaqBMwnuihCo45mJkC2cPx6
- IZTn5WoX1hhwFF9KPE+2XrXF9lD8SzPb0EuBuk+mi9w7fGKPzrArE6LcN5DHkKc4
- eRx1QQqvkhqjxn7Yj9UpmP3TmO5S2C5ttNbCbHU6KUSW6EQvSLsCjDuETWj3CbnD
- 5ZgMw4YUY/vZEtAhenb3CCg1hvaVPc6dUGH2hw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDGDCCAgCgAwIBAgIJAN+Y+CbGSNuJMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
- BAMTG3NwbHVzd2ViMDIuY2FtcHVzLm5jbC5hYy51azAeFw0xMjAyMTAxMDAxMjNa
- Fw0yMjAyMDcxMDAxMjNaMCYxJDAiBgNVBAMTG3NwbHVzd2ViMDIuY2FtcHVzLm5j
- bC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZskSamVDTV
- uPe9q4u/cdRayk753l4eOPOjV6KTyk+z7Vm97Z8SyvXA296OIQhc95zRw22vpPKZ
- HIJG3To8XcG5RPKkOGD3s2gSSZ0PHPnakcSKrmIwzrtCFfAxrcQsVUCSJ593p2aq
- HrC9zhWtBio7YF6h3KO6LQt7L4qc5UZ/mX3OKdZnQWI3oQNuwpuy5DTLsWdBBx2D
- BX5tE6LfvPhwhkhgOBXJr9UFm0K+lSW4BvZptEVvPlm6d+Z7AJh5nlU48sLxYvox
- dK+MV7dzZjjzfSOHS4QFbSRTTgSDGms61xZwuVyD73d5dUW+D9wCrBbNezp/0Q/u
- 1fBe08A0EnsCAwEAAaNJMEcwJgYDVR0RBB8wHYIbc3BsdXN3ZWIwMi5jYW1wdXMu
- bmNsLmFjLnVrMB0GA1UdDgQWBBQr1+kp2DXAdXKcI1hd5nQeKm1t9jANBgkqhkiG
- 9w0BAQUFAAOCAQEAIDliyrd8JT91mkh4wZEJccwD38YGYEXf0jyy0OR4FLFLQyHf
- kBSl4imV9smL68Ko3NcjgOFB7J6dfFq7GKV7wUXYLgqOteLslHbfnsBHx0x7TJx5
- ke7wQYY4JqY5w4y2MxNRJhEE/GbsJ5dgjG19RpjcdZaqBMwnuihCo45mJkC2cPx6
- IZTn5WoX1hhwFF9KPE+2XrXF9lD8SzPb0EuBuk+mi9w7fGKPzrArE6LcN5DHkKc4
- eRx1QQqvkhqjxn7Yj9UpmP3TmO5S2C5ttNbCbHU6KUSW6EQvSLsCjDuETWj3CbnD
- 5ZgMw4YUY/vZEtAhenb3CCg1hvaVPc6dUGH2hw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timetableservices.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Newcastle upon Tyne: Timetabling SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tizer.tannerritchie.com-shibboleth-sp.xml b/swamid-interfederations-2.0/tizer.tannerritchie.com-shibboleth-sp.xml
deleted file mode 100644
index ebd161ce..00000000
--- a/swamid-interfederations-2.0/tizer.tannerritchie.com-shibboleth-sp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tizer.tannerritchie.com/shibboleth-sp">
- <!--
- This is a Shibboleth 2 Medieval and Early Modern Sources Online SP for TannerRitchie Publishing.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tizer.tannerritchie.com/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAKLtIvzYGYicMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF3RpemVyLnRhbm5lcnJpdGNoaWUuY29tMB4XDTExMDQxMjAxNTE0NFoXDTIx
- MDQwOTAxNTE0NFowIjEgMB4GA1UEAxMXdGl6ZXIudGFubmVycml0Y2hpZS5jb20w
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwZt2gZ3usIttQrcz6S8cm
- Vi2AyLRenvNvosCLneG9YHQkEqSnl2NcK+mjoWVWRY3jGsVeACcXiEaoZQRWnA4W
- Wiwartapy24fXmQ1S/Ylx9GdYg66TBfQjowFxPZQzUWNZwUUS+RA5e8/vO/L/Fku
- RgERiodsZs6eUvVs6QvrLTZaL9/7Weeu88UJzf/JTqr7MGBh5PMvMDhUtVyOjr39
- N8nDSrcwuZ6vjmsI0IBg83/L55nSooZ9kluKmNXwrHoMXJfq1HpCNfXsFwZ300If
- we7abb0qMhY3pKtMAMEVP8/JnYJb7/JjshVIW+3eP5v9tfVff2SRWGeY6ubEIukp
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3RpemVyLnRhbm5lcnJpdGNoaWUuY29tMB0G
- A1UdDgQWBBR8tXGfj2pDsu577hA2TvuzNcxuITANBgkqhkiG9w0BAQUFAAOCAQEA
- CZuzssjiOLp4XdSKY6bxgVt0wNafHaSacqBzGqbtUlWRcawkI9/vyQxM395YZf8m
- c0z0NF8rD2cPIo0X50xsUYSDIuOF+13cizzaUIpYBVDk0ishSY+Zbe/f1lrbdh4c
- mHsyelAmxj8ogDk3smN1HEVoWWBHRL5HyrME9zt+N9r2vgWjCOpS2Ri3XBa30P+G
- jzRm99Qu2qaIPfEbBFqWZ7eWAubXkTCeyKRDPviZmIINtQMR5sNjLqLmLc7Z/bnu
- nb7BTu3WfPobQ8n+FOcXOHGJK2s3K1GFNI4E8l/xrbaIVz4EYuTEHKHgJ/zHRIY+
- QV/iMVkSBcubDxt0fZMvAQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAKLtIvzYGYicMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF3RpemVyLnRhbm5lcnJpdGNoaWUuY29tMB4XDTExMDQxMjAxNTE0NFoXDTIx
- MDQwOTAxNTE0NFowIjEgMB4GA1UEAxMXdGl6ZXIudGFubmVycml0Y2hpZS5jb20w
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwZt2gZ3usIttQrcz6S8cm
- Vi2AyLRenvNvosCLneG9YHQkEqSnl2NcK+mjoWVWRY3jGsVeACcXiEaoZQRWnA4W
- Wiwartapy24fXmQ1S/Ylx9GdYg66TBfQjowFxPZQzUWNZwUUS+RA5e8/vO/L/Fku
- RgERiodsZs6eUvVs6QvrLTZaL9/7Weeu88UJzf/JTqr7MGBh5PMvMDhUtVyOjr39
- N8nDSrcwuZ6vjmsI0IBg83/L55nSooZ9kluKmNXwrHoMXJfq1HpCNfXsFwZ300If
- we7abb0qMhY3pKtMAMEVP8/JnYJb7/JjshVIW+3eP5v9tfVff2SRWGeY6ubEIukp
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3RpemVyLnRhbm5lcnJpdGNoaWUuY29tMB0G
- A1UdDgQWBBR8tXGfj2pDsu577hA2TvuzNcxuITANBgkqhkiG9w0BAQUFAAOCAQEA
- CZuzssjiOLp4XdSKY6bxgVt0wNafHaSacqBzGqbtUlWRcawkI9/vyQxM395YZf8m
- c0z0NF8rD2cPIo0X50xsUYSDIuOF+13cizzaUIpYBVDk0ishSY+Zbe/f1lrbdh4c
- mHsyelAmxj8ogDk3smN1HEVoWWBHRL5HyrME9zt+N9r2vgWjCOpS2Ri3XBa30P+G
- jzRm99Qu2qaIPfEbBFqWZ7eWAubXkTCeyKRDPviZmIINtQMR5sNjLqLmLc7Z/bnu
- nb7BTu3WfPobQ8n+FOcXOHGJK2s3K1GFNI4E8l/xrbaIVz4EYuTEHKHgJ/zHRIY+
- QV/iMVkSBcubDxt0fZMvAQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tizer.tannerritchie.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tizer.tannerritchie.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tizer.tannerritchie.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tizer.tannerritchie.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tizer.tannerritchie.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tizer.tannerritchie.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tizer.tannerritchie.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tizer.tannerritchie.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tizer.tannerritchie.com/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tizer.tannerritchie.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tizer.tannerritchie.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tizer.tannerritchie.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tizer.tannerritchie.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tizer.tannerritchie.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tizer.tannerritchie.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">TannerRitchie Publishing</OrganizationName>
- <OrganizationDisplayName xml:lang="en">TannerRitchie Publishing: Medieval and Early Modern Sources Online</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.tannerritchie.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Roland</GivenName>
- <SurName>Tanner</SurName>
- <EmailAddress>mailto:roland@tannerritchie.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Roland</GivenName>
- <SurName>Tanner</SurName>
- <EmailAddress>mailto:roland@tannerritchie.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml
deleted file mode 100644
index 8d1fdc15..00000000
--- a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.leeds1.emeraldinsight.com/entity">
- <!--
- This is an 'Emerald UAT Site' Shibboleth SP for Emerald Group Publishing Ltd.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-06T16:03:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" index="1"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" index="2"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" index="3"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/UKFederation"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" index="4"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" index="5"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDWzCCAkOgAwIBAgIJAOAh4h4v+OW9MA0GCSqGSIb3DQEBBQUAMC0xKzApBgNV
- BAMTImVtLXVhdC1yaC1zdnIwMy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTEwNzI3
- MTQyNjE0WhcNMjEwNzI0MTQyNjE0WjAtMSswKQYDVQQDEyJlbS11YXQtcmgtc3Zy
- MDMuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAnGjTgEi/bQRHpc9poXHq5QlfQomoyoCO5et3+VB4J65HOpP/PkxPE6ah
- kBTrzJstsD7SDatrcRM2aL28yjT+pj+mHR0x57JIMH8bC64Wy6xxC2/aj1dBZ1J8
- xo4tLJuy3ojfb7eNSHg8UuJO3pRWIC3TtzXJfQuNiTY/8M32u3i4aY+1rss87BQ6
- F+4G4MDC7EnjEm0f28WtweCC9+S5sm3AuxVEAwJuLMYJLJPfz5tgwDKYAeU9DmST
- kLiPgzr1roGEd6Bz6/o6t8rbaSUX4S7Dk6K/gVAJf9wFFvina/M2krLJC0yODqXY
- p2/8hVVm3uw02XRULx6nv8VRzQ+iuwIDAQABo34wfDBbBgNVHREEVDBSgiJlbS11
- YXQtcmgtc3ZyMDMuZW1lcmFsZGluc2lnaHQuY29thixodHRwczovL3VhdC5sZWVk
- czEuZW1lcmFsZGluc2lnaHQuY29tL2VudGl0eTAdBgNVHQ4EFgQUwEzN/hOiH7zK
- 9Mrx+j9GNUPpbUEwDQYJKoZIhvcNAQEFBQADggEBABmXktnHYciTi91g9J/lveDc
- ZwLUQ9gwi/CrLe1SX1vxI9Zou1qt4WEVXcltofO5JQ4wbbJKOgB6avy56iY6qAcw
- +3A16o6lZHP+0Q/pomdZPiIxHCe5ZVjlk9OXhBRiAZiY9dI1VNKM3suGkGsDoQQm
- dojusN4+Hfv/E2gQi4iCJWmWvUbT7rTNkyVeWGBMEUJRCCAHUP5aZcqMVGwqvVlG
- RqkhtZpBnQu/XTEhKw9xhlpid8XUUEwAz+hfY/Hzf1YhyKCmLc9q709/sPOfnqTq
- ONpDCEUvKV32/tyP4qR7RwMnwVEtN29Vrc9XZQ+n6zgm47u4WotML5m4gmr0Wqw=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Emerald Group Publishing Ltd: UAT Site</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://uat.leeds1.emeraldinsight.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Rob</GivenName>
- <SurName>Wood</SurName>
- <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Laurence</GivenName>
- <SurName>Parkin</SurName>
- <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unixcf-dashboard.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/unixcf-dashboard.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 2bf2afb7..00000000
--- a/swamid-interfederations-2.0/unixcf-dashboard.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unixcf-dashboard.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "UNIX Configuration Management" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T12:26:40Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC9zCCAd+gAwIBAgIJAKaFa4lYpIB2MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
- BAMTEHVuaXhjZi1kYXNoYm9hcmQwHhcNMTQwMTE3MTYxMzQ4WhcNMjQwMTE1MTYx
- MzQ4WjAbMRkwFwYDVQQDExB1bml4Y2YtZGFzaGJvYXJkMIIBIjANBgkqhkiG9w0B
- AQEFAAOCAQ8AMIIBCgKCAQEAv6L44IqVxK/kXkUnEcYJWaQqcU74J9Us6klg6Cej
- bFobfyB153YL3p+z3YrKrR76lkorq1mMI7HzQRtY7/zS8MYcRCJ8tSUTn7kl1e58
- sKhtrZQx+AD8s9psVXOmvY14gNcHpopxFPP0YSDZZ9fXEbMMKe90uifIVgtYUJ1F
- pVXtVGlMNfkNCYIoRZ3W7SZfNyLrh4Pln3wfmrq4H88p87iOWR15bD0RrNem6Dmw
- 23S+1B5Jfmq9gBtbAfvWMTHKYvAVKdb6FiMqhgZYVnpaKFR4L6/6pGWKUpruiT6N
- sRdMf/4HiroLM01UFO6RqwBpdsHO4vIl75+xuNuVMVT/1QIDAQABoz4wPDAbBgNV
- HREEFDASghB1bml4Y2YtZGFzaGJvYXJkMB0GA1UdDgQWBBQHJiHCjypHSHHvQ6Eo
- LoxDG3y5WDANBgkqhkiG9w0BAQUFAAOCAQEAMqel3aPjEp8SnR9uHkFnPwY2q/pQ
- vK90yVVPEp/PKku9eVY1e+RTOWtU5tHEFVarNRQkYvt0X5hd1dviAlP050iT0uvB
- T+EYgksNWHFxuGWk8SnBpZV3IgRkR1LDUSWHJ/SA+jqnC4murMtNST/GsRD85jtY
- KUPm/ZOpK0cCEXYVfFHydSJh12OYiakWHe18r5dCgo2T1gp2eXP3DTNqv8wk0WWp
- xV+1vGZ8Dq6SFgu3TBMZNfV+i7XLFjL9N3v0IqdB/X3af31p0g80MZM0Joke5qdn
- Z5uf9JoMygnz9Kz3wYvDRPfly1p4CdkQzjoZNS/QDV+N2r8pywu7aB3zLQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://unixcf-dashboard.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University UNIX Configuration Management</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unixcf3.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/unixcf3.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 44d03996..00000000
--- a/swamid-interfederations-2.0/unixcf3.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unixcf3.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a 'Puppet Monitoring Server' Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-01T11:42:38Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAJyninR6kr6tMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB3VuaXhjZjMwHhcNMTIwOTI4MTI1MDM2WhcNMjIwOTI2MTI1MDM2WjASMRAw
- DgYDVQQDEwd1bml4Y2YzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- tYCa+QHC4k1vkgx1v2EMJp0F5GcV5xRy6nchPRZTH9VltVV5g7ougon/RTXZIY83
- Kb3JbF+NwDb2iMmxAMVT5wOBTadm04ykO3I/PlC701vESdWHPUAeai0Vge9UeaN4
- UKlxb9cXLLtU7cvPmdYP1xaCttRPPpHYQu5PugOUFT690LJJdF5GPnIaDAKq1hwL
- HUaAkClSjpIbdugZqU3CLX8HX6tXIU2AW3oVNLd2oB62woGgd5OypfryEXZOOB1j
- T5oJ5K0icR6YB8rOW2mrnucEAiV95WBT5t0c05Ww9Xy9SsLKvLQqpjM9GUyxWv/n
- 6AOrd7ovbI4Wl0mDsBQ08wIDAQABozUwMzASBgNVHREECzAJggd1bml4Y2YzMB0G
- A1UdDgQWBBTeIbIddxPtCB34lN+XDK5UA08k2TANBgkqhkiG9w0BAQUFAAOCAQEA
- p5wsK+6hc47VVmL8ijLpkhUB1JxXSGxvh0ZgqRJ/dH4ns4iO7+EenJPc9PRHPpgS
- ipnLiMuln3VRUMYC0JwYDVQOrB3CgOPyBvuCe9Fxb4aLsdQB/+p8r2Ulq9ET3eyP
- Es0j42hGLaUA1qZdMJlgneqxIn54GA/vD60ZmWjn7KjdmUgrsQjP4fcn7EoMcUSt
- hSDMdSheE3582GYswmo1iD7yuuMru7kJjSbTuahTsiMML4hF+Mzn8TCylM7NciQP
- /udvWA2L7WE7JzsWf8sYqmSgyCUAclb3Rul2sBf1wgVuY/IVJt7YqykhuKFWCI3Q
- /0F3hXBHElSU4+R/iW7ptA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://unixcf3.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Puppet Monitoring Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unixmon.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/unixmon.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index bc6a4f03..00000000
--- a/swamid-interfederations-2.0/unixmon.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unixmon.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is the unixmon Shibboleth 2 SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-07T15:11:27Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAIp/Z6ewPDfVMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB3VuaXhtb24wHhcNMTMwMzI4MDg1MDU3WhcNMjMwMzI2MDg1MDU3WjASMRAw
- DgYDVQQDEwd1bml4bW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 4/8Lhw0l97TM64sxqfY5T+AMCARoCo7HiCWJL/GiBr3Cht3Hyqda8DX17fkjB7uI
- x3GL2x00nIXcNniP9tk5XtsGtl+k8DhsXErl7mdKUXHX7tzqUSJ4XPY3bx0c6vfK
- AhIlLS/wMeQ5MwuIYqRdkGzff/DYmJ0Pp9kTYTI21ky//HlKK5rXLTUP9fTrq2Pw
- Bd7K8uoPpZBTCMRbrT5l08qPgwOSHdPMresxOrbYPXpOEEOFyQtxeSgsfjb7SM71
- 6wzfaJokNAEnBXPGRiZczHxNobI46fSsZFoMd+fKqUuaDDzih92/ZiM3m6bmHSlk
- hSEIO9xjkAKS0jNYjatcBQIDAQABozUwMzASBgNVHREECzAJggd1bml4bW9uMB0G
- A1UdDgQWBBS/SPb7cKJGRWGVQmut7KAg//OhyTANBgkqhkiG9w0BAQUFAAOCAQEA
- U/HZ/f860uuEnGCPQCfn/UOrbZCHhcZdxv0luP5yQfAOWMWnZUG4XpFul9oSiDO/
- cYwOup/JE8WOBA2lbMfVMd7rkjZgvHdensKS0tHHRWvnKgfCEdgW/ei9VWAMCsOq
- 9Jn6KCUakcery4IFpu2doUrJgkb1jT4cmoWYZ1Tl5N1QUXRSL55Mb7Wvs1k+QGrB
- PoM/Dr84wlgvAYXcWGxFrVdPnaFkbtcBRftCQpW8xw+TVcRRvCQT756c5V9iYKze
- 5Pkgx7pDzDfOY9obm4e1XQl/T4QSbYxHarWxh3SHlAuY2QlnSrnk9EI4nff9Af21
- J4yzc98UTxOqHc0LZIbIhw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAIp/Z6ewPDfVMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB3VuaXhtb24wHhcNMTMwMzI4MDg1MDU3WhcNMjMwMzI2MDg1MDU3WjASMRAw
- DgYDVQQDEwd1bml4bW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 4/8Lhw0l97TM64sxqfY5T+AMCARoCo7HiCWJL/GiBr3Cht3Hyqda8DX17fkjB7uI
- x3GL2x00nIXcNniP9tk5XtsGtl+k8DhsXErl7mdKUXHX7tzqUSJ4XPY3bx0c6vfK
- AhIlLS/wMeQ5MwuIYqRdkGzff/DYmJ0Pp9kTYTI21ky//HlKK5rXLTUP9fTrq2Pw
- Bd7K8uoPpZBTCMRbrT5l08qPgwOSHdPMresxOrbYPXpOEEOFyQtxeSgsfjb7SM71
- 6wzfaJokNAEnBXPGRiZczHxNobI46fSsZFoMd+fKqUuaDDzih92/ZiM3m6bmHSlk
- hSEIO9xjkAKS0jNYjatcBQIDAQABozUwMzASBgNVHREECzAJggd1bml4bW9uMB0G
- A1UdDgQWBBS/SPb7cKJGRWGVQmut7KAg//OhyTANBgkqhkiG9w0BAQUFAAOCAQEA
- U/HZ/f860uuEnGCPQCfn/UOrbZCHhcZdxv0luP5yQfAOWMWnZUG4XpFul9oSiDO/
- cYwOup/JE8WOBA2lbMfVMd7rkjZgvHdensKS0tHHRWvnKgfCEdgW/ei9VWAMCsOq
- 9Jn6KCUakcery4IFpu2doUrJgkb1jT4cmoWYZ1Tl5N1QUXRSL55Mb7Wvs1k+QGrB
- PoM/Dr84wlgvAYXcWGxFrVdPnaFkbtcBRftCQpW8xw+TVcRRvCQT756c5V9iYKze
- 5Pkgx7pDzDfOY9obm4e1XQl/T4QSbYxHarWxh3SHlAuY2QlnSrnk9EI4nff9Af21
- J4yzc98UTxOqHc0LZIbIhw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: unixmon</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Helpline</GivenName>
- <EmailAddress>mailto:webmaster@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Caleb</GivenName>
- <SurName>Racey</SurName>
- <EmailAddress>mailto:Caleb.Racey@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unixwiki.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/unixwiki.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index e9d99bc7..00000000
--- a/swamid-interfederations-2.0/unixwiki.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unixwiki.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2.2.1 SP for Newcastle University's Unix Team's Wiki Server.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3zCCAcegAwIBAgIJAO+eX7F92rrmMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
- BAMTCHVuaXh3aWtpMB4XDTEwMDQyOTEyNDkyOFoXDTIwMDQyNjEyNDkyOFowEzER
- MA8GA1UEAxMIdW5peHdpa2kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQC+j3q3earXCRp/wvqrPjPb6Y/NkijjmdPl+kVg26PNVduYxCQh9Lnq0T66qiMu
- IhCIrxjARpDnzIzoEK5Sz4Uolk5pCFoSYsCaw2yiQlJUICOX8dEPFvge6EghPDYj
- 7Jw3vrDB0Sl+azEfeuecJIKepG8je/0OlRyNebF8T/gKVwXOTB3Kuw9V5qvBc6xK
- fnEjz1L8XQpd9oNXEaxfAnbCf34tQjnoNrkKTQuQ6Xj1TzZckGzLZ/ggdiJDr3AS
- ijDr2DBeWJNDoyspGM/e1nbmD6OdZRFJDZuSIj3v0bZUGf+oaxaxtZhav9qEObHF
- 9YLH7mAjI22NB9nTkgb6aNhhAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHVuaXh3aWtp
- MB0GA1UdDgQWBBT6B3ta9/yLVNLIAy/6/v4fbS2ptjANBgkqhkiG9w0BAQUFAAOC
- AQEAm2hsfZfOdpFffRObF9b8VJ7jDDGWGlAoYbwJpZgT/zzje2cM2L1w3ksSfUJE
- qKwiZBD5+W5hx/eVHrf8jPcGgDAWxX28NzD9rBnJcsOfZJyiZste2wRmFY/DnGti
- RgnRzNk+SAI593wJtVsAVuSc0UWS/bLG00A8S5CFzPb4q1+QNKhvI77MTgVZyrDO
- Zl1GM6wFN2gjhlv7n97K7tzrnSABVuc3PBKkqxNFneM6euOBne3ZhGJLlobygXh/
- em/xqYVIOazlfsdzpHHEgrqs3WE2dgmQZ72K5MacodR1NjeGcrgR8pbcMNagMWN5
- 3GMMKIPtzAuoDj+uhYePsNWhhQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3zCCAcegAwIBAgIJAO+eX7F92rrmMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
- BAMTCHVuaXh3aWtpMB4XDTEwMDQyOTEyNDkyOFoXDTIwMDQyNjEyNDkyOFowEzER
- MA8GA1UEAxMIdW5peHdpa2kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQC+j3q3earXCRp/wvqrPjPb6Y/NkijjmdPl+kVg26PNVduYxCQh9Lnq0T66qiMu
- IhCIrxjARpDnzIzoEK5Sz4Uolk5pCFoSYsCaw2yiQlJUICOX8dEPFvge6EghPDYj
- 7Jw3vrDB0Sl+azEfeuecJIKepG8je/0OlRyNebF8T/gKVwXOTB3Kuw9V5qvBc6xK
- fnEjz1L8XQpd9oNXEaxfAnbCf34tQjnoNrkKTQuQ6Xj1TzZckGzLZ/ggdiJDr3AS
- ijDr2DBeWJNDoyspGM/e1nbmD6OdZRFJDZuSIj3v0bZUGf+oaxaxtZhav9qEObHF
- 9YLH7mAjI22NB9nTkgb6aNhhAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHVuaXh3aWtp
- MB0GA1UdDgQWBBT6B3ta9/yLVNLIAy/6/v4fbS2ptjANBgkqhkiG9w0BAQUFAAOC
- AQEAm2hsfZfOdpFffRObF9b8VJ7jDDGWGlAoYbwJpZgT/zzje2cM2L1w3ksSfUJE
- qKwiZBD5+W5hx/eVHrf8jPcGgDAWxX28NzD9rBnJcsOfZJyiZste2wRmFY/DnGti
- RgnRzNk+SAI593wJtVsAVuSc0UWS/bLG00A8S5CFzPb4q1+QNKhvI77MTgVZyrDO
- Zl1GM6wFN2gjhlv7n97K7tzrnSABVuc3PBKkqxNFneM6euOBne3ZhGJLlobygXh/
- em/xqYVIOazlfsdzpHHEgrqs3WE2dgmQZ72K5MacodR1NjeGcrgR8pbcMNagMWN5
- 3GMMKIPtzAuoDj+uhYePsNWhhQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://unixwiki.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Unix Team's Wiki Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml b/swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml
deleted file mode 100644
index 85e45d15..00000000
--- a/swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:dk.ibistic.net">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIE3jCCA8agAwIBAgIKVFd/+wAAAAAAVTANBgkqhkiG9w0BAQUFADBoMR0wGwYDVQQKExRJYmlzdGljIFRlY2hub2xvZ2llczEUMBIGA1UECxMLaWJpc3RpYy5uZXQxMTAvBgNVBAMTKEliaXN0aWMgU2VydmljZXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTEwOTEyMTI0MjI0WhcNMzYwMjEwMTEyMzUxWjCBkzELMAkGA1UEBhMCREsxHTAbBgNVBAoTFEliaXN0aWMgVGVjaG5vbG9naWVzMRMwEQYDVQQLEwpPcGVyYXRpb25zMSswKQYDVQQDEyJJYmlzdGljIFNzbyAtIFNlY29uZGFyeSBkYXRhY2VudGVyMSMwIQYJKoZIhvcNAQkBFhRpdGFkbWluc0BpYmlzdGljLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALOlseCtQInKCW4gm1g9z/1wWo7eqr3qhYAgRW/YFD05wO+aP2Q82AF5qXIzJnI+bmi6UIK8WGU0MwcpAfwmY7E4G0kiqxvkY8w+a0eS0bB/9BEP0wGNHCABi5F0k5gccq1gAroHO8KHrvxwC2QdF5bpOtmc5yZhn39F6vW1CMa+1e4szXLRfnNEUcAC9BfP8TBZ468/2n8bAgCooXw6NeLTEsLYWF9ZUtd7oQCoM8Vzh9EQYiP/bkNjI3Espr3IqmsjBU92LND2FCZMd0VnP+09WBALPPqecICSxwU/g0pEBD9gJffoaLB4pr9ytHj345dfZA5gZbFJus83D6bhb8sCAwEAAaOCAVwwggFYMA4GA1UdDwEB/wQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDAjAdBgNVHQ4EFgQUEA1cOFio+1n2Gl51vXhc6BxHIeowHwYDVR0jBBgwFoAUk5xu2Q3v2+7MptSjR6/WlKEwYAUwgeIGCCsGAQUFBwEBBIHVMIHSMIHPBggrBgEFBQcwAoaBwmxkYXA6Ly8vQ049SWJpc3RpYyUyMFNlcnZpY2VzJTIwQ2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1pYmlzdGljLERDPWxvY2FsP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0aW9uQXV0aG9yaXR5MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAK+rMn969MQZW98WhCuixX80SxDO7eARBJ2IY6aZRQ/seo/GD4qbis23CqZy7BI20nlcgnVEW4mZY+LkeBJ5sHDOTL9R2oo90/LouMsDsvqYk4oL5PtIH1yMTUod6ZUsGCvY6iXs06zY7KXJWPM5PeDg/z07GsmEhWELiQ+OeXG5UFlgzvt0uFuqE3iRpvKP6NztxDPNx4nhFXh2DIVg1f+pMXRRF8jM5mXSXsD144IvpEkgyHL5CkSRcxNNZt3UPAZl54e6cDfWI6aSQdH2v/TcoeeEJcHPBL3PFeQEtypZTHYdhPdhai0fcKsSNcZ4Ed1qAOwORlC0CorwiXeB57A=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIE3jCCA8agAwIBAgIKVFd/+wAAAAAAVTANBgkqhkiG9w0BAQUFADBoMR0wGwYDVQQKExRJYmlzdGljIFRlY2hub2xvZ2llczEUMBIGA1UECxMLaWJpc3RpYy5uZXQxMTAvBgNVBAMTKEliaXN0aWMgU2VydmljZXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTEwOTEyMTI0MjI0WhcNMzYwMjEwMTEyMzUxWjCBkzELMAkGA1UEBhMCREsxHTAbBgNVBAoTFEliaXN0aWMgVGVjaG5vbG9naWVzMRMwEQYDVQQLEwpPcGVyYXRpb25zMSswKQYDVQQDEyJJYmlzdGljIFNzbyAtIFNlY29uZGFyeSBkYXRhY2VudGVyMSMwIQYJKoZIhvcNAQkBFhRpdGFkbWluc0BpYmlzdGljLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALOlseCtQInKCW4gm1g9z/1wWo7eqr3qhYAgRW/YFD05wO+aP2Q82AF5qXIzJnI+bmi6UIK8WGU0MwcpAfwmY7E4G0kiqxvkY8w+a0eS0bB/9BEP0wGNHCABi5F0k5gccq1gAroHO8KHrvxwC2QdF5bpOtmc5yZhn39F6vW1CMa+1e4szXLRfnNEUcAC9BfP8TBZ468/2n8bAgCooXw6NeLTEsLYWF9ZUtd7oQCoM8Vzh9EQYiP/bkNjI3Espr3IqmsjBU92LND2FCZMd0VnP+09WBALPPqecICSxwU/g0pEBD9gJffoaLB4pr9ytHj345dfZA5gZbFJus83D6bhb8sCAwEAAaOCAVwwggFYMA4GA1UdDwEB/wQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDAjAdBgNVHQ4EFgQUEA1cOFio+1n2Gl51vXhc6BxHIeowHwYDVR0jBBgwFoAUk5xu2Q3v2+7MptSjR6/WlKEwYAUwgeIGCCsGAQUFBwEBBIHVMIHSMIHPBggrBgEFBQcwAoaBwmxkYXA6Ly8vQ049SWJpc3RpYyUyMFNlcnZpY2VzJTIwQ2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1pYmlzdGljLERDPWxvY2FsP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0aW9uQXV0aG9yaXR5MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAK+rMn969MQZW98WhCuixX80SxDO7eARBJ2IY6aZRQ/seo/GD4qbis23CqZy7BI20nlcgnVEW4mZY+LkeBJ5sHDOTL9R2oo90/LouMsDsvqYk4oL5PtIH1yMTUod6ZUsGCvY6iXs06zY7KXJWPM5PeDg/z07GsmEhWELiQ+OeXG5UFlgzvt0uFuqE3iRpvKP6NztxDPNx4nhFXh2DIVg1f+pMXRRF8jM5mXSXsD144IvpEkgyHL5CkSRcxNNZt3UPAZl54e6cDfWI6aSQdH2v/TcoeeEJcHPBL3PFeQEtypZTHYdhPdhai0fcKsSNcZ4Ed1qAOwORlC0CorwiXeB57A=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dk.ibistic.net/redirector/saml/post/ac" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">Ibistic</md:ServiceName>
- <md:ServiceName xml:lang="da">Ibistic</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-ibistic-prod-services.ibistic.net.xml b/swamid-interfederations-2.0/urn-ibistic-prod-services.ibistic.net.xml
deleted file mode 100644
index 89a35ef1..00000000
--- a/swamid-interfederations-2.0/urn-ibistic-prod-services.ibistic.net.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>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</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>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</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
- <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml b/swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml
deleted file mode 100644
index 7d8ae01c..00000000
--- a/swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cnrs.fr:janus.dsi.cnrs.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-10T22:03:54Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnrs.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">CNRS</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIICrzCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJGUjEN
-MAsGA1UEChMEQ05SUzEQMA4GA1UECxMHTU9ZMTY3ODEaMBgGA1UEAxMRamFudXMu
-ZHNpLmNucnMuZnIwHhcNMDkwNzA2MTM0NTQ5WhcNMjkwNzAxMTM0NTQ5WjBKMQsw
-CQYDVQQGEwJGUjENMAsGA1UEChMEQ05SUzEQMA4GA1UECxMHTU9ZMTY3ODEaMBgG
-A1UEAxMRamFudXMuZHNpLmNucnMuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAMWYVMjJRPP/YAq9wTJDr9rkLfm8VpnK/8MM8c2YqVtewBqnOgnlo0k0n7oC
-jnkwpmTa0Wycgbx4wek3TeaDG49KrKlSD2HlyvelLvlMuFXYTyqndBk+7p+RX+h3
-FjC+qqCUWHzEIfWwNNGNrnLza4WHsb0B5oJZMqB7WSfcpL/5AgMBAAGjgaQwgaEw
-HQYDVR0OBBYEFAIowpwjXZw7sNhsQhBxv4ISaaHKMHIGA1UdIwRrMGmAFAIowpwj
-XZw7sNhsQhBxv4ISaaHKoU6kTDBKMQswCQYDVQQGEwJGUjENMAsGA1UEChMEQ05S
-UzEQMA4GA1UECxMHTU9ZMTY3ODEaMBgGA1UEAxMRamFudXMuZHNpLmNucnMuZnKC
-AQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCIdgOBuDJQ5nr/kb+u
-oxlXkk9jwQcsmEgAteIhzE9+tA1PLXJ6di60PMq839lcm8v4gVxk/JtWJzrVY1pi
-m+gmLH30NygYX8ACokRdLMvL5FQHBsbQN1VTwmXKYCnWoYtSMauaxr+eUhVDjg/s
-pV1Gt+/saN/LhZGKd3NLvfjacQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://janus.dsi.cnrs.fr/shibboleth-idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.dsi.cnrs.fr/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.dsi.cnrs.fr/shibboleth-idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">CNRS</OrganizationName>
- <OrganizationDisplayName xml:lang="en">CNRS</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>ListeAdminUNIX@dsi.cnrs.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml
deleted file mode 100644
index 588cba0d..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:ens-lsh.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-13T13:13:51Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lsh.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">ENS Lettres et Sciences humaines</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDQzCCAiugAwIBAgIUaXDeZKLpq89kivZfZ//X0NfeRUYwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIuZW5zLWxzaC5mcjAeFw0wOTA0MjQw
-ODEyMDFaFw0yOTA0MjQwODEyMDFaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmVu
-cy1sc2guZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHNMjdxzFx
-mWO63iu8QH+lMEXiDOjrr8PU+GRKVmThf1S5HZKruPa6l+9gV2mpeKOVDaQTgbGG
-sHui63HhNt4zzV55IXP9j+NHRyHkEpASXQKDeHLCTCHfs1QKmZKk3IfFcWqCCgVU
-byWjqv0vMf1g8/+RjDOpsb0eSU7De6rfPr/T/Rig7LqHH+O8ylB1g9pSaWW/oL5W
-qD+65djAlzlajlL/vmXE5UblgxnPvIpmltpQaRbUCbdJgTDchnRjE3LCFmwaSO7n
-FcBD4JEnYPe7BOqJv/DQcSNpAK/k5r5emnuCQAAh7wmlw+jmbiCFI78wkqBTAmrO
-ASkoj819hENJAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmVucy1s
-c2guZnKGLWh0dHBzOi8vc2hpYmJvbGV0aDIuZW5zLWxzaC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUo7Hd+mlHXBsrwd5DdoQxDGXouzwwDQYJKoZIhvcNAQEF
-BQADggEBABWfdOgzwxn6Goz9jU/IOk74GkGkeeVxsIKsS4OiXZyGC7ATMRk2kGPA
-vgF+2XUURWXsb93mjdkC7YyHDXTgBFUYsX8tv20j5MjDOBQI4l9XVoJ6cOyxfG2+
-aNLgjEEAYeu7n1bZCU+9mMeeqHnB8f4ovM4r1PdkBT2ttmUX7dU+coPLa/JetOTO
-AVXxYRZY4ty/dx2KdOetIcmD8UypcRVAmkry27l6ybWBEA8vqwPn78jFJeS/s92m
-ALjg3wnfawAlwRtGLxUhf9n7igtjhjrKRL9WVVnMPg08GpB6IDRzNedWjIhE8gmo
-beyt/O7UlYCwegLabizFFtOY7ztDocU=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.ens-lsh.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.ens-lsh.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.ens-lsh.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lsh.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDQzCCAiugAwIBAgIUaXDeZKLpq89kivZfZ//X0NfeRUYwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIuZW5zLWxzaC5mcjAeFw0wOTA0MjQw
-ODEyMDFaFw0yOTA0MjQwODEyMDFaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmVu
-cy1sc2guZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHNMjdxzFx
-mWO63iu8QH+lMEXiDOjrr8PU+GRKVmThf1S5HZKruPa6l+9gV2mpeKOVDaQTgbGG
-sHui63HhNt4zzV55IXP9j+NHRyHkEpASXQKDeHLCTCHfs1QKmZKk3IfFcWqCCgVU
-byWjqv0vMf1g8/+RjDOpsb0eSU7De6rfPr/T/Rig7LqHH+O8ylB1g9pSaWW/oL5W
-qD+65djAlzlajlL/vmXE5UblgxnPvIpmltpQaRbUCbdJgTDchnRjE3LCFmwaSO7n
-FcBD4JEnYPe7BOqJv/DQcSNpAK/k5r5emnuCQAAh7wmlw+jmbiCFI78wkqBTAmrO
-ASkoj819hENJAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmVucy1s
-c2guZnKGLWh0dHBzOi8vc2hpYmJvbGV0aDIuZW5zLWxzaC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUo7Hd+mlHXBsrwd5DdoQxDGXouzwwDQYJKoZIhvcNAQEF
-BQADggEBABWfdOgzwxn6Goz9jU/IOk74GkGkeeVxsIKsS4OiXZyGC7ATMRk2kGPA
-vgF+2XUURWXsb93mjdkC7YyHDXTgBFUYsX8tv20j5MjDOBQI4l9XVoJ6cOyxfG2+
-aNLgjEEAYeu7n1bZCU+9mMeeqHnB8f4ovM4r1PdkBT2ttmUX7dU+coPLa/JetOTO
-AVXxYRZY4ty/dx2KdOetIcmD8UypcRVAmkry27l6ybWBEA8vqwPn78jFJeS/s92m
-ALjg3wnfawAlwRtGLxUhf9n7igtjhjrKRL9WVVnMPg08GpB6IDRzNedWjIhE8gmo
-beyt/O7UlYCwegLabizFFtOY7ztDocU=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ens-lsh.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">ENS Lettres et Sciences humaines</OrganizationName>
- <OrganizationDisplayName xml:lang="en">ENS Lettres et Sciences humaines</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <SurName>Christophe Girard</SurName>
- <EmailAddress>Christophe.Girard@ens-lsh.fr</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Christelle Chaput</SurName>
- <EmailAddress>Christelle.Chaput@ens-lsh.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml
deleted file mode 100644
index 7085f9db..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:montpellier.iufm.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-08T18:22:46Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier.iufm.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">IUFM de Montpellier</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDZjCCAk6gAwIBAgIVALjF/HJMRzFhyx4QUhGQtfnc/go0MA0GCSqGSIb3DQEB
-BQUAMCkxJzAlBgNVBAMTHmZlZGVyYXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjAe
-Fw0wOTExMTcxNDM1NTdaFw0yOTExMTcxNDM1NTdaMCkxJzAlBgNVBAMTHmZlZGVy
-YXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAIk8UoESjzWA4bGzXWSC96Uc5Y3F2GkWNMcAzqkpEjT6dvY8hWsv
-pSThfyGbsndBb6sUxdsKzkOcq9jgPG5SbKQH7FCf1aGMdrr67g3lYXBo/61N1zoS
-IZ27qCMSWWXKEuCM1J8+XGlKO+v/2NGhhy/y/MGCoq/dVS1CEpQR2WmuZ7T85YGX
-t/8juhUog6qx9luXRp4Vn8AtPjBf8Wx4fa+1fHk2EsbOK+TNmc2S8QMDhrdwEmTO
-FtlLzVzqwTBMCZK6nvuWccjJLQbPqFzpBS7gMNy9Nbc+MCHs2VPEFottHirNCHle
-/dVue+/vEaJnoGat6gNF+xe/OaFUS6aYl78CAwEAAaOBhDCBgTBgBgNVHREEWTBX
-gh5mZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnKGNWh0dHBzOi8vZmVkZXJh
-dGlvbi5tb250cGVsbGllci5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
-BBSSscKMzM8vdFU0r4f8rJnlUjXhRjANBgkqhkiG9w0BAQUFAAOCAQEADkTGJNdk
-VCmgQLEKNXBwLmjzKEaXVN0oDkycey2WzqnVFErveI5WUtUwbyTX6gvX34495dHf
-PpOEHBqBsTLug4ecwWrfurwupVHEpnHXQISO3MfTFuASxSkKg7jCWG1yslmdR6ua
-+EYRyYeZT7PsLRDvvsSHfgs29dx+L20LOqTv7KZ2q24TEEjQpzg0umSvfJH6iSwe
-k4efOHibLlXTz1Di9jVrchyw0Ix95i2tRAhkw9MLw37NX7hw73quN3/V1Tg8vNoW
-UwfIvWcdU+rI3r0sj0XzUxvuWt2E34dY7iRDZMqs9x1IBcLg00oRH3Hc2jvF6Ytw
-R4xWKyqWIGnn4g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEdTCCA12gAwIBAgICDKYwDQYJKoZIhvcNAQEEBQAwUDELMAkGA1UEBhMCRlIx
-DDAKBgNVBAoTA0NSVTETMBEGA1UEAxMKYWMtc2VydmV1cjEeMBwGCSqGSIb3DQEJ
-ARYPY2EtYWRtaW5AY3J1LmZyMB4XDTA3MDIwOTEzNDEwMFoXDTEwMDIwOTEzNDEw
-MFowdDELMAkGA1UEBhMCRlIxETAPBgNVBAoTCDAzNDE4MThTMScwJQYDVQQDEx5m
-ZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnIxKTAnBgkqhkiG9w0BCQEWGmlu
-Zm9ybUBtb250cGVsbGllci5pdWZtLmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCzkuQU982HLqlyiPNS1KhtfTw3F94aI+GELkvvRy+rtR7z0J9yZy4DfsqW
-OM6rTmWNfw5RafnX5UAoyoNvvvP8f9BMmJ7jQE45D+Q3yzgHmHF2F1tL92eTz7we
-AhaPlZiOXdQO5IBI6LAruUGs5wRdper+6u6lbB+j6z7ylajO1wIDAQABo4IBtzCC
-AbMwDAYDVR0TAQH/BAIwADARBglghkgBhvhCAQEEBAMCBsAwDgYDVR0PAQH/BAQD
-AgXgMCwGCWCGSAGG+EIBDQQfFh1DZXJ0aWZpY2F0IHNlcnZldXIgYWMtc2VydmV1
-cjAdBgNVHQ4EFgQU5hAjNm223ufj8bnpCHS7Gm6wCKswdwYDVR0jBHAwboAUcQc/
-B7Tpf84zBWgE8jSmUL6s9qChU6RRME8xCzAJBgNVBAYTAkZSMQwwCgYDVQQKEwND
-UlUxEjAQBgNVBAMTCWFjLXJhY2luZTEeMBwGCSqGSIb3DQEJARYPY2EtYWRtaW5A
-Y3J1LmZyggEDMEsGA1UdHwREMEIwQKA+oDyGOmh0dHA6Ly9pZ2MuY3J1LmZyL2Nn
-aS1iaW4vbG9hZGNybD9DQT1hYy1zZXJ2ZXVyJmZvcm1hdD1ERVIwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCME4GA1UdIARHMEUwQwYOKQMGAQQAAbdfAwEE
-AAQwMTAvBggrBgEFBQcCARYjaHR0cDovL2lnYy5jcnUuZnIvcmVmZXJlbmNlcy9w
-Yy5wZGYwDQYJKoZIhvcNAQEEBQADggEBAMdTx24FtReSqJ4TpDYYHkLQFp3m1lNn
-wwTJXDsmqyuVgG+UDC/2ob3M/fB3ffV7trmBMYDp/36SK9sdOM+KAeJTkFbDiBVr
-O0uozxNSHj13VqGw7UHcFCX1AykmoYCrSDVL2U8NovZsb9lZfu+dI9JtvLDAF0Sq
-3BCJEzlOjHfwWq8rzQYzhXKVeXRZ3nKd1iKLQdg1biltlbgh+IXzj0P9W++TBSEa
-7XBGhp2qum5kAy76u2NwWcunMJM7fmExJF+SjGUXtKQ6wxnXQ1zcAJ7atuyPPfEA
-ST1d3qLq8ftDvKa7Edva60Iw8nCcEd5b4I7ZSlYhFpX7KlK/HNZu6Mk=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.montpellier.iufm.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier.iufm.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDZjCCAk6gAwIBAgIVALjF/HJMRzFhyx4QUhGQtfnc/go0MA0GCSqGSIb3DQEB
-BQUAMCkxJzAlBgNVBAMTHmZlZGVyYXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjAe
-Fw0wOTExMTcxNDM1NTdaFw0yOTExMTcxNDM1NTdaMCkxJzAlBgNVBAMTHmZlZGVy
-YXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAIk8UoESjzWA4bGzXWSC96Uc5Y3F2GkWNMcAzqkpEjT6dvY8hWsv
-pSThfyGbsndBb6sUxdsKzkOcq9jgPG5SbKQH7FCf1aGMdrr67g3lYXBo/61N1zoS
-IZ27qCMSWWXKEuCM1J8+XGlKO+v/2NGhhy/y/MGCoq/dVS1CEpQR2WmuZ7T85YGX
-t/8juhUog6qx9luXRp4Vn8AtPjBf8Wx4fa+1fHk2EsbOK+TNmc2S8QMDhrdwEmTO
-FtlLzVzqwTBMCZK6nvuWccjJLQbPqFzpBS7gMNy9Nbc+MCHs2VPEFottHirNCHle
-/dVue+/vEaJnoGat6gNF+xe/OaFUS6aYl78CAwEAAaOBhDCBgTBgBgNVHREEWTBX
-gh5mZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnKGNWh0dHBzOi8vZmVkZXJh
-dGlvbi5tb250cGVsbGllci5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
-BBSSscKMzM8vdFU0r4f8rJnlUjXhRjANBgkqhkiG9w0BAQUFAAOCAQEADkTGJNdk
-VCmgQLEKNXBwLmjzKEaXVN0oDkycey2WzqnVFErveI5WUtUwbyTX6gvX34495dHf
-PpOEHBqBsTLug4ecwWrfurwupVHEpnHXQISO3MfTFuASxSkKg7jCWG1yslmdR6ua
-+EYRyYeZT7PsLRDvvsSHfgs29dx+L20LOqTv7KZ2q24TEEjQpzg0umSvfJH6iSwe
-k4efOHibLlXTz1Di9jVrchyw0Ix95i2tRAhkw9MLw37NX7hw73quN3/V1Tg8vNoW
-UwfIvWcdU+rI3r0sj0XzUxvuWt2E34dY7iRDZMqs9x1IBcLg00oRH3Hc2jvF6Ytw
-R4xWKyqWIGnn4g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEdTCCA12gAwIBAgICDKYwDQYJKoZIhvcNAQEEBQAwUDELMAkGA1UEBhMCRlIx
-DDAKBgNVBAoTA0NSVTETMBEGA1UEAxMKYWMtc2VydmV1cjEeMBwGCSqGSIb3DQEJ
-ARYPY2EtYWRtaW5AY3J1LmZyMB4XDTA3MDIwOTEzNDEwMFoXDTEwMDIwOTEzNDEw
-MFowdDELMAkGA1UEBhMCRlIxETAPBgNVBAoTCDAzNDE4MThTMScwJQYDVQQDEx5m
-ZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnIxKTAnBgkqhkiG9w0BCQEWGmlu
-Zm9ybUBtb250cGVsbGllci5pdWZtLmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCzkuQU982HLqlyiPNS1KhtfTw3F94aI+GELkvvRy+rtR7z0J9yZy4DfsqW
-OM6rTmWNfw5RafnX5UAoyoNvvvP8f9BMmJ7jQE45D+Q3yzgHmHF2F1tL92eTz7we
-AhaPlZiOXdQO5IBI6LAruUGs5wRdper+6u6lbB+j6z7ylajO1wIDAQABo4IBtzCC
-AbMwDAYDVR0TAQH/BAIwADARBglghkgBhvhCAQEEBAMCBsAwDgYDVR0PAQH/BAQD
-AgXgMCwGCWCGSAGG+EIBDQQfFh1DZXJ0aWZpY2F0IHNlcnZldXIgYWMtc2VydmV1
-cjAdBgNVHQ4EFgQU5hAjNm223ufj8bnpCHS7Gm6wCKswdwYDVR0jBHAwboAUcQc/
-B7Tpf84zBWgE8jSmUL6s9qChU6RRME8xCzAJBgNVBAYTAkZSMQwwCgYDVQQKEwND
-UlUxEjAQBgNVBAMTCWFjLXJhY2luZTEeMBwGCSqGSIb3DQEJARYPY2EtYWRtaW5A
-Y3J1LmZyggEDMEsGA1UdHwREMEIwQKA+oDyGOmh0dHA6Ly9pZ2MuY3J1LmZyL2Nn
-aS1iaW4vbG9hZGNybD9DQT1hYy1zZXJ2ZXVyJmZvcm1hdD1ERVIwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCME4GA1UdIARHMEUwQwYOKQMGAQQAAbdfAwEE
-AAQwMTAvBggrBgEFBQcCARYjaHR0cDovL2lnYy5jcnUuZnIvcmVmZXJlbmNlcy9w
-Yy5wZGYwDQYJKoZIhvcNAQEEBQADggEBAMdTx24FtReSqJ4TpDYYHkLQFp3m1lNn
-wwTJXDsmqyuVgG+UDC/2ob3M/fB3ffV7trmBMYDp/36SK9sdOM+KAeJTkFbDiBVr
-O0uozxNSHj13VqGw7UHcFCX1AykmoYCrSDVL2U8NovZsb9lZfu+dI9JtvLDAF0Sq
-3BCJEzlOjHfwWq8rzQYzhXKVeXRZ3nKd1iKLQdg1biltlbgh+IXzj0P9W++TBSEa
-7XBGhp2qum5kAy76u2NwWcunMJM7fmExJF+SjGUXtKQ6wxnXQ1zcAJ7atuyPPfEA
-ST1d3qLq8ftDvKa7Edva60Iw8nCcEd5b4I7ZSlYhFpX7KlK/HNZu6Mk=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">IUFM de Montpellier</OrganizationName>
- <OrganizationDisplayName xml:lang="en">IUFM de Montpellier</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>fed-admin@montpellier.iufm.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml
deleted file mode 100644
index c9ab4bdc..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:uhb.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-23T13:48:41Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhb.fr</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes2.fr</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-haute-bretagne.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Rennes 2 - Haute Bretagne</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIElDCCA3ygAwIBAgIQLdnpFQuu69xl9z7dAWPZhzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQwMjAwMDAwMFoXDTE2MDQwMTIzNTk1OVowSDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpzaGliYm9sZXRo
-LnVuaXYtcmVubmVzMi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKFFb2IxKCffcTQOFyEl2g99rJUdjkOchNMt7alge6/T4/wRxcl7G/2Q+DahU6s9
-i4lUCYFV9iKi7Ia2eYUfn69r3KjN9q+h2fbb/BMyKt6lZicqQkrU1Kk3NSzQWiCZ
-quB8hy8W8sW7qZ2kfgCR3AZ+0bHchCMwYTDI+MKe0NURzxf/PiqSWe8PvYo0fs6L
-RAqwLW6X6DOfF8CbOVlHf8MpUaFLXWn5XZ8iEMA4+EnaJ1uxMqVeLNqU1jTQqKni
-dQ+JFCZvMJqRtuXeVvBawkTsCh1JWAUU/2FcnD7RN340aLC5V3F3ZN3hZCjJiXv7
-boO5MMJpIJkbrtHJJw+Mo7kCAwEAAaOCAYowggGGMB8GA1UdIwQYMBaAFAy9k2gM
-896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSyIireJ6nPkGljLFuPuPxNpmdY7zAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwOAYDVR0RBDEwL4Iac2hpYmJvbGV0
-aC51bml2LXJlbm5lczIuZnKCEXNoaWJib2xldGgudWhiLmZyMA0GCSqGSIb3DQEB
-BQUAA4IBAQCgvAbpw5E3Kf9+PokHstck4ysikCjOebRAFilM9lu8xRc4lyuMTlr9
-eMdckFM3kO7wa6iiNPieFCnCsok8ZZ1wGI1qUkKYKE2DtxbEiTVfPtwQhnGQPDp4
-rnneYYlTeIQawTxr9kf+uwiaTKm1AGU1gMcT2tM9dfnQ+5Zt1DukJUWLMxq5upmz
-fhb8GprtsM8qv0z2+6Fat+iIu0GfmOaDZ/gDsW++cOD9P6K25GrdmVk20rC3oyy1
-OABUhu/g7vs9SnH4R/DZfgZ3U2WrVo8n/P9zcmNwfefBBC267M8I7c73wxZza+fb
-/K7h56t2aaVkVbRdvi8tEncI1Fzw5lq5
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uhb.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uhb.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uhb.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Rennes 2 - Haute Bretagne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Rennes 2 - Haute Bretagne</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>admin-unix@uhb.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml
deleted file mode 100644
index d40ba335..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:unice.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-08-07T17:06:18Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unice.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Nice-Sophia Antipolis - UNICE</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEfjCCA2agAwIBAgIQK5pZmStu+KqrJYOJR81rjjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDMyODAwMDAwMFoXDTE1MDMyODIzNTk1OVowXTELMAkGA1UE
-BhMCRlIxKTAnBgNVBAoTIFVOSVZFUlNJVEUgTklDRSBTT1BISUEgQU5USVBPTElT
-MQwwCgYDVQQLEwNEU0kxFTATBgNVBAMTDGlkcC51bmljZS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMIkuN4X1g+AUaePtx/CPvwT6jkVGwUkC8d3
-oxB/unX3ro66bdIEfIO+xePOyS/74i8Z0FqVpS0IzaA5bBTs6eCD4rhvio/eABqJ
-eKQWXNgqzJOSo1ALQmwgcu0yuzJPxMFK4WnYgbobs+PiRuZ50Sdg6kBOIYw9uIMI
-SeojiAXFjcWXMN69dEYOgzngJzD48tRLmab91YqlBxV8fOSXxjII29GOcOCVVgNN
-S/EDZWH4GiVk21tAOGOQCk9Yba6hSRBCONuNFQOcl56vMAkgnBFuVLL0e23t3lMI
-En6lkUF6e7sgA9Plqx40pJwglP8uAPhBdBkvnO+ecUKh2UaYZaECAwEAAaOCAV8w
-ggFbMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQv
-CXPMKuozAiWF4sbusopCVz3YLDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAXBgNVHREEEDAO
-ggxpZHAudW5pY2UuZnIwDQYJKoZIhvcNAQEFBQADggEBAIKDpaOBUHy14EHCqNCv
-ScM6d6MEqFzFZJ6Ivgg95BMro4ER/IJ++C+XAp5urJTT81ET/EicqOcC48c0YRfs
-/liIZZ8hIhLKjBTHuzWKGTW6beHFhbIgxfXaNvKrfL4l+0VW44jP8k73Igke1b1f
-48xNbhphqTxvud4q/rubPSY5cThxB8b3sGAY5omnk2WB5MXoU7lmrfHqhqsZlW1A
-6Pu0FsD/3LAE1+gukv18IWUlH3GCzPl6/wCHoqPzg/vAMtWNJyTsApn7GCrusG0Q
-UQTgz12SiPZLPPVl+GvhFvwfEweyCqyswQnjk2F0S5PisFlcrW6iAnBi1T6RcJfL
-dw0=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEfzCCA2egAwIBAgIQSotNoT7PriEYt2exFs1UFDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIxMjAwMDAwMFoXDTEyMDIxMjIzNTk1OVowXjELMAkGA1UE
-BhMCRlIxDTALBgNVBAcTBE5JQ0UxKTAnBgNVBAoTIFVOSVZFUlNJVEUgTklDRSBT
-T1BISUEgQU5USVBPTElTMRUwEwYDVQQDEwxpZHAudW5pY2UuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3qmnC1dm6p8MREZA89vNwF4LwqTIvWsZL
-FVUnHNHTAuQBVoyaU7XVRYNBj26GWYZ6uLsCBhIjBv61ooVini9644GufHLuUMgx
-+pR/v0Ho92w+MOENkLbEjwFF00szAmPEgK1PlLMFEOPpfC10z9VSnwUe0Xn316Kn
-DS5/c3Dhp3a2zmIr19JeNgme/Xj4FeLOU/e7ZpuALBqnoarActz3aifB46LwhUYz
-d0/SXbOHwIi9jpgE/Hrlg0TL+OpoIEJVjjaL5jyujMY6b9RPvbv9eOqERUUbT45y
-YNTimL0P4BQRpWToRl0IQYbEgCOGzyLd/wEn/ptCmxgCDrl/3CMdAgMBAAGjggFf
-MIIBWzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
-SlH8XEydtUtztNNGp80FE30LblIwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
-MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
-KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
-BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
-BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAw
-DoIMaWRwLnVuaWNlLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCk2KDWfolmFNEJy5OQ
-PMZ5EJVuJQi6b3wUQaGeBt6esfs333q4w57gQmm1dq1wmiZjsBUgN/d9CCPugK/9
-/KpoG4sUDEAo5Lx9GktpaRzG9dMbm6uQ07T1VZAHC9RiXuImRD1hOU1VPq1PlCDC
-9Uy7nl3o0ShOAjNX+e/cC3A+K8R3XYDsV9wYaTNSMvQrkmrW9M1t+Gt6KWC5DJcs
-VuYEmDLEXN09X2MBgHAwkTDgHlzhNSTXBBYoWVIDF+uuAyQxJl+D80moz+tE7c/x
-u5W/LMh8OtGE22Mm0hd7yB0U9sPfkobXWE25qkX8cGb3G7bTBGZN1QiQskwp6iCE
-mgL9
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unice.fr/renater/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unice.fr/renater/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unice.fr/renater/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unice.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEfjCCA2agAwIBAgIQK5pZmStu+KqrJYOJR81rjjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDMyODAwMDAwMFoXDTE1MDMyODIzNTk1OVowXTELMAkGA1UE
-BhMCRlIxKTAnBgNVBAoTIFVOSVZFUlNJVEUgTklDRSBTT1BISUEgQU5USVBPTElT
-MQwwCgYDVQQLEwNEU0kxFTATBgNVBAMTDGlkcC51bmljZS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMIkuN4X1g+AUaePtx/CPvwT6jkVGwUkC8d3
-oxB/unX3ro66bdIEfIO+xePOyS/74i8Z0FqVpS0IzaA5bBTs6eCD4rhvio/eABqJ
-eKQWXNgqzJOSo1ALQmwgcu0yuzJPxMFK4WnYgbobs+PiRuZ50Sdg6kBOIYw9uIMI
-SeojiAXFjcWXMN69dEYOgzngJzD48tRLmab91YqlBxV8fOSXxjII29GOcOCVVgNN
-S/EDZWH4GiVk21tAOGOQCk9Yba6hSRBCONuNFQOcl56vMAkgnBFuVLL0e23t3lMI
-En6lkUF6e7sgA9Plqx40pJwglP8uAPhBdBkvnO+ecUKh2UaYZaECAwEAAaOCAV8w
-ggFbMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQv
-CXPMKuozAiWF4sbusopCVz3YLDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAXBgNVHREEEDAO
-ggxpZHAudW5pY2UuZnIwDQYJKoZIhvcNAQEFBQADggEBAIKDpaOBUHy14EHCqNCv
-ScM6d6MEqFzFZJ6Ivgg95BMro4ER/IJ++C+XAp5urJTT81ET/EicqOcC48c0YRfs
-/liIZZ8hIhLKjBTHuzWKGTW6beHFhbIgxfXaNvKrfL4l+0VW44jP8k73Igke1b1f
-48xNbhphqTxvud4q/rubPSY5cThxB8b3sGAY5omnk2WB5MXoU7lmrfHqhqsZlW1A
-6Pu0FsD/3LAE1+gukv18IWUlH3GCzPl6/wCHoqPzg/vAMtWNJyTsApn7GCrusG0Q
-UQTgz12SiPZLPPVl+GvhFvwfEweyCqyswQnjk2F0S5PisFlcrW6iAnBi1T6RcJfL
-dw0=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEfzCCA2egAwIBAgIQSotNoT7PriEYt2exFs1UFDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIxMjAwMDAwMFoXDTEyMDIxMjIzNTk1OVowXjELMAkGA1UE
-BhMCRlIxDTALBgNVBAcTBE5JQ0UxKTAnBgNVBAoTIFVOSVZFUlNJVEUgTklDRSBT
-T1BISUEgQU5USVBPTElTMRUwEwYDVQQDEwxpZHAudW5pY2UuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3qmnC1dm6p8MREZA89vNwF4LwqTIvWsZL
-FVUnHNHTAuQBVoyaU7XVRYNBj26GWYZ6uLsCBhIjBv61ooVini9644GufHLuUMgx
-+pR/v0Ho92w+MOENkLbEjwFF00szAmPEgK1PlLMFEOPpfC10z9VSnwUe0Xn316Kn
-DS5/c3Dhp3a2zmIr19JeNgme/Xj4FeLOU/e7ZpuALBqnoarActz3aifB46LwhUYz
-d0/SXbOHwIi9jpgE/Hrlg0TL+OpoIEJVjjaL5jyujMY6b9RPvbv9eOqERUUbT45y
-YNTimL0P4BQRpWToRl0IQYbEgCOGzyLd/wEn/ptCmxgCDrl/3CMdAgMBAAGjggFf
-MIIBWzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
-SlH8XEydtUtztNNGp80FE30LblIwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
-MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
-KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
-BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
-BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAw
-DoIMaWRwLnVuaWNlLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCk2KDWfolmFNEJy5OQ
-PMZ5EJVuJQi6b3wUQaGeBt6esfs333q4w57gQmm1dq1wmiZjsBUgN/d9CCPugK/9
-/KpoG4sUDEAo5Lx9GktpaRzG9dMbm6uQ07T1VZAHC9RiXuImRD1hOU1VPq1PlCDC
-9Uy7nl3o0ShOAjNX+e/cC3A+K8R3XYDsV9wYaTNSMvQrkmrW9M1t+Gt6KWC5DJcs
-VuYEmDLEXN09X2MBgHAwkTDgHlzhNSTXBBYoWVIDF+uuAyQxJl+D80moz+tE7c/x
-u5W/LMh8OtGE22Mm0hd7yB0U9sPfkobXWE25qkX8cGb3G7bTBGZN1QiQskwp6iCE
-mgL9
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unice.fr:8443/renater/profile/SAML1/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Nice-Sophia Antipolis - UNICE</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Nice-Sophia Antipolis - UNICE</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <SurName>Jean-Charles GODIEN</SurName>
- <EmailAddress>Jean-Charles.Godien@unice.fr</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Richard Manas</SurName>
- <EmailAddress>Richard.Manas@unice.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml
deleted file mode 100644
index 6773be7a..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:unilim.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-03T17:29:36Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unilim.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Limoges</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNzCCAh+gAwIBAgIUCJLJlFRsGEvjGAk03CmBdGzPqAswDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTaWRlbnQtbmV3LnVuaWxpbS5mcjAeFw0xMTA0MDgwOTU1
-NDRaFw0zMTA0MDgwOTU1NDRaMB4xHDAaBgNVBAMTE2lkZW50LW5ldy51bmlsaW0u
-ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHrcGQOpTbOfurHfSP
-YaPZ/HFB3HJYouQKiNu3ZmG3f/jFB5MXJjjqA0ujs7Bgd6yq78ub/jQUANafNXFm
-r51YIHYLFWULQLBQEbN0wOj7q41UAi/Unw57WTQ7b878WGN1PF9IjrrQK5D7qxQD
-6B4rXYr0f6ke9RK6az0ukAESyvClxg2J9xLi+StcilwzD/hh1t4KkFcLCg7r7l+s
-MN+/NoDeiC9D5EI/GdVnAcyVhlBqH3lvhEAd2/d0coTs11IOcuNQV9UD7G1FZxVW
-XRgKEysU+9kwK0OJcXIO4ECr35MZZKJzp/qJ6sq1LVeGYW4ceSJphlKk1EBIPS2H
-VAj3AgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkZW50LW5ldy51bmlsaW0uZnKGKmh0
-dHBzOi8vaWRlbnQtbmV3LnVuaWxpbS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUORrgoAo4rJzB+VbHl2vNbQUkEYAwDQYJKoZIhvcNAQEFBQADggEBACJSI3QE
-HRMtzbd1h4fRrefD3DRSpg/W6nOEAFNseTeShU6xwBQPI/U+GGOCCPgNF1cdMSFB
-wnRPLlFjcNDfah2SznWI2yCjz/Lh4Zb+8xmWMUnQ/Rg5ECKahbMQY81xCWDVIOff
-fr3TPxIcSEJT8CRz7HhIqcnQ6Svuu+Aj6l0wx7lSa/45MhlxMC0gyQeWvjG9i1VO
-wixNzp6SP7pbBch2TajO9mKgGh15wzU/aO19dXpUO/bpAgNfcOlpd+LlRtQ6AaO+
-/rzAmJBWj5oXmNLIuWfDZDz9I6/SSJmsK3i8tTAKxKK3YslapJiwApPNPfAbH5Ac
-4dTyIRHkjWvItKk=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident2.unilim.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident2.unilim.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident2.unilim.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Limoges</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Limoges</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>fed-admin@unilim.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml
deleted file mode 100644
index 637e41ff..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-angers.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-23T11:48:50Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-angers.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">University of Angers</mdui:DisplayName>
- <mdui:Description xml:lang="en">Employees and students from the University of Angers</mdui:Description>
- <mdui:DisplayName xml:lang="fr">Université d'Angers</mdui:DisplayName>
- <mdui:Description xml:lang="fr">Les personnels et étudiants de l'Université d'Angers</mdui:Description>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUDCCAjigAwIBAgIVAMabeXzhOvplUR9r4t9fsuUrWixGMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudW5pdi1hbmdlcnMuZnIwHhcNMTQw
-NDE4MDY1MzI1WhcNMzQwNDE4MDY1MzI1WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-LnVuaXYtYW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-njrHW1QuXFlucp6z9Q5qwHBNer+ZquJPEs1detiZARHyigMJILaslGc8b6FwA+xC
-pam+vAnnhFVXLI7iR4G7chrAl0cpiuBLifK3uMFKo+a7NTOBT4N9UNSyWPuVoF23
-kq+cPptIw01BV4jp4A4QoZbfqr4ueeY3oujYi4HhAZS3Twh+EByeJb208XZJjE78
-pokPWU//uWpLdVWm+fq8X9HOBhyMaFqsbBV0pRI72rYiSUifPrws5EI6aWonLt9R
-59HcvN0bx+k3dlMgEBOx9y1B2189/8bLVAg1wM2zaKlyGMbmzlJ5PwzjVUAs5G/J
-EMaRfdVHCNiX3r33XO4ZYQIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-LnVuaXYtYW5nZXJzLmZyhjBodHRwczovL3NoaWJib2xldGgudW5pdi1hbmdlcnMu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAKn+28vOVV2v3JY1xRWVCTpRbI6
-MA0GCSqGSIb3DQEBBQUAA4IBAQB+45tSXigpVOHs6oJCae7LyB97FXb2w2TTkYsI
-XD1hgEszYlaxjEF1Y1+GYX9eC7EX+al9pil/3buaFHcd5hi7NeY8HBsNqTjXI8kr
-4/vaJqT/RhnWHb9ylDweiCtIDu6W2NjUw1zEehgtG1WbxeERvggVZw6p4B5U3WQ5
-EW8UH2uweFDWwfDBLnYAiX2IYiHzvR1+N1CHFXs1x7JeatpsHtOJeoaYfWDtBHVu
-R2mmF7L5xU2Vz6xEp0X4OUPKsBXAaRBFHs+2LIY+wAdwM3tjjUxCYgwp5uOoX2dk
-SIWEfxyrSc9yevZKOFUP04Oi4b6WcQbgRl5bIy6PHi2kYiRe
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDRDCCAiygAwIBAgIVAMHj2Cu/7KEX13/aTUHqdXfb3tFgMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmZyb250YWwudW5pdi1hbmdlcnMuZnIwHhcNMTAwOTA5
-MTAzMjQyWhcNMzAwOTA5MTAzMjQyWjAhMR8wHQYDVQQDExZmcm9udGFsLnVuaXYt
-YW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjIh2qi8D
-qFiSERXM4uugvV8s4OBCMbosII48TW6O0zG5KMtaLDnTDatBTchVONzQ7M5IEg/7
-nM90aocij3FZxWqDnV/o5A/MMuBoB8/J9oWgMVPnB+sBlixpQiWc5L/31HQgVPtL
-7AOuyC9xxldTx1e5kDBpW0QDyqZdtbApqAI0N4pCtrIKm8lYTYJ28eZQDUF7nu/h
-hw6HgSRY3qtCWnpkahaRziIFfsxyt1PJQSmaEdkHheFJWuoW8ptt3DwVn+ywBkX4
-EkZnBkuHZ3E5CMWXMz8WzfSqeJj+epi1vCDr80R6v7wKez7CWLt+uit7ZFyjjv+l
-zKa9OHlDCG52qQIDAQABo3MwcTBQBgNVHREESTBHghZmcm9udGFsLnVuaXYtYW5n
-ZXJzLmZyhi1odHRwczovL2Zyb250YWwudW5pdi1hbmdlcnMuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFJC10iOKAVjMBWfVlXG7viH4rneDMA0GCSqGSIb3DQEB
-BQUAA4IBAQBXoZx/uNmrVDdvRMUZL0ZVPP0XtHRngakIEi0ADSAh2zHAhvMgybDE
-W2EprWWG3CEltjt59/ugMV7y7/VkAuw2CMcFiKWGNYrlyXqx+u045lFxaB1VEkyH
-NFCBhYR00KhKcsyLZFGRhjJsRF8BrPPk4APrhMzKMm7yyysWgK8zaIx1G1vWG5FD
-e2SaH84F6OdHlwY/DFR+h6JFkH7FrBoJxKcnlCTL8NGhH2Kc15JweNdb7aTthrqb
-85iK6ee+lD481XBORDuJ9IueWi+kuDTSoTCP403vuFXe3SCMDi5ifHnw+7CH/jd8
-+2aam5wgFGGrA1qTjyQEFHulpuQ6mnIK
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-angers.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-angers.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUDCCAjigAwIBAgIVAMabeXzhOvplUR9r4t9fsuUrWixGMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudW5pdi1hbmdlcnMuZnIwHhcNMTQw
-NDE4MDY1MzI1WhcNMzQwNDE4MDY1MzI1WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-LnVuaXYtYW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-njrHW1QuXFlucp6z9Q5qwHBNer+ZquJPEs1detiZARHyigMJILaslGc8b6FwA+xC
-pam+vAnnhFVXLI7iR4G7chrAl0cpiuBLifK3uMFKo+a7NTOBT4N9UNSyWPuVoF23
-kq+cPptIw01BV4jp4A4QoZbfqr4ueeY3oujYi4HhAZS3Twh+EByeJb208XZJjE78
-pokPWU//uWpLdVWm+fq8X9HOBhyMaFqsbBV0pRI72rYiSUifPrws5EI6aWonLt9R
-59HcvN0bx+k3dlMgEBOx9y1B2189/8bLVAg1wM2zaKlyGMbmzlJ5PwzjVUAs5G/J
-EMaRfdVHCNiX3r33XO4ZYQIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-LnVuaXYtYW5nZXJzLmZyhjBodHRwczovL3NoaWJib2xldGgudW5pdi1hbmdlcnMu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAKn+28vOVV2v3JY1xRWVCTpRbI6
-MA0GCSqGSIb3DQEBBQUAA4IBAQB+45tSXigpVOHs6oJCae7LyB97FXb2w2TTkYsI
-XD1hgEszYlaxjEF1Y1+GYX9eC7EX+al9pil/3buaFHcd5hi7NeY8HBsNqTjXI8kr
-4/vaJqT/RhnWHb9ylDweiCtIDu6W2NjUw1zEehgtG1WbxeERvggVZw6p4B5U3WQ5
-EW8UH2uweFDWwfDBLnYAiX2IYiHzvR1+N1CHFXs1x7JeatpsHtOJeoaYfWDtBHVu
-R2mmF7L5xU2Vz6xEp0X4OUPKsBXAaRBFHs+2LIY+wAdwM3tjjUxCYgwp5uOoX2dk
-SIWEfxyrSc9yevZKOFUP04Oi4b6WcQbgRl5bIy6PHi2kYiRe
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDRDCCAiygAwIBAgIVAMHj2Cu/7KEX13/aTUHqdXfb3tFgMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmZyb250YWwudW5pdi1hbmdlcnMuZnIwHhcNMTAwOTA5
-MTAzMjQyWhcNMzAwOTA5MTAzMjQyWjAhMR8wHQYDVQQDExZmcm9udGFsLnVuaXYt
-YW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjIh2qi8D
-qFiSERXM4uugvV8s4OBCMbosII48TW6O0zG5KMtaLDnTDatBTchVONzQ7M5IEg/7
-nM90aocij3FZxWqDnV/o5A/MMuBoB8/J9oWgMVPnB+sBlixpQiWc5L/31HQgVPtL
-7AOuyC9xxldTx1e5kDBpW0QDyqZdtbApqAI0N4pCtrIKm8lYTYJ28eZQDUF7nu/h
-hw6HgSRY3qtCWnpkahaRziIFfsxyt1PJQSmaEdkHheFJWuoW8ptt3DwVn+ywBkX4
-EkZnBkuHZ3E5CMWXMz8WzfSqeJj+epi1vCDr80R6v7wKez7CWLt+uit7ZFyjjv+l
-zKa9OHlDCG52qQIDAQABo3MwcTBQBgNVHREESTBHghZmcm9udGFsLnVuaXYtYW5n
-ZXJzLmZyhi1odHRwczovL2Zyb250YWwudW5pdi1hbmdlcnMuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFJC10iOKAVjMBWfVlXG7viH4rneDMA0GCSqGSIb3DQEB
-BQUAA4IBAQBXoZx/uNmrVDdvRMUZL0ZVPP0XtHRngakIEi0ADSAh2zHAhvMgybDE
-W2EprWWG3CEltjt59/ugMV7y7/VkAuw2CMcFiKWGNYrlyXqx+u045lFxaB1VEkyH
-NFCBhYR00KhKcsyLZFGRhjJsRF8BrPPk4APrhMzKMm7yyysWgK8zaIx1G1vWG5FD
-e2SaH84F6OdHlwY/DFR+h6JFkH7FrBoJxKcnlCTL8NGhH2Kc15JweNdb7aTthrqb
-85iK6ee+lD481XBORDuJ9IueWi+kuDTSoTCP403vuFXe3SCMDi5ifHnw+7CH/jd8
-+2aam5wgFGGrA1qTjyQEFHulpuQ6mnIK
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université d'Angers</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université d'Angers</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>ddn-ssr@listes.univ-angers.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml
deleted file mode 100644
index 97160f69..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-lemans.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-16T12:04:57Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lemans.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université du Maine - Le Mans</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEBzCCAu+gAwIBAgIJAPJkjMeKwz+TMA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
-VQQGEwJmcjEUMBIGA1UECAwLdW5pdi1sZW1hbnMxEDAOBgNVBAcMB0xFIE1BTlMx
-HDAaBgNVBAoME1VOSVZFUlNJVEUgRFUgTUFJTkUxHDAaBgNVBAMME2lkcDIudW5p
-di1sZW1hbnMuZnIxJjAkBgkqhkiG9w0BCQEWF2ZlZC10ZWNoQHVuaXYtbGVtYW5z
-LmZyMB4XDTE0MDQxNDEwMDkzNFoXDTM0MDQxNDEwMDkzNFowgZkxCzAJBgNVBAYT
-AmZyMRQwEgYDVQQIDAt1bml2LWxlbWFuczEQMA4GA1UEBwwHTEUgTUFOUzEcMBoG
-A1UECgwTVU5JVkVSU0lURSBEVSBNQUlORTEcMBoGA1UEAwwTaWRwMi51bml2LWxl
-bWFucy5mcjEmMCQGCSqGSIb3DQEJARYXZmVkLXRlY2hAdW5pdi1sZW1hbnMuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBgciAAr1+6sMGIFgYHYju
-l57S7ReTKO8qbyJ6QfVfrzQHSspk+Hfx8FxLTlP1yR59mO0PmTL3zxJr9rXvIBzw
-G1HyzZw3K6QLL02u4SAFcQRET8CmlXKM18JbmyF+WyQ1xBGfzpHXQGszHVQ/TihW
-eEQat8D2ALVscAxxKpyFZsJWB9StyDPc/gYsqSU77GnXwun5p5SO10F2Ag+hWpzP
-Gj5hHn2KVQdqP/rdDryi6WNN3Nk1niyecbxpPkomGg8n3ZAojulNYsn8bVkMB9I0
-1+1OCGcr1IMDiZVADDQ9tdO6c/ftFZMUNsOayYXsQsDnaW7LbvSIABBPQvGuBLDx
-AgMBAAGjUDBOMB0GA1UdDgQWBBRt0PUs8HKbUTeuD+959t8js76s5jAfBgNVHSME
-GDAWgBRt0PUs8HKbUTeuD+959t8js76s5jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQArAai8yD7FfetenGqoPKTUt9fWdBN4tArGV++NydXdBjCC5E8S
-IML/iFVPuuCWC2kWI7b39UjnvrSCtzvkCjjcSA7ThkW9+0CdT6ohD8lh0TE34VQo
-UH4OnFMgI9iwhYEzJbcqDl3oGCtSLg482SU9YgdSLbSWQCYmJOWKtrnE5VGtHKba
-VAgkzA5irhs1FL1lhLrN0VP0Zl41cckZtAamNcc4xJ+HXPk0jCRtEIRdoBCF+4fL
-0Kczl19r1JsQ1/qYuSzYFoSeMonfQMzNswe2JMhVtem/X76sSLk9sXf/DGLBdxO5
-psTKLRse8C18pocxxBm/KWroiZrNIExoq6GB
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDODCCAiCgAwIBAgIVAOfG5aIZ6Aohb63NMTtvPZ3HLBWfMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcDIudW5pdi1sZW1hbnMuZnIwHhcNMTAwNDEyMTE1
-ODExWhcNMzAwNDEyMTE1ODExWjAeMRwwGgYDVQQDExNpZHAyLnVuaXYtbGVtYW5z
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmmABnRWyz2lm0ged
-F4Prv9GO+Z914ed7yVYJJi3jlCLejmkcDWpfTVm7rRalLX/3sO5KdE7dnXEBxdYf
-AluI409b9yNcDi8iTcRgQA233FnJxSkYf7yEKFVc5ZWhCvpbvda4NfxPHAi7E3LD
-1Rzji0PT+KYzElb/eTPmVl85LCeKK5aM9ILv8b5ziFC70t3JdaNsoXR0esC+5r8o
-nI80ICke0tibfbHrwlyldiJb/po9m9tSEB3i8NkEOgFXwz7X/fdGHur5gfJwvEXS
-MXzgSoq9DbpjWKR6/g46hABdmv8+C/+N+mxp4KehoyDcFPbED8pH9cqw9QtLKLgE
-SXy8uQIDAQABo20wazBKBgNVHREEQzBBghNpZHAyLnVuaXYtbGVtYW5zLmZyhipo
-dHRwczovL2lkcDIudW5pdi1sZW1hbnMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFMjVlzAX+5XMpiXoz2pkh/xv8xpAMA0GCSqGSIb3DQEBBQUAA4IBAQB+5SH/
-ygI70ba2rP2hmL3klQ1md/zIaK7p3MOOkDy5lkIH31oI6lIFTrKyZg7ML19gMVeA
-uZhIO9ZWJDrFtBxgDGYeishp1zEctX+ExWuVU9rtWzgCQ7GlqpnJLDAjxCVotdTG
-oEa3NbsjuPm4R3FaHiEAcVWGun8edQztZ9PRGxk7KDsT7+omuABB80mrvtYHGNCZ
-lKgdL3SFqkTQMbBvs4ouAnxw++YMfvcqUtxZJZKIKF7QTPeDOPLHLwHEZl6yL/kl
-dkydWQ+SmHuq9+cAfmW7kzferGnkRoHvIPVNtgGNo7kvQieeLbnGrLYpRWeMFt3f
-4weH5Ji9r7v8/chk
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.univ-lemans.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.univ-lemans.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.univ-lemans.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université du Maine - Le Mans</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université du Maine - Le Mans</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>fed-tech@univ-lemans.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
deleted file mode 100644
index e7d74f5f..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-lille1.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-20T17:10:27Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université Lille 1, Sciences et Technologies</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMjCCAhqgAwIBAgIUFVDNOdEJbuHwIfdnn+cRYs6xfq0wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZyMB4XDTA5MTAwODA5MTU1
-NVoXDTI5MTAwODA5MTU1NVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZy
-MIIBITANBgkqhkiG9w0BAQEFAAOCAQ4AMIIBCQKCAQBsQS+H4uWYOep74yJQf5us
-pkTg19tZEZUjtqkUCBjLt1UJdH1hDiaK+/4qWudwEjcMDvnxBUL8xbIfDDJOXvgh
-bPKYRJMLTEBmBnt5dslkT46+47cTSPDqK748qbBzrucnbhHuWJ7mG9KG9qTXmiLi
-09uwCjeGjnnFu11CKKt1XMJ40/B55W2j1SXiqDHMbdbjRjhfyniVt9t3yp/b4IGh
-79UivcebLkPTpAjLp7TMG4VAUXq6oVwfCLkjH8kzZsO0MJ+IAeX0iTIULONw3E0E
-VAErKUj9FPV9C3zAlPL0oZomDrd0tu7CdreGZRz2u6DCT38XLsVbMumSnvfYFjBF
-AgMBAAGjazBpMEgGA1UdEQRBMD+CEmlkcC51bml2LWxpbGxlMS5mcoYpaHR0cHM6
-Ly9pZHAudW5pdi1saWxsZTEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYf
-a9RpwCPFriHOSMKJSQ9gQ6vzMA0GCSqGSIb3DQEBBQUAA4IBAQBBv8iK1b67jhuz
-ZT6LHjtmHgovO7Qa74jggtKblhiqHAMRZWPCep1fleDjR27rYSvfRGzdSug7tfbl
-EsPyeVqcyKJvD9GXPJuPs/s4VdQmKbldGbBuuFQU6WVGoBlZOXq7wjRMqKd15TK/
-6wE/J0J2TieuAJpFKd6oiPV3YT4ggn6G2lilP1rv2cX6a2qK/j82M7wTLg1rLe5e
-ocgQGRZdfk7m+u4pfrJr1Dsjy7uOjA0QWzfG5jPSFLV8DiliDDPejz+eDyaz2kib
-w3l6kfiJYiwyVlk+O2O5ocwTmZtnVvTo3KAvIZwluV6OKXJXB7+mkU5dPtXHmooU
-+HT9dOog
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lille1.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMjCCAhqgAwIBAgIUFVDNOdEJbuHwIfdnn+cRYs6xfq0wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZyMB4XDTA5MTAwODA5MTU1
-NVoXDTI5MTAwODA5MTU1NVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZy
-MIIBITANBgkqhkiG9w0BAQEFAAOCAQ4AMIIBCQKCAQBsQS+H4uWYOep74yJQf5us
-pkTg19tZEZUjtqkUCBjLt1UJdH1hDiaK+/4qWudwEjcMDvnxBUL8xbIfDDJOXvgh
-bPKYRJMLTEBmBnt5dslkT46+47cTSPDqK748qbBzrucnbhHuWJ7mG9KG9qTXmiLi
-09uwCjeGjnnFu11CKKt1XMJ40/B55W2j1SXiqDHMbdbjRjhfyniVt9t3yp/b4IGh
-79UivcebLkPTpAjLp7TMG4VAUXq6oVwfCLkjH8kzZsO0MJ+IAeX0iTIULONw3E0E
-VAErKUj9FPV9C3zAlPL0oZomDrd0tu7CdreGZRz2u6DCT38XLsVbMumSnvfYFjBF
-AgMBAAGjazBpMEgGA1UdEQRBMD+CEmlkcC51bml2LWxpbGxlMS5mcoYpaHR0cHM6
-Ly9pZHAudW5pdi1saWxsZTEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYf
-a9RpwCPFriHOSMKJSQ9gQ6vzMA0GCSqGSIb3DQEBBQUAA4IBAQBBv8iK1b67jhuz
-ZT6LHjtmHgovO7Qa74jggtKblhiqHAMRZWPCep1fleDjR27rYSvfRGzdSug7tfbl
-EsPyeVqcyKJvD9GXPJuPs/s4VdQmKbldGbBuuFQU6WVGoBlZOXq7wjRMqKd15TK/
-6wE/J0J2TieuAJpFKd6oiPV3YT4ggn6G2lilP1rv2cX6a2qK/j82M7wTLg1rLe5e
-ocgQGRZdfk7m+u4pfrJr1Dsjy7uOjA0QWzfG5jPSFLV8DiliDDPejz+eDyaz2kib
-w3l6kfiJYiwyVlk+O2O5ocwTmZtnVvTo3KAvIZwluV6OKXJXB7+mkU5dPtXHmooU
-+HT9dOog
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lille1.fr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université Lille 1, Sciences et Technologies</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université Lille 1, Sciences et Technologies</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <SurName>claude vieville</SurName>
- <EmailAddress>claude.vieville@univ-lille1.fr</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>brigitte wallaert</SurName>
- <EmailAddress>brigitte.wallaert@univ-lille1.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml
deleted file mode 100644
index 6043eba6..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-littoral.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-15T17:26:21Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-littoral.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université du Littoral Côte d'Opale</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEhTCCA22gAwIBAgIQM3C+kyGnfSc/kTiiA9+naTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxMDAwMDAwMFoXDTE2MDEwNTIzNTk1OVowXDELMAkGA1UE
-BhMCRlIxLjAsBgNVBAoMJVVuaXZlcnNpdMOpIGR1IExpdHRvcmFsIEPDtHRlIGQn
-T3BhbGUxHTAbBgNVBAMTFGlkcC51bml2LWxpdHRvcmFsLmZyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6Y8qpaVAflGpxbB3TnbUs5joUdDB0IVfB0fl
-ZJd3tjqgBEbLFtt7KPWZqmy2C7RsQEmOoSk6mtZAVzZ8BbudN+nE6nbiGSKQ1KIk
-adkMTm3ZtFAw1xpxcRzYnxAiOVTRjH9pZ8nSQ42eL7jXopqEzDOaPVF2GK89OzaE
-sH+LfjworttwEu7US4O2EOPD8OQ0fYozuDL1Rk3YWcPfeOzvPIf4htAipt2Vh0fP
-wsHBqBcF23UtYX+aUB4KQ0fpGOr5OTRycs0FjLHfpNVFZQSbP4SGcqVMbUk24Xnh
-HhbUovsCemIzzcvddaCN6esVX8Gun7v7YxQJiDpLxQZMpYtfMwIDAQABo4IBZzCC
-AWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFAXl
-Y/77ZkqLrPn2HgWzot+iF/5uMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
-AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
-YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
-AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
-KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaC
-FGlkcC51bml2LWxpdHRvcmFsLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBBUBAyoNKF
-lwkQYMHoAbYg2qSx1LJ/Od3kG6sPf6kXwkYJEvqCx3dPJnQeM+ZgUCs/o/y7WzvE
-gNQgYz5mNVN0GAUZ2EpnuybzUvTVm3fPcSs1aLjP3fxECkw10Cp++P0GFDXSHoqc
-KC6nNahBlNSK2SOr7E+tDC19AYGgI7aK/Kzr7SmePIhisdH/qup+b5XpguA0r1rq
-aWEV9NoSDZaqIJdSdKD9M5mWRV4z7RPQUTzW131WZUgTEjoWu7uLSf35wH1oAnxo
-we5qOyV4yEtVosxilJRh/BQNAwcQSAo/OMCjOPfzz0Vs8aUbukcnN122p23wbyPI
-HRSh/cWFEY7F
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEmTCCA4GgAwIBAgIQNpYV+0q076RVhq9vmZRQ+DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDEwNzAwMDAwMFoXDTEzMDEwNjIzNTk1OVowcDELMAkGA1UE
-BhMCRlIxEjAQBgNVBAcTCUR1bmtlcnF1ZTEuMCwGA1UECgwlVW5pdmVyc2l0w6kg
-ZHUgTGl0dG9yYWwgQ8O0dGUgZCdPcGFsZTEdMBsGA1UEAxMUaWRwLnVuaXYtbGl0
-dG9yYWwuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFN1xJBItC
-vBt4knmQ8KL9bIdE/Yv8EZJwUMmYf++f2b2RFjE2soBocszLWcZ+quqSbZDQPsY2
-JujFa8R3whpl08u7LcNTp6KLuh4yLYd/tDaGMMR71HVdKVCqrfJGlyjnW0DRBDRB
-rNkACsplQ8Wr1WkGYco23Vvrlwq4n+Qquth4Xekkle5G/BmSZF9+kVbsrYQaXUiI
-leRaR3wCvfyxKDy8XnbqrU+HaWvC6kows9RxmjCi9cYEWPHXS4qQ4HCDLc3p8CEX
-tUyNQf19DgZcb818aEslvoxynVe5pWbA2pab3J3B2DnIU5jx+Ehcn46SjUTKRb+J
-8ZsGaqUuEiYhAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUSD9mGXXrZO7cy8URPaeoW6aW2fMwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4Yp
-aHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYB
-BQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRl
-cmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLnVuaXYtbGl0dG9yYWwuZnIwDQYJKoZI
-hvcNAQEFBQADggEBAHqmDSP8dBvNyB/gjkjZ8UW2Adyc6Qgb58XpKcR81tbmsCeC
-9vF5IZFawucCNLXk7btI6YG3RRM9jMDIB1vLjWawqzv38OJcwGx45BeZdKAinjbP
-+CH5i6OymdC10ubFTt2fn0O/PB85r9UtrNghieDqx3rOmdnMenCp4iwj1K5OKDVE
-eWxjgJM/CWtaOwp/WWryTvTo85ZIvtgI6ejTSaDqHcJBftitunJawQrdixijaWpB
-RjIAXHurXBitq29gYTxwLspYLpYBWUykotkfhu19lZpmgQVF43Ll1saLE4EhB9tk
-PXRmrWMW/YbGP711MGAIUhDdGKBmZUWgZ73cI+I=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-littoral.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-littoral.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-littoral.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université du Littoral Côte d'Opale</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université du Littoral Côte d'Opale</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>fed-admin@univ-littoral.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml
deleted file mode 100644
index 65055196..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-lyon1.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-26T16:20:23Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lyon1.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Lyon 1 - Claude Bernard</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIErjCCA5agAwIBAgIRAJaT1KIfHVmld1Ki1N6X4JEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA0MjQwMDAwMDBaFw0xNjA0MjMyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLnVuaXYt
-bHlvbjEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtWeh0Zke9
-VBmOOwQUqf25+aw8KTGC/6gwSoj48vGDm6Oo0u8TiEplFSzBBd2CZK2A4vO2iNHz
-tlxBw01s9BDKIS4A9cnGTr9KQXbJj05BfPfwnlAhMexADwxKc24v3w2tZnALLRLp
-xD1tpfP3JRf2TDFCq1y1pVN0HplxNjWq7AT2bSJUmostjN4SXLVHg40boGJSc6b3
-c4CdvhkTa/PjCCkyNO1tVLTRgpQIUelsPAsgAbRlzH/S34s4GmmkL5oUAO0W2vnf
-0giExMB5QP4byQ+SFIJiaJw5ZrCe7RcxXZt1hFLCJ/0sX3oHDXZQJElF1FpDpt8S
-U/EB6tT8iVQhAgMBAAGjggGsMIIBqDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUE4rmZUoHIwpShp68L3WD9y55Ns4wDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMFoGA1UdEQRTMFGCEWlkcC51bml2LWx5b24xLmZy
-gh1kc2ktYXV0aC1pZHAtMDEudW5pdi1seW9uMS5mcoIdZHNpLWF1dGgtaWRwLTAy
-LnVuaXYtbHlvbjEuZnIwDQYJKoZIhvcNAQEFBQADggEBALIuJEuGICDAEKB10oVx
-GgSCfY2N00sOT860fZaylYXy96htcUDVvRoRZSo7OuRVk96f+U4HZRSEkvD3bhsX
-/oZUquuVhRbhPcSCe73Qz4sF+2B1wOg6CL5BE858+1eJOPAwK20JfnDmccQzvHoX
-3xa4LljRG+Z4OkdEuDNzYmAgXHMkA2IORjN8uvySFMP03wweZsyL5fBgA0IT8Qke
-VqZtCnPLGw0lpJMz0tCH9WZRMyNTtYJzW0GThz2c3fyHHDNY0vwKTq8nB7Pjfrx3
-EIUd53kRJ1997x3KgQj/cLYxglqpnTSxvDbGXuXUEIZHPxwbk9mlLnyXNhPHQc/w
-sE4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEzTCCA7WgAwIBAgIQDpHzR56it3k1iP23BSdZxjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDUwNTAwMDAwMFoXDTEzMDUwNDIzNTk1OVowbTELMAkGA1UE
-BhMCRlIxFTATBgNVBAcTDFZpbGxldXJiYW5uZTEqMCgGA1UECgwhVW5pdmVyc2l0
-w6kgTHlvbiAxIENsYXVkZSBCZXJuYXJkMRswGQYDVQQDExJhdXRoLnVuaXYtbHlv
-bjEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0pbguRU4Yjru0
-zIAA9BAgNnYR2WmyTQHR0PdXmL6Tib/IMoSgZeNH742uP3AYlFsGRqhS0SD28OjB
-ZEbuL+OyZO9UvI6g5XOllI62qnN+J4n3rJP4NpBquUhack3Nch5qOqdHcrBfIANP
-+41V991u2SsqCTAEA8mN/rGy/oX+C6OFMKd6WLJv9e1k23WKAi1GOkVz2YaacMhY
-YvXtomDCyMrsU0Nivmh+N6OklZoqha+9XT37/Qr9pEsBw9KhZopx9W5kQzguX27N
-TrVCM4jJZz0INkSWmQ8HraoLO92C5Rj+N2KTojniZ8Yvtc+ID/t4OmHzgM/f/JnN
-TuLPpWslAgMBAAGjggGeMIIBmjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUQjRVTRrWuH87FAYSuQbVGNEixSswDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0
-cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUH
-AQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVu
-YS5vcmcwVgYDVR0RBE8wTYISYXV0aC51bml2LWx5b24xLmZyghFjYXMudW5pdi1s
-eW9uMS5mcoIRaWRwLnVuaXYtbHlvbjEuZnKCEXNzby51bml2LWx5b24xLmZyMA0G
-CSqGSIb3DQEBBQUAA4IBAQBnCANmoLIMKSGdqNR7PbrAIUXC2O8H4eYs9I+dpHgv
-+P52Xlsr5xRE+XH2SQYqdc0MCYuRz/f16AkaQv3QZ8LIWHYbpXAhEQRnPNz7xqHi
-DCqFI4WaxnrOmvvZXiUQSFP8yTLmVHc0jDd45I99lRgxSNTgocZBatK6QIzF4V0R
-xhJiASJIjpShZtNHNKAZ+inJuEzw4dkxxsmAxPadkrGbcatXBYWmuu/CSzkQ7R5F
-Zc9Pfq13d0fZ6k1NqSMN0rVrhbyPGYG1ImK1vhYzGuWtbBmpr8OtzGnAlp84MXP7
-1AMeI4u0CsqPYY5yGurJs5GHV9nsmWhGZrgmg5Yb4dOh
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lyon1.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon1.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon1.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Lyon 1 - Claude Bernard</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Lyon 1 - Claude Bernard</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>shibboleth@univ-lyon1.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
deleted file mode 100644
index 4e68cf6c..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-montp1.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-02T12:01:22Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp1.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Montpellier 1</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEhDCCA2ygAwIBAgIRAKpYore6nLYzJ1HYT2nH1gswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjA5MTgwMDAwMDBaFw0xNTA5MTgyMzU5NTlaMFUxCzAJBgNV
-BAYTAkZSMSIwIAYDVQQKDBlVbml2ZXJzaXTDqSBNb250cGVsbGllciAxMSIwIAYD
-VQQDExlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA1TylXSc95u78Z43vjEaVfFXrimIOL2g92d+HPKapzCFg
-rEZp91lPuKDlo9ryirOCoAvHpAZvkxb8mqqwiyetnRWKr3dawWLH+/TbdURt+oyO
-FLsa+VuQhIMWwfB86pYY5y0fhT1ghrE2w9TJyJxX7GORwcJ4iRXX+IDlaOyZaNhO
-JLo6ORgGUmLwrt7BSEmpuMyK0k5r4w+IcD6XZA7B7K8E/sJcgF8P4jtKSEAo6Rxj
-Udjc/4T8mbkUVWrteB6BQjgedM9iZ0UdBwgggfuH1HTOMYjVw3FcZtxTTbYWTXIC
-lsm6KiHArCyXm2R1BJBbUw8DJLY93mU6H61wpVLrhQIDAQABo4IBbDCCAWgwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFO+5OtvVKUU7
-jC5UIDKWpwe+czr6MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCQGA1UdEQQdMBuCGWZlZGVy
-YXRpb24udW5pdi1tb250cDEuZnIwDQYJKoZIhvcNAQEFBQADggEBAKl6lJSfuM5j
-6zTCkHtAkEf3mVENsIb+NX6DTTvfpDAWtp8XVxbc4z31PLpwvgprifGeSXqmRK1S
-3OXIOhARSMR2JYr/uJeoN/ihMSrYt980CWTHMXRQFpBjzvLWZj51vQds3akj1WYF
-PeoBbBeQkUQ9N+nN/8D0RbXW+jODNxc31m7YXHHP/mygS2SxcvccGoBpc62w6EV1
-sBOQY3TDmlBIfuv8MUWqlULjhOELiezkhOidHlaYBPEszFzwnKDtCzWlMv39Jbg5
-UUJVZH1qyRe9cvC+LBH/kmXE9pM8j5mTDqmzmYNsYm677gOGflojwgvwHIDg/j2L
-tMVy28FqAhY=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEmjCCA4KgAwIBAgIRAPySCVGZx84C0a/SjMDoFYUwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTEyMTAwMDAwMDBaFw0xMjEyMDkyMzU5NTlaMGsxCzAJBgNV
-BAYTAkZSMRQwEgYDVQQHEwtNb250cGVsbGllcjEiMCAGA1UECgwZVW5pdmVyc2l0
-w6kgTW9udHBlbGxpZXIgMTEiMCAGA1UEAxMZZmVkZXJhdGlvbi51bml2LW1vbnRw
-MS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU8pV0nPebu/GeN
-74xGlXxV64piDi9oPdnfhzymqcwhYKxGafdZT7ig5aPa8oqzgqALx6QGb5MW/Jqq
-sIsnrZ0Viq93WsFix/v023VEbfqMjhS7GvlbkISDFsHwfOqWGOctH4U9YIaxNsPU
-ycicV+xjkcHCeIkV1/iA5WjsmWjYTiS6OjkYBlJi8K7ewUhJqbjMitJOa+MPiHA+
-l2QOweyvBP7CXIBfD+I7SkhAKOkcY1HY3P+E/Jm5FFVq7XgegUI4HnTPYmdFHQcI
-IIH7h9R0zjGI1cNxXGbcU022Fk1yApbJuiohwKwsl5tkdQSQW1MPAyS2Pd5lOh+t
-cKVS64UCAwEAAaOCAWwwggFoMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBTvuTrb1SlFO4wuVCAylqcHvnM6+jAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAkBgNVHREEHTAbghlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMA0GCSqG
-SIb3DQEBBQUAA4IBAQBs719Xv+zweuNrvdoss2F0iOkIyyUp9dM5lHKU4gRqfgfo
-liHFw2K2kISgVEFN1LItH22Il/XQI/GmkCA77SIAFH4e56iavZXhLLXrTRItyEy7
-hytw5E1pOoujgA7muJHOVZC9YPKfxM0Jm+/+AYnvg0gx5XztpIhFiJNrfWCsa4B8
-bxjNOQD/A7ABQ8QB8o/SlbOg5JRvdicRxiJ8b1TJ+qC5amcwyIy2kSUKDlUCB5YG
-dxgENHByQ2jDFbk7bab8C0FqCTYvXDC3zVF3O8teAcLVVqgx77rxi0QaiXglSG5O
-blhyWpP4kTIvlkwJhn8FGdWa7UIrQP4W68yhBSIz
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp1.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEhDCCA2ygAwIBAgIRAKpYore6nLYzJ1HYT2nH1gswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjA5MTgwMDAwMDBaFw0xNTA5MTgyMzU5NTlaMFUxCzAJBgNV
-BAYTAkZSMSIwIAYDVQQKDBlVbml2ZXJzaXTDqSBNb250cGVsbGllciAxMSIwIAYD
-VQQDExlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA1TylXSc95u78Z43vjEaVfFXrimIOL2g92d+HPKapzCFg
-rEZp91lPuKDlo9ryirOCoAvHpAZvkxb8mqqwiyetnRWKr3dawWLH+/TbdURt+oyO
-FLsa+VuQhIMWwfB86pYY5y0fhT1ghrE2w9TJyJxX7GORwcJ4iRXX+IDlaOyZaNhO
-JLo6ORgGUmLwrt7BSEmpuMyK0k5r4w+IcD6XZA7B7K8E/sJcgF8P4jtKSEAo6Rxj
-Udjc/4T8mbkUVWrteB6BQjgedM9iZ0UdBwgggfuH1HTOMYjVw3FcZtxTTbYWTXIC
-lsm6KiHArCyXm2R1BJBbUw8DJLY93mU6H61wpVLrhQIDAQABo4IBbDCCAWgwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFO+5OtvVKUU7
-jC5UIDKWpwe+czr6MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCQGA1UdEQQdMBuCGWZlZGVy
-YXRpb24udW5pdi1tb250cDEuZnIwDQYJKoZIhvcNAQEFBQADggEBAKl6lJSfuM5j
-6zTCkHtAkEf3mVENsIb+NX6DTTvfpDAWtp8XVxbc4z31PLpwvgprifGeSXqmRK1S
-3OXIOhARSMR2JYr/uJeoN/ihMSrYt980CWTHMXRQFpBjzvLWZj51vQds3akj1WYF
-PeoBbBeQkUQ9N+nN/8D0RbXW+jODNxc31m7YXHHP/mygS2SxcvccGoBpc62w6EV1
-sBOQY3TDmlBIfuv8MUWqlULjhOELiezkhOidHlaYBPEszFzwnKDtCzWlMv39Jbg5
-UUJVZH1qyRe9cvC+LBH/kmXE9pM8j5mTDqmzmYNsYm677gOGflojwgvwHIDg/j2L
-tMVy28FqAhY=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEmjCCA4KgAwIBAgIRAPySCVGZx84C0a/SjMDoFYUwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTEyMTAwMDAwMDBaFw0xMjEyMDkyMzU5NTlaMGsxCzAJBgNV
-BAYTAkZSMRQwEgYDVQQHEwtNb250cGVsbGllcjEiMCAGA1UECgwZVW5pdmVyc2l0
-w6kgTW9udHBlbGxpZXIgMTEiMCAGA1UEAxMZZmVkZXJhdGlvbi51bml2LW1vbnRw
-MS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU8pV0nPebu/GeN
-74xGlXxV64piDi9oPdnfhzymqcwhYKxGafdZT7ig5aPa8oqzgqALx6QGb5MW/Jqq
-sIsnrZ0Viq93WsFix/v023VEbfqMjhS7GvlbkISDFsHwfOqWGOctH4U9YIaxNsPU
-ycicV+xjkcHCeIkV1/iA5WjsmWjYTiS6OjkYBlJi8K7ewUhJqbjMitJOa+MPiHA+
-l2QOweyvBP7CXIBfD+I7SkhAKOkcY1HY3P+E/Jm5FFVq7XgegUI4HnTPYmdFHQcI
-IIH7h9R0zjGI1cNxXGbcU022Fk1yApbJuiohwKwsl5tkdQSQW1MPAyS2Pd5lOh+t
-cKVS64UCAwEAAaOCAWwwggFoMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBTvuTrb1SlFO4wuVCAylqcHvnM6+jAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAkBgNVHREEHTAbghlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMA0GCSqG
-SIb3DQEBBQUAA4IBAQBs719Xv+zweuNrvdoss2F0iOkIyyUp9dM5lHKU4gRqfgfo
-liHFw2K2kISgVEFN1LItH22Il/XQI/GmkCA77SIAFH4e56iavZXhLLXrTRItyEy7
-hytw5E1pOoujgA7muJHOVZC9YPKfxM0Jm+/+AYnvg0gx5XztpIhFiJNrfWCsa4B8
-bxjNOQD/A7ABQ8QB8o/SlbOg5JRvdicRxiJ8b1TJ+qC5amcwyIy2kSUKDlUCB5YG
-dxgENHByQ2jDFbk7bab8C0FqCTYvXDC3zVF3O8teAcLVVqgx77rxi0QaiXglSG5O
-blhyWpP4kTIvlkwJhn8FGdWa7UIrQP4W68yhBSIz
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML1/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Montpellier 1</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Montpellier 1</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>fed-admin@univ-montp1.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
deleted file mode 100644
index 34abce37..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-montp3.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-23T15:18:07Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp3.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Montpellier 3</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEhzCCA2+gAwIBAgIQBUjO9AwbhRtr7tjGUg65IjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTExMDIzNTk1OVowYDELMAkGA1UE
-BhMCRlIxNDAyBgNVBAoMK1VuaXZlcnNpdMOpIGRlIE1vbnRwZWxsaWVyIElJSSBQ
-YXVsLVZhbMOpcnkxGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALZpRdTpeBT0QYYouJQgkJ8LsaGs/23e
-olnt9n23TfoECwAYnGNcK7+SeNPemO7gngsyU07ckiuuaxN19scxvIJ26Zi5a44s
-R1sIBNkTS9WL8bZeTBVZ3cwJMcMU/WyOG0MkzwuWfBSP0IihzvwWILDJgbz0BWTk
-L23+YPeRvsLcymStS9uNc9Cu5ak70LoCN8sEGVEAXilJP85cgMSLyJz33fK0ohsK
-6uIG4RVb8TdsVkZ5uWMAVZuiNKhwEHcLDPXIcZe9q7Wlz0sUrsrnN4GvpWCDk3oJ
-VhKQ95+4OYbC7iBGW7i0WyRNcG8zm0uHjwJAJAGHXKYHjRDcEBDZhFMCAwEAAaOC
-AWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQW
-BBT5oJbLv8ba7NKHSMXohclUTLaclDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
-BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzAN
-BgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
-BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
-MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREE
-FjAUghJpZHAudW5pdi1tb250cDMuZnIwDQYJKoZIhvcNAQEFBQADggEBAIxg44rF
-Ee0d90B3u9ZiGAhDOOKlU1TkVZ0fA7HFq6C+AYafAw9jac4sn8ZnYFZMHgZwvl6z
-OLW97uhQRL5MJ9w3ArZSQvumiD+DwVRn8V7bBN/mzUR/jIl3U4VQ9YcYk3vx2dzw
-+YnZGQLJGuiE9wcH5+Z3/oNBw9o5DB8juU9W/H/a2xGksZ8WbUnJW3kfcdIKqclr
-Ev9JomAr2LzGTLq7YTwT9nuN0PgFXNMI/aM3ci5ni9DEfmNdfk1qn7HZLLqLAtPH
-94QXFSgFfkI0r/NMpslNQGn0NKSFItkhJGX5Su0RFEmX8kjNpYt6oPlXW7Vr7389
-9m9urGFyfVe5MQM=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNDCCAhygAwIBAgIVAJwJ10KIuByUPhJVuj+7HqVzV+6RMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0wOTExMjQxMDE0
-MTNaFw0yOTExMjQxMDE0MTNaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMTccbqO8bGcrHNnBsYU
-BzWltaO1wKAcRrxca80YuL1OFrwtpBWEDgGE6cUPm7cL4ykHd24XzvbjUCNI7NBa
-C9XTU4LNE/A2k4X58Fx4HcQuefKctEun63MxVbjQVrlxH/Z/brtcHp/TSj0sYwNF
-CzBo1My09sCLtKbFNkmVguny94AJNW6MJHZCrud5C7fZLd6/+wJ+WryFhJw1tjxf
-hwsxQ3Y4024PWnHdAfyiLjS7I3AdyvsB0KiHRa8rmf75LxPCe3v6jZjGXbmG0ZUW
-7tQML4PBGm8WJKlXVLOEQnPxLR1kN/+a1ekGuza7jZY3TElPIP1cR3YbAZMD4o1a
-DYsCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnVuaXYtbW9udHAzLmZyhilodHRw
-czovL2lkcC51bml2LW1vbnRwMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-yZI0ysdigysg4IxXXXaXXJnQIxkwDQYJKoZIhvcNAQEFBQADggEBAGDmbv5WKi8X
-sX0lEJDbHWPHv9zV0DEZcgLDyUN6jzLkldcTNhc2nRY718X+CEMZjwUtGjyrZ6Nz
-ZrPxy1UTyhxNKBm6YDATPaI3JAKnEcd9P7I/an8M7dPBVLYYU7NxzILG4s4t8Rxu
-bRtWJ4K9jC1TiBxzd2RBiVEocAKIFceeJfUnpFkn8vEw76TYGF5rmRk6dWoMrjSs
-LhYBU3U0i6D4AqaPiT3/I7g50VJpzta9zid/fYOLcnSUYXIhkszm6dSG5BV3c57y
-MkXSNKdtjN34kK2zYFBN7AuP0uFcY+A17JFhotMTIrddHvqq4vTsnW4TBBJ+ulgu
-MTnHi6+rYEQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-montp3.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-montp3.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-montp3.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp3.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEhzCCA2+gAwIBAgIQBUjO9AwbhRtr7tjGUg65IjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTExMDIzNTk1OVowYDELMAkGA1UE
-BhMCRlIxNDAyBgNVBAoMK1VuaXZlcnNpdMOpIGRlIE1vbnRwZWxsaWVyIElJSSBQ
-YXVsLVZhbMOpcnkxGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALZpRdTpeBT0QYYouJQgkJ8LsaGs/23e
-olnt9n23TfoECwAYnGNcK7+SeNPemO7gngsyU07ckiuuaxN19scxvIJ26Zi5a44s
-R1sIBNkTS9WL8bZeTBVZ3cwJMcMU/WyOG0MkzwuWfBSP0IihzvwWILDJgbz0BWTk
-L23+YPeRvsLcymStS9uNc9Cu5ak70LoCN8sEGVEAXilJP85cgMSLyJz33fK0ohsK
-6uIG4RVb8TdsVkZ5uWMAVZuiNKhwEHcLDPXIcZe9q7Wlz0sUrsrnN4GvpWCDk3oJ
-VhKQ95+4OYbC7iBGW7i0WyRNcG8zm0uHjwJAJAGHXKYHjRDcEBDZhFMCAwEAAaOC
-AWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQW
-BBT5oJbLv8ba7NKHSMXohclUTLaclDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
-BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzAN
-BgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
-BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
-MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREE
-FjAUghJpZHAudW5pdi1tb250cDMuZnIwDQYJKoZIhvcNAQEFBQADggEBAIxg44rF
-Ee0d90B3u9ZiGAhDOOKlU1TkVZ0fA7HFq6C+AYafAw9jac4sn8ZnYFZMHgZwvl6z
-OLW97uhQRL5MJ9w3ArZSQvumiD+DwVRn8V7bBN/mzUR/jIl3U4VQ9YcYk3vx2dzw
-+YnZGQLJGuiE9wcH5+Z3/oNBw9o5DB8juU9W/H/a2xGksZ8WbUnJW3kfcdIKqclr
-Ev9JomAr2LzGTLq7YTwT9nuN0PgFXNMI/aM3ci5ni9DEfmNdfk1qn7HZLLqLAtPH
-94QXFSgFfkI0r/NMpslNQGn0NKSFItkhJGX5Su0RFEmX8kjNpYt6oPlXW7Vr7389
-9m9urGFyfVe5MQM=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNDCCAhygAwIBAgIVAJwJ10KIuByUPhJVuj+7HqVzV+6RMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0wOTExMjQxMDE0
-MTNaFw0yOTExMjQxMDE0MTNaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMTccbqO8bGcrHNnBsYU
-BzWltaO1wKAcRrxca80YuL1OFrwtpBWEDgGE6cUPm7cL4ykHd24XzvbjUCNI7NBa
-C9XTU4LNE/A2k4X58Fx4HcQuefKctEun63MxVbjQVrlxH/Z/brtcHp/TSj0sYwNF
-CzBo1My09sCLtKbFNkmVguny94AJNW6MJHZCrud5C7fZLd6/+wJ+WryFhJw1tjxf
-hwsxQ3Y4024PWnHdAfyiLjS7I3AdyvsB0KiHRa8rmf75LxPCe3v6jZjGXbmG0ZUW
-7tQML4PBGm8WJKlXVLOEQnPxLR1kN/+a1ekGuza7jZY3TElPIP1cR3YbAZMD4o1a
-DYsCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnVuaXYtbW9udHAzLmZyhilodHRw
-czovL2lkcC51bml2LW1vbnRwMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-yZI0ysdigysg4IxXXXaXXJnQIxkwDQYJKoZIhvcNAQEFBQADggEBAGDmbv5WKi8X
-sX0lEJDbHWPHv9zV0DEZcgLDyUN6jzLkldcTNhc2nRY718X+CEMZjwUtGjyrZ6Nz
-ZrPxy1UTyhxNKBm6YDATPaI3JAKnEcd9P7I/an8M7dPBVLYYU7NxzILG4s4t8Rxu
-bRtWJ4K9jC1TiBxzd2RBiVEocAKIFceeJfUnpFkn8vEw76TYGF5rmRk6dWoMrjSs
-LhYBU3U0i6D4AqaPiT3/I7g50VJpzta9zid/fYOLcnSUYXIhkszm6dSG5BV3c57y
-MkXSNKdtjN34kK2zYFBN7AuP0uFcY+A17JFhotMTIrddHvqq4vTsnW4TBBJ+ulgu
-MTnHi6+rYEQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-montp3.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Montpellier 3</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Montpellier 3</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>fed-admin@univ-montp3.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml
deleted file mode 100644
index 001a7c8c..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-nantes.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-02-23T15:56:05Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-nantes.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">University of Nantes (FRANCE)</mdui:DisplayName>
- <mdui:Description xml:lang="en">Students and staff belonging to University of Nantes</mdui:Description>
- <mdui:DisplayName xml:lang="fr">Université de Nantes</mdui:DisplayName>
- <mdui:Description xml:lang="fr">Etudiants et personnels de l'Université de Nantes</mdui:Description>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMzCCAhugAwIBAgIUXhtC9sGfg8MZ1QOlWpmnARmmHMYwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbmFudGVzLmZyMB4XDTA5MDMzMTA4MTA1
-OVoXDTI5MDMzMTA4MTA1OVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbmFudGVzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAktwRMpbzUDURWbJkTiTj
-24JSlknu7dufbohqxC5S5MDGpRx4kZFZFIy+adMWMV/DhS85ggU059xm4PGdoWSd
-nLfYxWNFma2elqpE4ErVbrRyo66m5wP3Xs2VCQQJqcb9YUM5+8yBU04yXAEPYGUv
-QX4R6F2J4K6l2xFlX95aHycjJoAqFq3EPkBs3B8svjK3DWZAYPQP0LbxI1VGvzDn
-Dkl4LrzwOPXTdGuJIQUWULWq1KV/RK9mdTTW7Xm5QBh61U1WQLl3EKJJUD5ziaq0
-KttLIND72IKHWYiU5YgC28J6J31BzI2L/TeKk0jmEJl34G6AJ/T82ulrpLZwzu3o
-1wIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1uYW50ZXMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtbmFudGVzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR0
-v7zvoB8/1wVaVqBJiix3/eDmPTANBgkqhkiG9w0BAQUFAAOCAQEAY7x0Byy9iv25
-8QhZ7CAD5B0ewKhgS1UO4wmr5UC9bpCAqLdJ1B0PyMZ1Bx3c/TzGloEBoGfiJLu5
-DXg61rAdqYa4ihIC5hXCpt9l02EWxWXintKDZ07kcG2aama1EBRh0s3usR8QzLyB
-giEcLiXmysSZgy1k/VAx2R5DaHimMFk9vJkTckprB/mSlB4aFFVtfsk6b6dxf0JY
-pF1bmgLeWzeQlAtCz8sNNPwXDvAVbBLLHXnOUa8V9TzhaPlInHHhUs6DLNdGml/9
-fLM8XuyqV7zxR0P8IGEgoEuNDgaBilEU3IeExFo/eOojuKJbQkV9w18Q5cxIzGPR
-9yMUR1nBIg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-nantes.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-nantes.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Nantes</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Nantes</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>shibboleth@univ-nantes.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
deleted file mode 100644
index 4e41d199..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-paris1.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-30T20:41:43Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris1.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université Paris 1 Panthéon-Sorbonne</mdui:DisplayName>
- <mdui:Description xml:lang="fr">Personnels, enseignants, chercheurs, étudiants, hébergés et invités de l'université Paris 1 Panthéon-Sorbonne</mdui:Description>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMzCCAhugAwIBAgIUN4OD7GwJor5x7X/cdaXgiF8OElUwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZyMB4XDTA5MDYzMDE4MjIx
-OFoXDTI5MDYzMDE4MjIxOFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk7DsGWWjsYm1Rn/nFfrg
-Ff25b3uadZLPdzBgYurzqIDAZ9Sc39MwxchyFmblmFSqb8vLHM36XKESMWUgmCO7
-5GOFv7AsxhbtcXgLVohVKS47ZkTXnSbjg3eUww7s51lirQViAuA8iqRAZvnvPMFa
-JAbiXe54SIuDI7SQlTfNhpWGUaooDMfmHrgMOkB8MFk0nFDfN1oefPGIUtQ4LKXl
-0Ua1paLUFF1Du76lakyiZ+ssZ3EkIy8pN1OssR/3rHmYDfqodgUeexSikB8IsdHp
-rNU+6NKfVzGQiZtjTT1cqMRBU7ElHtGyliuelZTGN2rWV9pxxDMBCVrCqvBM9yym
-PwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1wYXJpczEuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtcGFyaXMxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRs
-oNzyg0MZ2ce2hy2748tOvP/+LTANBgkqhkiG9w0BAQUFAAOCAQEAkyfipm/mh/Kt
-jiFkg7p4oQPJkqoBAMEhv1hNqf+8bWBcbhBwrkJUG/MfR3KWfHgnHexPU6Ri35aF
-NOFN5mNQvM8DSTdKvRhZV5cM9+s5x1WGSCnsBrRE/QcV0nhm5Kozlbkki93nPBOF
-YcX73QCPD/T1ewnjA8Pyh8rPoKrT9nOLAdxyENRCucOaXWMM8SAS3wcEuBPIrWX3
-0MjL6pTwDGdoRCZ36w+hP802gvZMKu6GlRudUVPdKa0DYqDcTicA5drs0TnuQnBU
-Q0868rBTfR4z8pLRKvaADmYGslrdNQaXIK9yzi9qzGFQrBUEKJboWW/6hUR7NXuM
-yutCRUw+eg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-paris1.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris1.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris1.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris1.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMzCCAhugAwIBAgIUN4OD7GwJor5x7X/cdaXgiF8OElUwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZyMB4XDTA5MDYzMDE4MjIx
-OFoXDTI5MDYzMDE4MjIxOFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk7DsGWWjsYm1Rn/nFfrg
-Ff25b3uadZLPdzBgYurzqIDAZ9Sc39MwxchyFmblmFSqb8vLHM36XKESMWUgmCO7
-5GOFv7AsxhbtcXgLVohVKS47ZkTXnSbjg3eUww7s51lirQViAuA8iqRAZvnvPMFa
-JAbiXe54SIuDI7SQlTfNhpWGUaooDMfmHrgMOkB8MFk0nFDfN1oefPGIUtQ4LKXl
-0Ua1paLUFF1Du76lakyiZ+ssZ3EkIy8pN1OssR/3rHmYDfqodgUeexSikB8IsdHp
-rNU+6NKfVzGQiZtjTT1cqMRBU7ElHtGyliuelZTGN2rWV9pxxDMBCVrCqvBM9yym
-PwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1wYXJpczEuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtcGFyaXMxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRs
-oNzyg0MZ2ce2hy2748tOvP/+LTANBgkqhkiG9w0BAQUFAAOCAQEAkyfipm/mh/Kt
-jiFkg7p4oQPJkqoBAMEhv1hNqf+8bWBcbhBwrkJUG/MfR3KWfHgnHexPU6Ri35aF
-NOFN5mNQvM8DSTdKvRhZV5cM9+s5x1WGSCnsBrRE/QcV0nhm5Kozlbkki93nPBOF
-YcX73QCPD/T1ewnjA8Pyh8rPoKrT9nOLAdxyENRCucOaXWMM8SAS3wcEuBPIrWX3
-0MjL6pTwDGdoRCZ36w+hP802gvZMKu6GlRudUVPdKa0DYqDcTicA5drs0TnuQnBU
-Q0868rBTfR4z8pLRKvaADmYGslrdNQaXIK9yzi9qzGFQrBUEKJboWW/6hUR7NXuM
-yutCRUw+eg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-paris1.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université Paris 1 Panthéon-Sorbonne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université Paris 1 Panthéon-Sorbonne</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>fed-admin@univ-paris1.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
deleted file mode 100644
index 1f5219ea..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-poitiers.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-18T10:46:20Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-poitiers.fr</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.univ-poitiers.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Poitiers</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEsDCCA5igAwIBAgIQUMcwKhTYAJRU4aUw5HaMrDANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzEwMjAyMzU5NTlaMEkxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbc2hpYmJvbGV0aC51
-bml2LXBvaXRpZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-1RVveanaMybAIRz/nZF/4XqBKU2rMLEbis9diusj/44VXzaRlXcjyfaoZa+SK8bI
-JQVsT/yGXI/WWaqhHXXaB0chqkrYfHZPdoYweFwTjynD1hJUhxamlGSBD30u0BPD
-7jTPKZxYvjwLJqppV9oZsCMSfWTznFotfBtmxIWMlF6bpR5c1foca0IL620MUzLC
-DBz4f0UyiWOL3kOkd4b8OauXR/YwfJiVckJjkk0F5WffPRDnDNj3/pLd+PFbhShS
-qT8gRkx7pF/XlJwTrXZMnQpcSNbY9XF6tkhaaLoA18XC7iWgsOhIjzJbDYuaFRQd
-XGlzCbWkM+dqX+vKPWgy8wIDAQABo4IBdzCCAXMwHwYDVR0jBBgwFoAUW9CKHJoy
-W+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFGvidQi286gq4y5V1p4rm72/NncwMA4G
-A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
-BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5B
-U1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-cnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlo
-dHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMCYGA1UdEQQfMB2CG3NoaWJib2xldGgu
-dW5pdi1wb2l0aWVycy5mcjANBgkqhkiG9w0BAQsFAAOCAQEAP4KsWoHSMRjZYLyu
-BuoF2RGmBsH02+QB9og6g6FBGEzSoFlKTonSOzSINKVI8hLSAG/AH0qEoscIRHkU
-tg1DWMbvz5m6vH3jBX35hjY9W2R2ajE0UBRXAjJG7duQ0t5qb5OlOO8OUcsVp8hq
-fZ321PY8oouA8yDBPL+G1k/Qf5rPZKfTG2l9CTjW3biiKHY8jyJBQIT8UQTFKX2j
-WxJcX4OyP3Ryyoc1e+ElHZdGRjKKpDd24hKUHiBtwaiio4jXRSzVw7dUUblKCMVN
-27h8pxrE4bUEWHkfxXKfWihDx6GPfk+exNY0mhn1Eunh288jAyt96C7uq2rXL9wg
-Yjdn9A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEhTCCA22gAwIBAgIQBJ1RI0pR2rrSRRLdVKx5rTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTAyMDAwMDAwMFoXDTE0MTAxOTIzNTk1OVowVTELMAkGA1UE
-BhMCRlIxIDAeBgNVBAoMF1VuaXZlcnNpdMOpIGRlIFBvaXRpZXJzMSQwIgYDVQQD
-ExtzaGliYm9sZXRoLnVuaXYtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC1XxY06+ZPTDJka2NP1PlhuHEcWC/21H1BsZGGrxbrHlbz
-s4sYedSqLpR3Zt9wsPrkXGnyIenQNG1v5u3UjTSal94cWpkuRJGXHxBzIqFlrgdP
-fFYHn97O4efhzE/vI5tCmX8goWN/o6dTYqCXI2p0zBg/QVmkSWsNbCxj/jx/V2eZ
-70lMqt5HdJKrAEEBx6Tfn1Ru4+8Bq4YovcSMDf72PBvasCxoQVrmeJ9sJhLopv2r
-4+Rp1PTyuHTd1byJCi5/0ljpT83UrTmhJUMwWJxWMA9YMLmOBhIeB6k4/azxdrne
-Dnu9ahLuM9jhzJazuPebmc74IMe17vzclelyx8+7AgMBAAGjggFuMIIBajAfBgNV
-HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUj3qD3F4yQ3cR
-udqfsQda8hqTZ/8wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQEC
-Ah0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
-Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
-AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbc2hpYmJv
-bGV0aC51bml2LXBvaXRpZXJzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQB35DdMvMd/
-G/GOPo1URiKh4LWbGQ1P6AcYNwuhCMr4DZaiQX00sezEizuAjnFjnc/wax3zaESS
-IvpJEuuAM7rIrwLGm9zcKPhbceus9OiMffWENEB0sKT0fAZBsfuO4Q8akk2EfoUp
-sYq3kH65TYG4BLtYzVdY0MkE/fUxNT97YLoVwFgIglQPhvamLi1xFnEc5H/1mLHQ
-Hg1wq8LaDsoAUv1hG6Oalvl56Sa3y9FIhueUv0Z+kNvvTyK9hHtC1iDRyoLANajH
-ag7GwpQkZHUpuTGM1wrdwNJAN7lcXenuuAivqj6wxk11YMxw/38jH2rKtpXyxdnv
-1eZuFfizJq0c
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-poitiers.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Poitiers</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Poitiers</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <SurName>Duthilleul Benjamin</SurName>
- <EmailAddress>benjamin.duthilleul@univ-poitiers.fr</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Lionel Lombardi</SurName>
- <EmailAddress>lionel.lombardi@univ-poitiers.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml
deleted file mode 100644
index 78aa2e10..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-reims.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-27T15:31:10Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Reims Champagne-Ardenne</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMDCCAhigAwIBAgIVAL2jIgsvdHaiW3jhATYWI0XNX8mEMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LXJlaW1zLmZyMB4XDTA5MDQwOTA3MDY1
-MloXDTI5MDQwOTA3MDY1MlowHDEaMBgGA1UEAxMRaWRwLnVuaXYtcmVpbXMuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAzPcBanTJ7Dz5EJtyHuRo
-jH43UwmGsVSmYXYHCBS5dR/OmxClgdsAnFAfLadx37gO4Ib60Rut5Fj8VzMMNZSY
-7QMoxxswchbFWfeQ+Ouo7f78XFlr3uvrREjdBy6wOG9AKpFdoXN1YqDLmSJ8NUXS
-tLHIqfuG1LQuBGvZeFTd8Aq1KluFbUBlDgJeqfXASR+f+NeRhfi4+/neUsmffOJs
-cF4LLR9htO8wAQ5jqT38g6Mef15m2YbvfbamS1K0gJ+xkUHdfn2QEChXgBUEA07e
-BbhhtyO5hF7NdoDwmChrUwOLa19DzvXsq+NtPFXgNyzhrWDWHcxQyNbqif558Agp
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bml2LXJlaW1zLmZyhihodHRwczov
-L2lkcC51bml2LXJlaW1zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTGzm17
-rh/LTbtXmOsK6s5WTYAj4DANBgkqhkiG9w0BAQUFAAOCAQEAVcEL+y4/0UQ7glis
-R63eyvaAwsHWpxxHgCCOeKLzEUI1psi/vysmlWJa5R/EE+yJZqTvUyGEurZLgIJv
-OFxmQBsasPsFKvrvFvwBDuJsC49sYjQeNw30iro9lGNqsqQ9dzVSrGEgqF67uYeV
-3wDkziL1KeqOs+Rx6m6YFRGsDbkZ6iQ9G7PFvD6XbNkKscox94T768AFvF69hVTJ
-L2xmGFNJLLSoZPnMUL2K3EcXychLRIfAzaK0hRvJUrx8HTcHVmdh477BespRaHsB
-/M7dFoRtQlh4cfry/iAqcvigNqzLB2d2cs52M+VdtWuXnG96iRnCQohf1+u6Tnor
-Eby/Nw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-reims.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-reims.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMDCCAhigAwIBAgIVAL2jIgsvdHaiW3jhATYWI0XNX8mEMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LXJlaW1zLmZyMB4XDTA5MDQwOTA3MDY1
-MloXDTI5MDQwOTA3MDY1MlowHDEaMBgGA1UEAxMRaWRwLnVuaXYtcmVpbXMuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAzPcBanTJ7Dz5EJtyHuRo
-jH43UwmGsVSmYXYHCBS5dR/OmxClgdsAnFAfLadx37gO4Ib60Rut5Fj8VzMMNZSY
-7QMoxxswchbFWfeQ+Ouo7f78XFlr3uvrREjdBy6wOG9AKpFdoXN1YqDLmSJ8NUXS
-tLHIqfuG1LQuBGvZeFTd8Aq1KluFbUBlDgJeqfXASR+f+NeRhfi4+/neUsmffOJs
-cF4LLR9htO8wAQ5jqT38g6Mef15m2YbvfbamS1K0gJ+xkUHdfn2QEChXgBUEA07e
-BbhhtyO5hF7NdoDwmChrUwOLa19DzvXsq+NtPFXgNyzhrWDWHcxQyNbqif558Agp
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bml2LXJlaW1zLmZyhihodHRwczov
-L2lkcC51bml2LXJlaW1zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTGzm17
-rh/LTbtXmOsK6s5WTYAj4DANBgkqhkiG9w0BAQUFAAOCAQEAVcEL+y4/0UQ7glis
-R63eyvaAwsHWpxxHgCCOeKLzEUI1psi/vysmlWJa5R/EE+yJZqTvUyGEurZLgIJv
-OFxmQBsasPsFKvrvFvwBDuJsC49sYjQeNw30iro9lGNqsqQ9dzVSrGEgqF67uYeV
-3wDkziL1KeqOs+Rx6m6YFRGsDbkZ6iQ9G7PFvD6XbNkKscox94T768AFvF69hVTJ
-L2xmGFNJLLSoZPnMUL2K3EcXychLRIfAzaK0hRvJUrx8HTcHVmdh477BespRaHsB
-/M7dFoRtQlh4cfry/iAqcvigNqzLB2d2cs52M+VdtWuXnG96iRnCQohf1+u6Tnor
-Eby/Nw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reims.fr/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Reims Champagne-Ardenne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Reims Champagne-Ardenne</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <SurName>Monclin Yannick</SurName>
- <EmailAddress>yannick.monclin@univ-reims.fr</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Canart Arnaud</SurName>
- <EmailAddress>arnaud.canart@univ-reims.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml
deleted file mode 100644
index fe2fe465..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-rennes1.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-19T16:25:25Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes1.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">University of Rennes 1</mdui:DisplayName>
- <mdui:Description xml:lang="en">University of Rennes 1</mdui:Description>
- <mdui:DisplayName xml:lang="fr">Université de Rennes 1</mdui:DisplayName>
- <mdui:Description xml:lang="fr">Université de Rennes 1</mdui:Description>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUzCCAjugAwIBAgIUAOfkyDP7IZUpxjLBqzh2u2A52aEwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMaaWRlbnQtc2hpYi51bml2LXJlbm5lczEuZnIwHhcNMDkw
-MzAyMTE1ODE5WhcNMjkwMzAyMTE1ODE5WjAlMSMwIQYDVQQDExppZGVudC1zaGli
-LnVuaXYtcmVubmVzMS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIgsyIsKtRo7oQxJsA+lI4Yr616n8irMvAEkvp22Z3Qp891HG5Jz3g7UMOv0ec+F
-LKRLNWoV6+DkM2TZiAji42ltH9pj5t27JhRZ2RMbpOOi37KYGKjUUSK5AVznwutp
-lvW2p4pYCR8TSuZMaFCxjTz4Re43HYLdH/rS1IjKF8LZPV5ymmHJRIEsC50VPx6S
-LLqEz46AxgNWc15oBEvLeBwHKQVC170RLAsFxUjQeuUXVTwaSpd9mwgkbzH28w6p
-dp3q9uAy2iKWXqLUvCIqTuH9u5+iNhnD4ZOYdFb8wW1Ebkbpsb0Vp6Uh64K60n/4
-Q/+mpg/CVGDdOkFppYFATa8CAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRlbnQtc2hp
-Yi51bml2LXJlbm5lczEuZnKGMWh0dHBzOi8vaWRlbnQtc2hpYi51bml2LXJlbm5l
-czEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJWD/tJoDhnkOpuBRxm6nBAi
-AwlPMA0GCSqGSIb3DQEBBQUAA4IBAQAnSdwW+9NJWxtugXueUnfSQttGDOUmQIie
-gUHPCRj8VEbPG6upxZnFC/slOfR+dUeP6hIyCIE1pzqjCe8Lmc9wrKvee3nBPnCf
-gXMbzpVCNYXOMM8DhikOdBwGOfCWsK5cdkDVz5OWHv+gU/kgo1mcN6EQI8rzSi0h
-SvwYWTv/BTnA3R/idih2dS8sZDISLsBJnXtIWZTH28S4NX3sttHZSjyALT2nJbLD
-+2Xhef7YCNxkQshmTU9MI7TzdTNBEQS3p82TT9N4oXNVH0WPY3l0YLKBNzQSvNj2
-rkwHcu+LmiqBbNYaIImujo8IZ7laiF30+nPuPGRfCqU7IEjA7cga
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident-shib.univ-rennes1.fr/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.univ-rennes1.fr/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.univ-rennes1.fr/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes1.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUzCCAjugAwIBAgIUAOfkyDP7IZUpxjLBqzh2u2A52aEwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMaaWRlbnQtc2hpYi51bml2LXJlbm5lczEuZnIwHhcNMDkw
-MzAyMTE1ODE5WhcNMjkwMzAyMTE1ODE5WjAlMSMwIQYDVQQDExppZGVudC1zaGli
-LnVuaXYtcmVubmVzMS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIgsyIsKtRo7oQxJsA+lI4Yr616n8irMvAEkvp22Z3Qp891HG5Jz3g7UMOv0ec+F
-LKRLNWoV6+DkM2TZiAji42ltH9pj5t27JhRZ2RMbpOOi37KYGKjUUSK5AVznwutp
-lvW2p4pYCR8TSuZMaFCxjTz4Re43HYLdH/rS1IjKF8LZPV5ymmHJRIEsC50VPx6S
-LLqEz46AxgNWc15oBEvLeBwHKQVC170RLAsFxUjQeuUXVTwaSpd9mwgkbzH28w6p
-dp3q9uAy2iKWXqLUvCIqTuH9u5+iNhnD4ZOYdFb8wW1Ebkbpsb0Vp6Uh64K60n/4
-Q/+mpg/CVGDdOkFppYFATa8CAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRlbnQtc2hp
-Yi51bml2LXJlbm5lczEuZnKGMWh0dHBzOi8vaWRlbnQtc2hpYi51bml2LXJlbm5l
-czEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJWD/tJoDhnkOpuBRxm6nBAi
-AwlPMA0GCSqGSIb3DQEBBQUAA4IBAQAnSdwW+9NJWxtugXueUnfSQttGDOUmQIie
-gUHPCRj8VEbPG6upxZnFC/slOfR+dUeP6hIyCIE1pzqjCe8Lmc9wrKvee3nBPnCf
-gXMbzpVCNYXOMM8DhikOdBwGOfCWsK5cdkDVz5OWHv+gU/kgo1mcN6EQI8rzSi0h
-SvwYWTv/BTnA3R/idih2dS8sZDISLsBJnXtIWZTH28S4NX3sttHZSjyALT2nJbLD
-+2Xhef7YCNxkQshmTU9MI7TzdTNBEQS3p82TT9N4oXNVH0WPY3l0YLKBNzQSvNj2
-rkwHcu+LmiqBbNYaIImujo8IZ7laiF30+nPuPGRfCqU7IEjA7cga
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ident-shib.univ-rennes1.fr/profile/SAML1/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Rennes 1</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Rennes 1</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>fed-admin@listes.univ-rennes1.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml
deleted file mode 100644
index 37f02dff..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-reunion.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-10T15:52:09Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reunion.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de la Réunion</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDODCCAiCgAwIBAgIVAL8dyCz520Rx/kdyqcI4TXpOUd79MA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LXJldW5pb24uZnIwHhcNMDkwMzE2MTQz
-OTQ5WhcNMjkwMzE2MTQzOTQ5WjAeMRwwGgYDVQQDExNpZHAudW5pdi1yZXVuaW9u
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWm8P30Q7FaWJ7EX
-QBT412i9UZUVcab0hEu7aVY5y7Oz8SH4Pmnku33as+c1mMb/VC502aU/znQY3neO
-1uI/b/4w1FCPLbB3ZVz9klXGuj6/HSxWqYwCLbQQBlwpGACXsrTBfu8b3tK+MSYD
-K77TXECDQA2U4PFIKnpuBZB6cgJpBORthkKb3tg+oBeWj14CgMz5+2w1ouuRsQ6K
-GiZXf2z1RiqyODnsDst2ml4RrmQzbDFURJ0gdL6qsaUB+SGJqaabo7iYZZKgK/EA
-9+jzXCzG97jAyTyse00LliLMOc5/fAY5GLhkpVV5/9rt0W9mXbbRV4TGA6iaJGKZ
-9Y6CtQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1yZXVuaW9uLmZyhipo
-dHRwczovL2lkcC51bml2LXJldW5pb24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFBbec4spkaLKldRGAyIDjSfMSJzNMA0GCSqGSIb3DQEBBQUAA4IBAQBSjuGF
-qqn1aEmcSAArdDkgvmAZbCnvUeZuHUEdXufrZ6JMYGS742f3A6onSAK0WZmyg0Tf
-bS7YQhEdR3NwlFNhkoCCY0IewEp1pRuKxE+u8VD1372JLCOtIRWTgxvc/VPDdw0C
-UjQmucMfyAn+/mNiR4XRPqOYm1BXvM4RDwTTmYKvaWhUAjnFgr4LTckjS4z6nMfx
-hYC3u9/xmqRAR2bDXeRB4poDfLVXfGKureDZPWw72aPvzjJ4XGf/aaHI3AmL5zmR
-gBZQE0UE++9BzuSgkbANei54g+uo5zgXNgeJT15B9waWhUpo8AMbzOKpXgmCAp51
-FChXMMiPA+POOLIC
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-reunion.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-reunion.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-reunion.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reunion.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDODCCAiCgAwIBAgIVAL8dyCz520Rx/kdyqcI4TXpOUd79MA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LXJldW5pb24uZnIwHhcNMDkwMzE2MTQz
-OTQ5WhcNMjkwMzE2MTQzOTQ5WjAeMRwwGgYDVQQDExNpZHAudW5pdi1yZXVuaW9u
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWm8P30Q7FaWJ7EX
-QBT412i9UZUVcab0hEu7aVY5y7Oz8SH4Pmnku33as+c1mMb/VC502aU/znQY3neO
-1uI/b/4w1FCPLbB3ZVz9klXGuj6/HSxWqYwCLbQQBlwpGACXsrTBfu8b3tK+MSYD
-K77TXECDQA2U4PFIKnpuBZB6cgJpBORthkKb3tg+oBeWj14CgMz5+2w1ouuRsQ6K
-GiZXf2z1RiqyODnsDst2ml4RrmQzbDFURJ0gdL6qsaUB+SGJqaabo7iYZZKgK/EA
-9+jzXCzG97jAyTyse00LliLMOc5/fAY5GLhkpVV5/9rt0W9mXbbRV4TGA6iaJGKZ
-9Y6CtQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1yZXVuaW9uLmZyhipo
-dHRwczovL2lkcC51bml2LXJldW5pb24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFBbec4spkaLKldRGAyIDjSfMSJzNMA0GCSqGSIb3DQEBBQUAA4IBAQBSjuGF
-qqn1aEmcSAArdDkgvmAZbCnvUeZuHUEdXufrZ6JMYGS742f3A6onSAK0WZmyg0Tf
-bS7YQhEdR3NwlFNhkoCCY0IewEp1pRuKxE+u8VD1372JLCOtIRWTgxvc/VPDdw0C
-UjQmucMfyAn+/mNiR4XRPqOYm1BXvM4RDwTTmYKvaWhUAjnFgr4LTckjS4z6nMfx
-hYC3u9/xmqRAR2bDXeRB4poDfLVXfGKureDZPWw72aPvzjJ4XGf/aaHI3AmL5zmR
-gBZQE0UE++9BzuSgkbANei54g+uo5zgXNgeJT15B9waWhUpo8AMbzOKpXgmCAp51
-FChXMMiPA+POOLIC
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reunion.fr/idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de la Réunion</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de la Réunion</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>fed-idp@univ-reunion.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml
deleted file mode 100644
index 4538e841..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-rouen.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-20T15:48:10Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rouen.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Rouen</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDLzCCAhegAwIBAgIUWvf6hiSiI4KjS/n+xqAFPbKt2r0wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtcm91ZW4uZnIwHhcNMTEwNTE3MDk1NTQz
-WhcNMzEwNTE3MDk1NTQzWjAcMRowGAYDVQQDExFpZHAudW5pdi1yb3Vlbi5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxi7qpcaAsjhQquoELWUEsz
-PZGyg/5lT6KAAfryX17brdK0cQytLZXyqCOsCSYDi8T3dJwrEKUfzMqf4Rvxhzve
-fFB6fz22+RkLHezLuywNpICo3qBntqY9ZiIgBV4X2AS6jt5Szbm18qSL5xoxQ+DA
-93WKffpCeE9eELWRnu5RKxXam10JBUEMfLxEY+e8ToOcoAU8n/nC7ytE8ReXwcWh
-/eqyt3Usf+MwG6qAPNvRvG3quKEcF+7fbpU4RmZz+na49OLoLhoHCyWHdmmL4lIw
-U2jRo+7IjD3DJMG3pUjqnKbsLrhyk4McwuN4TCiC2KhKWGFSnzXcjNfcYZsK3MsC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtcm91ZW4uZnKGKGh0dHBzOi8v
-aWRwLnVuaXYtcm91ZW4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJZ4dOPm
-rji8bFb79aNq2VybCh8RMA0GCSqGSIb3DQEBBQUAA4IBAQADYQEXRdgzmhCNw3RI
-4NCayLgtaaCdwG/sYEzxXss5CQ2t8jRn1yQpXxoGSwtROZM/w/L8gtWjSpUSB8av
-cKdAZBRB5ojESTkd28/tv3jtA1bjt6OeZwjsCr0RRMBN2A12t4BLfSG7VAKGyE+B
-dQ8p2l7xN23XN9sIAxJNcxtK7w85Or6Y8C9iwApqhMihTLWLQPQGSM1pRUKHTInI
-XgsbhADqatOXXzkizis9PK9Tf8jFSl9Hcye3gJrgYnn3F7qxvMGzm1KqmsAG3Xnr
-yxCa3HYJJd9oze0GYQ3AyxViyin1T4daHyQVMRlC4rjCpVd2f0gp6zX37uF8/i4z
-jf6+
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-rouen.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-rouen.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rouen.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDLzCCAhegAwIBAgIUWvf6hiSiI4KjS/n+xqAFPbKt2r0wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtcm91ZW4uZnIwHhcNMTEwNTE3MDk1NTQz
-WhcNMzEwNTE3MDk1NTQzWjAcMRowGAYDVQQDExFpZHAudW5pdi1yb3Vlbi5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxi7qpcaAsjhQquoELWUEsz
-PZGyg/5lT6KAAfryX17brdK0cQytLZXyqCOsCSYDi8T3dJwrEKUfzMqf4Rvxhzve
-fFB6fz22+RkLHezLuywNpICo3qBntqY9ZiIgBV4X2AS6jt5Szbm18qSL5xoxQ+DA
-93WKffpCeE9eELWRnu5RKxXam10JBUEMfLxEY+e8ToOcoAU8n/nC7ytE8ReXwcWh
-/eqyt3Usf+MwG6qAPNvRvG3quKEcF+7fbpU4RmZz+na49OLoLhoHCyWHdmmL4lIw
-U2jRo+7IjD3DJMG3pUjqnKbsLrhyk4McwuN4TCiC2KhKWGFSnzXcjNfcYZsK3MsC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtcm91ZW4uZnKGKGh0dHBzOi8v
-aWRwLnVuaXYtcm91ZW4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJZ4dOPm
-rji8bFb79aNq2VybCh8RMA0GCSqGSIb3DQEBBQUAA4IBAQADYQEXRdgzmhCNw3RI
-4NCayLgtaaCdwG/sYEzxXss5CQ2t8jRn1yQpXxoGSwtROZM/w/L8gtWjSpUSB8av
-cKdAZBRB5ojESTkd28/tv3jtA1bjt6OeZwjsCr0RRMBN2A12t4BLfSG7VAKGyE+B
-dQ8p2l7xN23XN9sIAxJNcxtK7w85Or6Y8C9iwApqhMihTLWLQPQGSM1pRUKHTInI
-XgsbhADqatOXXzkizis9PK9Tf8jFSl9Hcye3gJrgYnn3F7qxvMGzm1KqmsAG3Xnr
-yxCa3HYJJd9oze0GYQ3AyxViyin1T4daHyQVMRlC4rjCpVd2f0gp6zX37uF8/i4z
-jf6+
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-rouen.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Rouen</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Rouen</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>systeme@univ-rouen.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml
deleted file mode 100644
index b70808a5..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-st-etienne.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-17T14:19:31Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-st-etienne.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Saint-Etienne - Jean Monnet</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDWDCCAkCgAwIBAgIVAM60eJPNg42CHzM+jgGiPUF8XxVEMA0GCSqGSIb3DQEB
-BQUAMCYxJDAiBgNVBAMTG2lwZC10ZXN0LnVuaXYtc3QtZXRpZW5uZS5mcjAeFw0x
-MDAxMjcxMzMzMTNaFw0zMDAxMjcxMzMzMTNaMCYxJDAiBgNVBAMTG2lwZC10ZXN0
-LnVuaXYtc3QtZXRpZW5uZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL/9p3g2bat/dj9BdEBKhJMfh6ruQAb/WENj8VDd69vd0qlg7gBFdcUAlrWu
-lWbGxIGSike4JKk/BflJvJsOw56tqdVOgX574nhz74t7wq3bb4oy4+z6QBU4D4fi
-s81DGmDlYLM+99wTXEeXu6U7MYUoHve76yRLP3tJ/JupT4JVmfWLbmfWpWdaIXTu
-GIMhPPuZ+tlZyVMUy4Yisj1+hxJkC0XbZ/Tt0k/U6ibmFw2RgMZ4e9I/F5XAAuIL
-ntj94ucDfkak5IjzdazgL2hyPhRs5HCl8fM02xH3Hiy54o6/ol4Bht3KUotnQ7hf
-dYDxIxHdAkHqDx7rQuSpyTSZckECAwEAAaN9MHswWgYDVR0RBFMwUYIbaXBkLXRl
-c3QudW5pdi1zdC1ldGllbm5lLmZyhjJodHRwczovL2lwZC10ZXN0LnVuaXYtc3Qt
-ZXRpZW5uZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU71M58iX9SWskgRx3
-iaqLJvvFm+swDQYJKoZIhvcNAQEFBQADggEBAKcebag8459paefinfIIkTj5eZPx
-7PMt8G3Qn2wdSOCdUqi+wB/ouR9R005RJe2MEZgixUNc2umwTZuO3MR5Rc4+TjyI
-XzRKyPJ2OmxEL3ly8pKUd0a3fXJZTOikICLLYezOdV2V/QLheIvMfZlhZ1uUhVGB
-0uoJRHu/zdhfGClj4eYML47y5EanadjY3nQ91GcDYxFeEFIGtcy+xp+CbEeFeqEH
-J/tcRGvcPSvO9TGVGz+0YVsDmcGrfiHcokztEZ6Z7ADLep/iXMTpS331wYizQ7Oc
-I5j1CmAlzfvcYGPy6fOMCjINmd75Sez4RvGbVAQE/tRIM+6ButzQ6Lymrk4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC4TCCAkqgAwIBAgIJAKP6b3sDhrcdMA0GCSqGSIb3DQEBBQUAMFUxEjAQBgoJ
-kiaJk/IsZAEZFgJGUjEeMBwGCgmSJomT8ixkARkWDlVOSVYtU1QtRVRJRU5FMR8w
-HQYDVQQDExZpZHAudW5pdi1zdC1ldGllbm5lLmZyMB4XDTEwMDIwNTE0MjkzNVoX
-DTMwMDEzMTE0MjkzNVowVTESMBAGCgmSJomT8ixkARkWAkZSMR4wHAYKCZImiZPy
-LGQBGRYOVU5JVi1TVC1FVElFTkUxHzAdBgNVBAMTFmlkcC51bml2LXN0LWV0aWVu
-bmUuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK230ru2DZhNVr4lLk97
-HkWLsOkkO5aBM7H6APtlLV7UAKcxPk9sOnDcbe/xtONRGBhPtFoiW2MmyywbrJkc
-afOmUQnOvAbs3n/4lDwdecln+BjTpvU+n6xr7TDzCdV+gOcG6N2kF3pGHpPSvEHi
-3ZrO0AInO/PFfy/ycbdiAl1hAgMBAAGjgbgwgbUwHQYDVR0OBBYEFHSHvTF7w+i2
-SyZzd/bSNCg0VAWUMIGFBgNVHSMEfjB8gBR0h70xe8Potksmc3f20jQoNFQFlKFZ
-pFcwVTESMBAGCgmSJomT8ixkARkWAkZSMR4wHAYKCZImiZPyLGQBGRYOVU5JVi1T
-VC1FVElFTkUxHzAdBgNVBAMTFmlkcC51bml2LXN0LWV0aWVubmUuZnKCCQCj+m97
-A4a3HTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAHynvHowT2/OUT69
-1iIuxxfOmCxO5EgELXu8rELm2TZqMoFrrnTI0KjJuI8biewAaz502Fl8sJU0AiPd
-9OKy/g/dfPh8JsUiUfimXwjLr+x0o0R0a3MPUt9v+KpdB/p59Taa3zSHn0nJhc6o
-Uo0ryH7NTSXhOWxZyz9Mao/M9HHX
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-st-etienne.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-st-etienne.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-st-etienne.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Saint-Etienne - Jean Monnet</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Saint-Etienne - Jean Monnet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <SurName>Murgue Thierry</SurName>
- <EmailAddress>thierry.murgue@univ-st-etienne.fr</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Valeille Jean-François</SurName>
- <EmailAddress>jean.francois.valeille@univ-st-etienne.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml
deleted file mode 100644
index d4105eb1..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-tln.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-28T11:55:09Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tln.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université du Sud Toulon Var</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDQzCCAiugAwIBAgIURrZcRMW1GJitmEg2t0KC308pj88wDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWZmVkZXJhdGlvbi51bml2LXRsbi5mcjAeFw0wOTA5MDYx
-OTIyNDFaFw0yOTA5MDYxOTIyNDFaMCExHzAdBgNVBAMTFmZlZGVyYXRpb24udW5p
-di10bG4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv3ysyMoZY
-CtKudxYcuuSgnBe7k0bF/kNt+EeszFZt7XviNAi50wIAvqt0J4yd43v1SJ9rL2XD
-pWeC4Xdxblp0yn5DVqnSbmM9ySSocYEhZK32Jo2qidk3KB981R1GaSE74DNxSC5F
-MxnNq39Jx8tDEGi+9sEXLU4nRqkznuB0NiDIprehTk5nrrH8LyiC4mBVnTWHlaVN
-oycrr9bfVm/4lXePYEBQFec1q509Mdi6v9+8rb/WSVXEhmmjtKAJGm1Sx3mi2GlY
-o0cMIraJqYMyKxy6y4uLzx/EpFxjDD1WG4w9qz47BXJ6yELqZftPfSrYyuhxV0u3
-3kGdY9pn6bpvAgMBAAGjczBxMFAGA1UdEQRJMEeCFmZlZGVyYXRpb24udW5pdi10
-bG4uZnKGLWh0dHBzOi8vZmVkZXJhdGlvbi51bml2LXRsbi5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUlfrA9u+WyKMcIN3NB1/XDYtdLl8wDQYJKoZIhvcNAQEF
-BQADggEBAATpBMb4mUELL5uZ3FvMdEtGK23nRU8SSTmqt3rypazcMlWevgq60mHm
-CBD4E+bFvvKMAWUx3+jpQzbV2M7I2OMto95G4MVTEnr+vugeQHEDcWIBUo5yjLb6
-4qDZ8YWBmzSE/iV8Pbx+6RsLgPcTfXzbClZO/stfspDJhwCrLuMv36xCQcm88Y5Z
-eHcjM5wZ+FrykOxUsv663wJowcCE0aRkAUnyg1rUfYy4sRJh3EP/MXQpb4/ePTCg
-lAu3e0usivWcDm0/WX2N6oA9cp0sUsegYtoBY7tmPtml4yMRODG7ZSDqUmLlB3PZ
-FIrOgN1sOW6bInYYilkc/7jjHW5T6AQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.univ-tln.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.univ-tln.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.univ-tln.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université du Sud Toulon Var</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université du Sud Toulon Var</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>federation@univ-tln.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml
deleted file mode 100644
index cd216be6..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-ubs.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-09T16:11:54Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-ubs.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Bretagne Sud</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDJzCCAg+gAwIBAgIUQf+bgYI+pflZTXe6Sw+Ijq7sDuwwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLnVuaXYtdWJzLmZyMB4XDTA5MDMyNjA5MzUxM1oX
-DTI5MDMyNjA4MzUxM1owGjEYMBYGA1UEAxMPaWRwLnVuaXYtdWJzLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzjVVD6f/m26YrFIXqyAhIIZOl5Jy
-KT/06NrJReinTL27+4mGRcK2Hy3CN412n3FLUlSra1E+1KtgdSXLGH0aipopxsF1
-4tNnr7XUGzX3jYLwEf9JAvMjkrmfg6XV+tRM0aEVhbk6T/0kSUVSu0OuY1OtnWMX
-tEOI5lxBIFiiF2IjkzXfT3IXtn43BLurAtwGEjVcU/h9p4XKAv1vXDnSZIYMV68h
-Rfnt37Jbk4MOZC5G/b6ruegAWylpZ6/xd3eToWiTf6jf7cTL1rvVCBshyumkgF1z
-GUzmsUPIieAO2K1cAj6YSYO39Ya+TSpwmeGHfHU2ptmm0Pg+3FgVcQd0vQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAudW5pdi11YnMuZnKGJmh0dHBzOi8vaWRwLnVu
-aXYtdWJzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRJzRQHNoeR8yfWTVGV
-cZxCUNFlVTANBgkqhkiG9w0BAQUFAAOCAQEAoKKviDAjDppeG/HLfBnHEGk3huwy
-QS7vwSXR8iQCkJeFzYJbQNW3C0pZ3gbTjXEwR8a7zyLm08LNTJy1b03oHEZvLf+5
-ozxzL0Sj0L8eH/Edra2le2VYp7OpAIKXbktQ7tov7OrNjwvnEThp4emd6ffMNKBy
-tuagpJOU3yH1CJ1aV9Za1cvobQJryWlwGgvw2Z2ALFs5/BT435lBJbMjuNAR9mC8
-GKrzVJxuCZuaFkCNIGIA2lPmHA755Vf5rKi2/4A+qBzN9XJc1RBzTlg9PF1WQzb3
-KsqVsaQhhLja8zwz5NlpcXN89WMIL/Bg6T3t5KN4ajbKbWxX/7uMAVsEUw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-ubs.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-ubs.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-ubs.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Bretagne Sud</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Bretagne Sud</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>fed-admin@univ-ubs.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml
deleted file mode 100644
index 42c1323a..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-valenciennes.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-17T13:52:02Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-valenciennes.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Valenciennes</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDSzCCAjOgAwIBAgIUf/+c8ye6SzH67ieu864mtMPYXlswDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMB4XDTA5MTAx
-MzEzMTA0M1oXDTI5MTAxMzEzMTA0M1owIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFs
-ZW5jaWVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhhYP
-J3k8hdOdhcye6mC5zPykjAy9JesMuIR/AYr+tWUpeYNbQeVPyMiqQduhBO08Z1Tz
-sRV/hsuIYv3eD5O+DXFn6U+sY63CzxQrIQ1SC+hIMlzdw7yvdnlkBodgZg6J7LjF
-bpJvpwhtFp84cxy0g/s6oUy/CUg4gMWwnsoah+dacay1GSvqOHo1lu9pdptHmK7h
-VGL5DAsw3Mt3Lb5KK9DlLffd6umayoI9f7Gt8Kouxa1HURuiebxRHmDDJXdzNZ94
-6IzRoFE3SUi1z3iGVDv8TDp1XLSUhNdYR8Plm84GHs03F3hIU1MKxEscFTd/U4zs
-hqKfK/mRqE7OvydIRQIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudW5pdi12YWxl
-bmNpZW5uZXMuZnKGL2h0dHBzOi8vaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBTNbFHRtwU+XlpYz+rxvTgavdfoJTANBgkq
-hkiG9w0BAQUFAAOCAQEAb+WTNz5aJNRd/eYTsbgcd/zQLxPssQUgIfW35D2l37r5
-uUI/lTvzCS/XGjleZirVlg1I2BcuLyKNXbyc29OYjWXABBZ3pGX4BD3K+/xEMGwN
-XMQWw4ZdDDfU9Q7jqRog9WIuOcTb/7fRthOOdRPxOnUdl+XfpAqcqpYGPnqX+mXk
-VRZHYIjjVYLKY1Ye3jUPg3n4/hldWYSy2TxMlMbudAV01tb5jzz3k4c/AwzA5Q9i
-sch9WHg5TO5d2L1B6b44aMkefP9u+GBNaLZx1B+hb2b6ZCkxHojPHVeUSi1Hpz17
-lHNKGM/S8lXO2ADLPujRZnzHaBVAwxxAlSgX+PHvqw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIELjCCAxagAwIBAgILAQAAAAABHCKPrcgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDkwMjEwMTU1M1oXDTExMDkwMjEwMTU1M1owVTELMAkGA1UEBhMCRlIxIzAhBgNV
-BAoTGlVuaXZlcnNpdGUgZGUgVmFsZW5jaWVubmVzMSEwHwYDVQQDExhpZHAudW5p
-di12YWxlbmNpZW5uZXMuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANSf
-5C9eFVHbRpt28W4z/U+bm/VvkgHNdQEZPQ2pqXEEu+iNKJaG8lybcidsRyYvhZ14
-6ZYizS5LqJNSidHTmOTl+YPLvlp8vJlTMGHtPSKQ4VMW00SXyR3aSNW1o6BPYsbH
-QJrymiW258t3vucIJXhvxFUf4Lu/inXi1BbdzJMPAgMBAAGjggF3MIIBczBQBgNV
-HSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9i
-YWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8G
-A1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBSU9Be0EaWm
-H7oW2x/Lx7QpYKy1dTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2Jh
-bHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYB
-BQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNh
-dGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIwYDVR0R
-BBwwGoIYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMA0GCSqGSIb3DQEBBQUAA4IB
-AQArisANwDwXThEFPPcPSkY0cu9T/j2CpNRBGTqoJoT7LRh1/99B3LRRw0b9l/IO
-WuJKRxMLzbPjluyIs60LAzCXqbztIB41TgwzeyiHAEo3osVehBR4gFHialPVngDv
-r9UfbLCo796mLEXz437DiDEyGfTexppm/BFKNJNnb2TvlzKtGHFs78NYXHTeBHvs
-F2XJpzo8oyTFKRpjM5hWwLNCRina0Clsu07wcMEFtt8VQe7Kuy6eeR87HB/jVLIy
-NxraMQwWgk4zdVwLLxVBKpz2G67WvqI4vVqjcvavJY7rdKbvV9ImXWltKuJsh8ZU
-UxhrIap6n+MSA85kMvjxjmUG
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-valenciennes.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-valenciennes.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDSzCCAjOgAwIBAgIUf/+c8ye6SzH67ieu864mtMPYXlswDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMB4XDTA5MTAx
-MzEzMTA0M1oXDTI5MTAxMzEzMTA0M1owIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFs
-ZW5jaWVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhhYP
-J3k8hdOdhcye6mC5zPykjAy9JesMuIR/AYr+tWUpeYNbQeVPyMiqQduhBO08Z1Tz
-sRV/hsuIYv3eD5O+DXFn6U+sY63CzxQrIQ1SC+hIMlzdw7yvdnlkBodgZg6J7LjF
-bpJvpwhtFp84cxy0g/s6oUy/CUg4gMWwnsoah+dacay1GSvqOHo1lu9pdptHmK7h
-VGL5DAsw3Mt3Lb5KK9DlLffd6umayoI9f7Gt8Kouxa1HURuiebxRHmDDJXdzNZ94
-6IzRoFE3SUi1z3iGVDv8TDp1XLSUhNdYR8Plm84GHs03F3hIU1MKxEscFTd/U4zs
-hqKfK/mRqE7OvydIRQIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudW5pdi12YWxl
-bmNpZW5uZXMuZnKGL2h0dHBzOi8vaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBTNbFHRtwU+XlpYz+rxvTgavdfoJTANBgkq
-hkiG9w0BAQUFAAOCAQEAb+WTNz5aJNRd/eYTsbgcd/zQLxPssQUgIfW35D2l37r5
-uUI/lTvzCS/XGjleZirVlg1I2BcuLyKNXbyc29OYjWXABBZ3pGX4BD3K+/xEMGwN
-XMQWw4ZdDDfU9Q7jqRog9WIuOcTb/7fRthOOdRPxOnUdl+XfpAqcqpYGPnqX+mXk
-VRZHYIjjVYLKY1Ye3jUPg3n4/hldWYSy2TxMlMbudAV01tb5jzz3k4c/AwzA5Q9i
-sch9WHg5TO5d2L1B6b44aMkefP9u+GBNaLZx1B+hb2b6ZCkxHojPHVeUSi1Hpz17
-lHNKGM/S8lXO2ADLPujRZnzHaBVAwxxAlSgX+PHvqw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIELjCCAxagAwIBAgILAQAAAAABHCKPrcgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDkwMjEwMTU1M1oXDTExMDkwMjEwMTU1M1owVTELMAkGA1UEBhMCRlIxIzAhBgNV
-BAoTGlVuaXZlcnNpdGUgZGUgVmFsZW5jaWVubmVzMSEwHwYDVQQDExhpZHAudW5p
-di12YWxlbmNpZW5uZXMuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANSf
-5C9eFVHbRpt28W4z/U+bm/VvkgHNdQEZPQ2pqXEEu+iNKJaG8lybcidsRyYvhZ14
-6ZYizS5LqJNSidHTmOTl+YPLvlp8vJlTMGHtPSKQ4VMW00SXyR3aSNW1o6BPYsbH
-QJrymiW258t3vucIJXhvxFUf4Lu/inXi1BbdzJMPAgMBAAGjggF3MIIBczBQBgNV
-HSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9i
-YWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8G
-A1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBSU9Be0EaWm
-H7oW2x/Lx7QpYKy1dTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2Jh
-bHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYB
-BQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNh
-dGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIwYDVR0R
-BBwwGoIYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMA0GCSqGSIb3DQEBBQUAA4IB
-AQArisANwDwXThEFPPcPSkY0cu9T/j2CpNRBGTqoJoT7LRh1/99B3LRRw0b9l/IO
-WuJKRxMLzbPjluyIs60LAzCXqbztIB41TgwzeyiHAEo3osVehBR4gFHialPVngDv
-r9UfbLCo796mLEXz437DiDEyGfTexppm/BFKNJNnb2TvlzKtGHFs78NYXHTeBHvs
-F2XJpzo8oyTFKRpjM5hWwLNCRina0Clsu07wcMEFtt8VQe7Kuy6eeR87HB/jVLIy
-NxraMQwWgk4zdVwLLxVBKpz2G67WvqI4vVqjcvavJY7rdKbvV9ImXWltKuJsh8ZU
-UxhrIap6n+MSA85kMvjxjmUG
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-valenciennes.fr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Valenciennes</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Valenciennes</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>fed-admin@univ-valenciennes.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml
deleted file mode 100644
index 69382bd5..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:utc.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-04T14:19:04Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utc.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">UTC - Université de Technologie de Compiègne</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDEzCCAfugAwIBAgIUUqqJXvb5AbgkDCOIeaTw+AhDKzQwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLnV0Yy5mcjAeFw0xMDA4MjUxMTQ5MDZaFw0zMDA4
-MjUxMTQ5MDZaMBUxEzARBgNVBAMTCmlkcC51dGMuZnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCojFMzoxsidrJQ9wH9yaoI8+/iIHmuJltBFTNRmoY/
-XkUy/F+C8DW1O+eTIx8LG9d3NnviN/tVM7IxKez9D5V6lCfEiOPmmHiPc13LFC+G
-v6rwF5tc6mEf66xubrqCGt3VKH8ywQ5iBfKmvpzvduKI/0K3c3a+l6kzp55AdVxV
-Y/O29zkDy0FcBF4ubfOG8PMhA8n7Siba5/S7S4jm2RcJgDD0XSyBLpCoKXy7KKHm
-25wuzaOYZqlYUspdKqw8CHZjT6dxA9Lqg9o2PxBDQdlKuexpEkdSHrE43hisiEVp
-UgDmh4qWqnKpVrQ8auO4mun0FXGiwppLOOy2PXM0KUwVAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC51dGMuZnKGIWh0dHBzOi8vaWRwLnV0Yy5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUR6AWFGlHjGLErFUx+0BoK7+w85QwDQYJKoZIhvcNAQEF
-BQADggEBAF7QWy+SJcgFefxn7IJE6bPUhgiFUkesUd46sudhxT3oxF/17TXqogdN
-ezuRx9wXOcPrFkW2cEe7aTkDsFPukkwo2BYc2m9dREfuotl6pI73CsVvYXEjmTY3
-mGTNKVxb7j2dc9EfJEsTOXc0J7d2S+T92CB4rZ+wC2fj21G4/WQ30lXooXy/kvdW
-327nk2WhrA21GfxVga3DRe4N5WTZG/2j2XCfa+TxXGTW66qJ86fB5ormrVFC4ofL
-oUcxy/ZBMc0HizwoTm7s1siWvszzg2kzOgdywf98wghDNKJ2AtsEZ17KouVxhvDk
-hChKBBWarG/QuOFPQPpaPOLrhW//PAU=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEpzCCA4+gAwIBAgIRANd0mx2mkE7UNMEtPiP7uCUwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDAxMDYwMDAwMDBaFw0xMzAxMDUyMzU5NTlaMIGDMQswCQYD
-VQQGEwJGUjESMBAGA1UEBxMJQ09NUElFR05FMTcwNQYDVQQKDC5VVEMgLSBVbml2
-ZXJzaXTDqSBkZSBUZWNobm9sb2dpZSBkZSBDb21wacOoZ25lMQ8wDQYDVQQLEwZE
-U0ktU1IxFjAUBgNVBAMTDWN5Z251cy51dGMuZnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCfzE1gPe7FIJZn0JPMyeIvqCDe51rVuVzTi9IbzO9LwHWN
-JJZkyCkK1bDRgKJUo/VO49814N1N4G4onuwIDau3cOyxoFBP9HqCDLAXwOA5KPFS
-aZ2onp2T2eWz7KG80J0YoVvOf0eB0ybRaS/ieKq7Z6IYQqSOSv6YDUq2ii+LRqf8
-2MihOcVch71VCSWwQBAxvk29h6/i4vzbRTgxYTepR9YiIzSXJkCkhVwqTrmenYzK
-3DJJcyVutm3V5NfOqP3HXlaFvmhwtir8KupIGU1LPXAdQFgTUZnvzyA0JBeSbghA
-pHcwdrL+euqo59WOfqSXjOjlEaTXL6D0WqlGdxGLAgMBAAGjggFgMIIBXDAfBgNV
-HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUsja5CEnf5Buw
-Av4vEgeVrygsJNIwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQEC
-Ah0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
-Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
-AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INY3lnbnVz
-LnV0Yy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAIcSJcfcR9Z7gMcOOGl/NjVBZklF0
-ATUKJTb7Dr0cJRPTHfEANWNsn3eQSHwf2y+p7ukyGL6PXEngsEDm+CavxamVbGB2
-9cknfnrden8tYy924dq2uwxniWuNoIHuoEXrK1/tj126PYAWPLZgs2WAbw/+hGpM
-ar9vD4k5grT+DwTqh9GiAIh3EQXj11e03h0fhVlHa/WpbD8zMQLSy7KiLfAVUJmk
-mhQLQG+GOfNlx3IujS9j/7gE2cI5OTBUrImHjPH41SHCVF8ZOqzyg1v0Xc7JYgTj
-70kZXvt58HpgN/IqMlNyBtYCRE5+SVCIaX4bEA0qyOTKwLEZIwZNh3LWQw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utc.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utc.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utc.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">UTC - Université de Technologie de Compiègne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">UTC - Université de Technologie de Compiègne</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <SurName>David Lewis</SurName>
- <EmailAddress>david.lewis@utc.fr</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <SurName>Jean-Marc Berenguier</SurName>
- <EmailAddress>jmb@utc.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml
deleted file mode 100644
index ac330d99..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:utt.fr">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-08-14T19:52:27Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utt.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fr">Université de Technologie de Troyes</mdui:DisplayName>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMDCCAhigAwIBAgIVALZ63CJZA7jvuPJPdCpjCqCwtzUcMA0GCSqGSIb3DQEBBQUAMBwxGjAY
-BgNVBAMTEXNoaWJib2xldGgudXR0LmZyMB4XDTA5MDgxMzE1Mzc0NVoXDTI5MDgxMzE1Mzc0NVow
-HDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dHQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDRy7HRMvRk5btG8GGPHKQVA6k3fFlikIFGHJx+B7Uo+kNdQInrMcixfhrqY8bnu66ljQKB
-vZ0yMEZfXJTofRfqBePOgtHEwLcgqQm68kRr4q8oLUdS/+XpK4EdPW6UIrFmA1KkcOfC/Jysn4f7
-KoFKDpTFmNnl7TGVu9GM/tl3yKGFEbuH8kNvG3uaJJVC59ZE2s/xoMcslriXytje2WP4F95DEYVn
-ddkYaw86ZHjjxVumcz7nndInsI8j5EVseK8Ch7cSqlmNA44GJ0kdikv4CphntgBIOvoG2ZvvAIW4
-DGFdMhZieqtwQ2FEKRxAujWY/Sxq6Zsd5anLj7DL8s09AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNo
-aWJib2xldGgudXR0LmZyhihodHRwczovL3NoaWJib2xldGgudXR0LmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBSt5O7Bubm1wxc8OOwz6hgpfVwMtTANBgkqhkiG9w0BAQUFAAOCAQEApDpM7DKM
-7GJs3m+yjN9xIaAVIIUAe+pcIybt8E02fa4+QVaB2RdPvCTgL3cfLZ2ONMEbMqYlWJz0J41P/TaZ
-x4Sxqv/ih2F1pmFks5UUaMbapNzOX3lL1FfBc718kTLAPLt4m9Gm741A/kx83CS0Q2U4mLXp8I5f
-fYMgN8FRoxHJOGsBSGs11nl32pzAiai069ZutsSp2mdyRovyNHS2Oxdumai87AHr1JiC3C8mwvQm
-Sh/3RmGTbPNeXL1AL2zzeKPcSqsEISEVUNbqQFKs37kcfAvy05jGGcfNHtq5GALqx/qhBeXMiVEB
-BcaKxmhZ8LPhUPppbcjFuLXlaNAphQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.utt.fr/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.utt.fr/idp/profile/SAML2/Redirect/SSO"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.utt.fr/idp/profile/Shibboleth/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utt.fr</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMDCCAhigAwIBAgIVALZ63CJZA7jvuPJPdCpjCqCwtzUcMA0GCSqGSIb3DQEBBQUAMBwxGjAY
-BgNVBAMTEXNoaWJib2xldGgudXR0LmZyMB4XDTA5MDgxMzE1Mzc0NVoXDTI5MDgxMzE1Mzc0NVow
-HDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dHQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDRy7HRMvRk5btG8GGPHKQVA6k3fFlikIFGHJx+B7Uo+kNdQInrMcixfhrqY8bnu66ljQKB
-vZ0yMEZfXJTofRfqBePOgtHEwLcgqQm68kRr4q8oLUdS/+XpK4EdPW6UIrFmA1KkcOfC/Jysn4f7
-KoFKDpTFmNnl7TGVu9GM/tl3yKGFEbuH8kNvG3uaJJVC59ZE2s/xoMcslriXytje2WP4F95DEYVn
-ddkYaw86ZHjjxVumcz7nndInsI8j5EVseK8Ch7cSqlmNA44GJ0kdikv4CphntgBIOvoG2ZvvAIW4
-DGFdMhZieqtwQ2FEKRxAujWY/Sxq6Zsd5anLj7DL8s09AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNo
-aWJib2xldGgudXR0LmZyhihodHRwczovL3NoaWJib2xldGgudXR0LmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBSt5O7Bubm1wxc8OOwz6hgpfVwMtTANBgkqhkiG9w0BAQUFAAOCAQEApDpM7DKM
-7GJs3m+yjN9xIaAVIIUAe+pcIybt8E02fa4+QVaB2RdPvCTgL3cfLZ2ONMEbMqYlWJz0J41P/TaZ
-x4Sxqv/ih2F1pmFks5UUaMbapNzOX3lL1FfBc718kTLAPLt4m9Gm741A/kx83CS0Q2U4mLXp8I5f
-fYMgN8FRoxHJOGsBSGs11nl32pzAiai069ZutsSp2mdyRovyNHS2Oxdumai87AHr1JiC3C8mwvQm
-Sh/3RmGTbPNeXL1AL2zzeKPcSqsEISEVUNbqQFKs37kcfAvy05jGGcfNHtq5GALqx/qhBeXMiVEB
-BcaKxmhZ8LPhUPppbcjFuLXlaNAphQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utt.fr:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Université de Technologie de Troyes</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Université de Technologie de Troyes</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <EmailAddress>cri@utt.fr</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml b/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml
deleted file mode 100644
index 36c1d868..00000000
--- a/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:com.itslearning.test">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.itslearning.com/elogin/logout.aspx"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.itslearning.com/elogin/default.aspx" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">itslearning</md:ServiceName>
- <md:ServiceDescription xml:lang="en">itslearning is a virtual learning environment specifically designed for schools and universities.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">itslearning er et virtuelt læringsmiljø, spesielt utformet for skoler og universiteter.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml b/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml
deleted file mode 100644
index dfecea53..00000000
--- a/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:com.itslearning">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itslearning.com/elogin/logout.aspx"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itslearning.com/elogin/default.aspx" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">itslearning</md:ServiceName>
- <md:ServiceDescription xml:lang="en">itslearning is a virtual learning environment specifically designed for schools and universities.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">itslearning er et virtuelt læringsmiljø, spesielt utformet for skoler og universiteter.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">itslearning</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">itslearning</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.itslearning.eu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:Company>itslearning</md:Company>
- <md:GivenName>itslearning Support</md:GivenName>
- <md:EmailAddress>support@itslearning.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
deleted file mode 100644
index 91df1aea..00000000
--- a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:no.uio.hpc.lap">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2014-07-29T14:36:18Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Language Analysis Portal (LAP)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="no">Språkanalyseportalen (LAP)</mdui:DisplayName>
- <mdui:Description xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
- centralized repository of a wide range of language technology tools, all installed on a high-performance
- computing cluster.</mdui:Description>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
- aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
- qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
- iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
- GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
- a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
- p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
- RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
- kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
- AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
- MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
- L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
- MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
- ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
- LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
- SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
- XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
- 5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
- 58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
- Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
- agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
- aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
- qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
- iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
- GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
- a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
- p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
- RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
- kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
- AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
- MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
- L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
- MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
- ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
- LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
- SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
- XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
- 5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
- 58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
- Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
- agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lap.hpc.uio.no/user/logout_feide_user"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap.hpc.uio.no/user/feide_auth" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">Language Analysis Portal (LAP)</md:ServiceName>
- <md:ServiceName xml:lang="no">Språkanalyseportalen (LAP)</md:ServiceName>
- <md:ServiceDescription xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
- centralized repository of a wide range of language technology tools, all installed on a high-performance
- computing cluster.</md:ServiceDescription>
- <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="givenname" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
- <md:OrganizationName xml:lang="no">Universitetet i Oslo</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="no">Universitet i Oslo</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.uio.no/english/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="no">http://www.uio.no/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Nikolay</md:GivenName>
- <md:SurName>Vazov</md:SurName>
- <md:EmailAddress>n.a.vazov@usit.uio.no</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml
deleted file mode 100644
index 97b65bba..00000000
--- a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="urn:mace:kuleuven.be:kulassoc:khleuven.be">
- <Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope regexp="false">associatie.kuleuven.be</shibmd:Scope>
- <shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">KHLeuven</mdui:DisplayName>
- <mdui:Description xml:lang="en">Katholieke Hogeschool Leuven</mdui:Description>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:KeyName>idp.khleuven.be</ds:KeyName>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDKDCCAhCgAwIBAgIVAIEBQgacYZ+Obt/8LGcNE9xCxtg1MA0GCSqGSIb3DQEB
- BQUAMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTAeFw0wOTEyMTUwOTI5Mjla
- Fw0yOTEyMTUwOTI5MjlaMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo7I1DRJ2ulw9KOgJGEX3Yo+Oi1
- axnNmLMaJQGWHIuKOih7ePjvm2MuGaFHZZLHsa3yI6JMsi6OWoh4FnUTfU8t+lSc
- i9Mn4zjQBIGQK6HAQiFjouUuMAKGD0hvXuqtIbw7cNK6dABRuZx6xbJ7HveUAb2W
- iLshYnfJ5smDY44UN68eOZfRS941NE+hY2EESWfRtHj3bF8K1eClv9DKaxB7A6zA
- 3A0kZrum6K2DiyiN4gj9pUpC0w86jdXmPq+/8XXHLnX2RTBJE55KNzNe82n0DomT
- qVXGZ5bxBNuSuS+IGKQpxNDO6py7wKxUVMdIRHoy2xUqU62JunMyfExCgwcCAwEA
- AaNlMGMwQgYDVR0RBDswOYIPaWRwLmtobGV1dmVuLmJlhiZodHRwczovL2lkcC5r
- aGxldXZlbi5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU6LNVU7ay63LW4qY9
- gmQd70bUxXQwDQYJKoZIhvcNAQEFBQADggEBABGQdtkb/TncVxlIi0ejI3AHUYmG
- RT05mU0Cmt1SEKybN6/VvwamKPWc9bmJu+uxJo3bxRVzOfUdXExZCe9KoLugj7KJ
- ECH1yRDSb+s9TV2djqGEQO104Ol6fhDRH1YV7FWGjQ79Roddu6IwEawek4VEY4om
- rQmBOTjKUb10v9xTTX28PsTM7e8Avbu9BujIgeX4KcsUWqDDsX8r9P8hK7aOS7Ym
- XPLrSitrNNrQYr9FzuRm995nQ20lVTjh83TiPADSXUXDkebI9GcKqDA662HTNpNp
- 5Dpn+ZM2hbJN+AbA9QdpVSb+MJCzpRyh2AlN8simVEiciy1+p5tWR3iLwv8=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.khleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.khleuven.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.khleuven.be/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.khleuven.be/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.khleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.khleuven.be/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope regexp="false">associatie.kuleuven.be</shibmd:Scope>
- <shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:KeyName>idp.khleuven.be</ds:KeyName>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDKDCCAhCgAwIBAgIVAIEBQgacYZ+Obt/8LGcNE9xCxtg1MA0GCSqGSIb3DQEB
- BQUAMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTAeFw0wOTEyMTUwOTI5Mjla
- Fw0yOTEyMTUwOTI5MjlaMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTCCASIw
- DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo7I1DRJ2ulw9KOgJGEX3Yo+Oi1
- axnNmLMaJQGWHIuKOih7ePjvm2MuGaFHZZLHsa3yI6JMsi6OWoh4FnUTfU8t+lSc
- i9Mn4zjQBIGQK6HAQiFjouUuMAKGD0hvXuqtIbw7cNK6dABRuZx6xbJ7HveUAb2W
- iLshYnfJ5smDY44UN68eOZfRS941NE+hY2EESWfRtHj3bF8K1eClv9DKaxB7A6zA
- 3A0kZrum6K2DiyiN4gj9pUpC0w86jdXmPq+/8XXHLnX2RTBJE55KNzNe82n0DomT
- qVXGZ5bxBNuSuS+IGKQpxNDO6py7wKxUVMdIRHoy2xUqU62JunMyfExCgwcCAwEA
- AaNlMGMwQgYDVR0RBDswOYIPaWRwLmtobGV1dmVuLmJlhiZodHRwczovL2lkcC5r
- aGxldXZlbi5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU6LNVU7ay63LW4qY9
- gmQd70bUxXQwDQYJKoZIhvcNAQEFBQADggEBABGQdtkb/TncVxlIi0ejI3AHUYmG
- RT05mU0Cmt1SEKybN6/VvwamKPWc9bmJu+uxJo3bxRVzOfUdXExZCe9KoLugj7KJ
- ECH1yRDSb+s9TV2djqGEQO104Ol6fhDRH1YV7FWGjQ79Roddu6IwEawek4VEY4om
- rQmBOTjKUb10v9xTTX28PsTM7e8Avbu9BujIgeX4KcsUWqDDsX8r9P8hK7aOS7Ym
- XPLrSitrNNrQYr9FzuRm995nQ20lVTjh83TiPADSXUXDkebI9GcKqDA662HTNpNp
- 5Dpn+ZM2hbJN+AbA9QdpVSb+MJCzpRyh2AlN8simVEiciy1+p5tWR3iLwv8=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.khleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.khleuven.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Katholieke Hogeschool Leuven</OrganizationName>
- <OrganizationDisplayName xml:lang="en">KHLeuven</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.khleuven.be/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <SurName>Technical Support</SurName>
- <EmailAddress>support@khleuven.be</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml
deleted file mode 100644
index ee14d6ae..00000000
--- a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="urn:mace:kuleuven.be:kulassoc:kuleuven.be">
- <Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope regexp="false">kuleuven.be</shibmd:Scope>
- <shibmd:Scope regexp="false">groept.be</shibmd:Scope>
- <shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
- <shibmd:Scope regexp="false">odisee.be</shibmd:Scope>
- <shibmd:Scope regexp="false">vives.be</shibmd:Scope>
- <shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
- <shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
- <shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
- <shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">KU Leuven Association</mdui:DisplayName>
- <mdui:DisplayName xml:lang="nl">Associatie KU Leuven</mdui:DisplayName>
- <mdui:Description xml:lang="en">KU Leuven and the associated university colleges</mdui:Description>
- <mdui:Description xml:lang="en">KU Leuven en de geassocieerde hogescholen</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://associatie.kuleuven.be/eng</mdui:InformationURL>
- <mdui:InformationURL xml:lang="nl">http://associatie.kuleuven.be/over</mdui:InformationURL>
- <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcFJpZ2h0czpNYXJrZWQ9IlRydWUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RDUwMUMyNENENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RDUwMUMyNERENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENTAxQzI0QUQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpENTAxQzI0QkQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnDgVQAAAAIVSURBVHjadFLNaxNBFJ+dnd3ZbDeaRJuvGhoPGqGt0iqpgpJ68NRj8aIInsSLqFSPFf8CPXrwIB6KYCXSqwcVpILUQz0EvJaINYY0CU33a3ZmfJtE3UL7Y5mdeR/zfu/9Rrn9vokiUBBiQoq/ew0raC9I9ABen0s3kKQfx6WElaqKkAck+Bx5HN2bPpyOqXB0Avl0o7vLZIz8r4OjZFouLyW1s2laiBP4Tia1mTRtOjxKC0fp24EsZ2i05vksJRjJfRNsJgsWuZDbkzCR0k8k9K4nIn32gbHScsX0qG5p4RW/bFHv8cEYZjO040uMh5HETCVDOio20G45O5zBVxu3fXTDCvflLF3dkjRlYRHWIZ9fLMOv1bWL+eTMpauDhMdLz+vNnesr9+Ha8TgRXz6uftvMpA9BN6T27gNU69Q25xYXcH/8LOCTJiseQa7HTEMHy5TuvFqutiaLUkhlbO4h4+J3o71efXRuYhzth/rWdml+iRr6CO1L32x0Ls6eOigaUMil5iunOz+3w6ZBdtmz71y7/M+9cPfZj0YbnkVx7OjrJ7cGxsWbV968XQsCQXwWJAqjwHXjex0csFZXPqFYSH19rfayMnWmdCx8NSzIH885jqfkKw90XXNcv2d74BBCJOImUTEID913dxxQAOwxqlkmhTQCtBh4uDBoKIKKsapiAYRggqoaHzG4GMrsBxzG+EeAAQCt0M7G/zjX3wAAAABJRU5ErkJggg==</mdui:Logo>
- <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABLCAYAAAA1fMjoAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDozMkNEMEY5MDg3OUQxMURDOTFDN0UzMEIyRjdCQjM1QyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5QzUzODlCMkQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5QzUzODlCMUQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBJbGx1c3RyYXRvciBDUzUuMSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3Jk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</mdui:Logo>
- </mdui:UIInfo>
- <mdui:DiscoHints>
- <mdui:DomainHint>kuleuven.be</mdui:DomainHint>
- <mdui:IPHint>134.58.0.0/16</mdui:IPHint>
- <mdui:IPHint>193.190.168.0/23</mdui:IPHint>
- <mdui:IPHint>193.190.176.0/22</mdui:IPHint>
- <mdui:IPHint>193.190.180.0/23</mdui:IPHint>
- <mdui:IPHint>193.190.253.0/24</mdui:IPHint>
- <mdui:IPHint>193.190.146.160/27</mdui:IPHint>
- <mdui:IPHint>193.190.57.0/26</mdui:IPHint>
- <mdui:IPHint>193.190.57.192/27</mdui:IPHint>
- <mdui:IPHint>193.190.57.224/27</mdui:IPHint>
- <mdui:IPHint>193.190.58.0/26</mdui:IPHint>
- <mdui:IPHint>193.190.59.0/24</mdui:IPHint>
- <mdui:IPHint>193.190.255.0/25</mdui:IPHint>
- <mdui:IPHint>193.190.138.0/24</mdui:IPHint>
- <mdui:IPHint>193.191.187.0/25</mdui:IPHint>
- <mdui:IPHint>193.190.77.0/26</mdui:IPHint>
- <mdui:IPHint>193.190.224.0/24</mdui:IPHint>
- <mdui:IPHint>193.190.225.0/24</mdui:IPHint>
- <mdui:IPHint>193.190.130.128/26</mdui:IPHint>
- <mdui:IPHint>2a02:2c40::/32</mdui:IPHint>
- <mdui:GeolocationHint>geo:50.9378101,4.0409517000000505</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.2194475,4.40246430000002</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.209348,3.2246995000000424</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:50.84999999999999,4.350000000000023</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:50.91083,5.4133600000000115</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:50.98965,5.050160000000005</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:50.8464506,4.262063000000012</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.16257,4.990839999999935</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.0543422,3.717424299999948</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:50.93069,5.332480000000032</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:50.8194776,3.2577263000000584</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:50.87822088437878,4.702697216918987</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.1302138,4.571509200000037</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.0258761,4.477536200000031</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.2166667,2.8999999999999772</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:50.94990869999999,3.129447099999993</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:50.8674164,4.377298099999962</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.07045,4.53135999999995</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.1558839,4.15444100000002</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:50.940892,4.904695599999968</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.06498,3.101570000000038</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.3216509,4.93755770000007</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:51.2025247,4.770882700000016</mdui:GeolocationHint>
- <mdui:GeolocationHint>geo:50.8134333,4.324834399999986</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
-DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
-WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
-CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
-KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
-GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
-d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
-bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
-llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
-AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
-vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
-+yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
-yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
-5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kuleuven.be/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kuleuven.be/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope regexp="false">kuleuven.be</shibmd:Scope>
- <shibmd:Scope regexp="false">groept.be</shibmd:Scope>
- <shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
- <shibmd:Scope regexp="false">odisee.be</shibmd:Scope>
- <shibmd:Scope regexp="false">vives.be</shibmd:Scope>
- <shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
- <shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
- <shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
- <shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
-DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
-WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
-CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
-KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
-GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
-d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
-bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
-llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
-AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
-vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
-+yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
-yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
-5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="nl">KU Leuven / Associatie KU Leuven</OrganizationName>
- <OrganizationDisplayName xml:lang="nl">KU Leuven / Associatie KU Leuven</OrganizationDisplayName>
- <OrganizationURL xml:lang="nl">https://admin.kuleuven.be/icts/servicepunt</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <GivenName>AAI team</GivenName>
- <EmailAddress>shib@kuleuven.be</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>ICTS Servicepunt</GivenName>
- <EmailAddress>servicepunt@icts.kuleuven.be</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vre3.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/vre3.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 1484944e..00000000
--- a/swamid-interfederations-2.0/vre3.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vre3.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 vre test server SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0zCCAbugAwIBAgIJAN89RA/ouVz1MA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
- BAMTBHZyZTMwHhcNMTEwOTA2MTM0NzQ0WhcNMjEwOTAzMTM0NzQ0WjAPMQ0wCwYD
- VQQDEwR2cmUzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1BrxRDzr
- taAWtrCaVSoyi641U7EGH3ahv4ZWEdRmqkmMS4ikX2HCbLEasn047jzOEwkdm+FO
- //MEWlV1Vj67T/QeCJ0+7nzNi2q3ZL2sLxDdSDiH4+vpQvIuZb3qFi2EdBbYSDxO
- AT16DERnVducRQk4CccEoGvgPZJIPN1gj5tQ3x0AB1JFRfLqIYOPJfnbROa/xoHH
- 86HVsf7tM5qVpwSOhUDqf5haX5RVg+tnZjUKoNm/ddyFG0q6gK8FaXRAurTQCt+h
- AuMIg/Bz8CHdatmyDcQCxhlQHQzIKUmiJqf08YHeJYW06GqY+MIvL74Ng06SfQRv
- lowKC5rKh5vmXQIDAQABozIwMDAPBgNVHREECDAGggR2cmUzMB0GA1UdDgQWBBSO
- IS0tL/1uexjdGOm/MNM+KScYvDANBgkqhkiG9w0BAQUFAAOCAQEAKyMU4NKXGXga
- 47MxzefEBI+jt1g7oXJ9sZaVGzuCrpthXyF4EXGYOjNRYN3TpCQ1tySsG+ZV6Ggf
- FwJRhQw449F/rP+VRMX0GOODcbhAwj7Y9/aOLG2T2SlnIgDlCwzAdZRonGUqD7E+
- MAXZ4J1u1+Vv8DBY70VTcBcHvaKLWrDoQ1C/vY21k7HFRwUn7zeTWMIkNisgy7np
- Zdb+yitHBbuK2JWwszdg9ZPfzRiUg/+FSxieTOeJ4760GZj6pLrkELt58KByg71k
- 3Jdz2K475GucKjNwbzDJIexEwqxUs4pmwyat4AbkomNcFpsv7RXdwCYBEHcxDjjP
- OjcWVO2B3w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0zCCAbugAwIBAgIJAN89RA/ouVz1MA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
- BAMTBHZyZTMwHhcNMTEwOTA2MTM0NzQ0WhcNMjEwOTAzMTM0NzQ0WjAPMQ0wCwYD
- VQQDEwR2cmUzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1BrxRDzr
- taAWtrCaVSoyi641U7EGH3ahv4ZWEdRmqkmMS4ikX2HCbLEasn047jzOEwkdm+FO
- //MEWlV1Vj67T/QeCJ0+7nzNi2q3ZL2sLxDdSDiH4+vpQvIuZb3qFi2EdBbYSDxO
- AT16DERnVducRQk4CccEoGvgPZJIPN1gj5tQ3x0AB1JFRfLqIYOPJfnbROa/xoHH
- 86HVsf7tM5qVpwSOhUDqf5haX5RVg+tnZjUKoNm/ddyFG0q6gK8FaXRAurTQCt+h
- AuMIg/Bz8CHdatmyDcQCxhlQHQzIKUmiJqf08YHeJYW06GqY+MIvL74Ng06SfQRv
- lowKC5rKh5vmXQIDAQABozIwMDAPBgNVHREECDAGggR2cmUzMB0GA1UdDgQWBBSO
- IS0tL/1uexjdGOm/MNM+KScYvDANBgkqhkiG9w0BAQUFAAOCAQEAKyMU4NKXGXga
- 47MxzefEBI+jt1g7oXJ9sZaVGzuCrpthXyF4EXGYOjNRYN3TpCQ1tySsG+ZV6Ggf
- FwJRhQw449F/rP+VRMX0GOODcbhAwj7Y9/aOLG2T2SlnIgDlCwzAdZRonGUqD7E+
- MAXZ4J1u1+Vv8DBY70VTcBcHvaKLWrDoQ1C/vY21k7HFRwUn7zeTWMIkNisgy7np
- Zdb+yitHBbuK2JWwszdg9ZPfzRiUg/+FSxieTOeJ4760GZj6pLrkELt58KByg71k
- 3Jdz2K475GucKjNwbzDJIexEwqxUs4pmwyat4AbkomNcFpsv7RXdwCYBEHcxDjjP
- OjcWVO2B3w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vre3.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Newcastle upon Tyne: vre test server SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/waesidp.overtsoftware.com-idp-shibboleth.xml b/swamid-interfederations-2.0/waesidp.overtsoftware.com-idp-shibboleth.xml
deleted file mode 100644
index 3f67e8ae..00000000
--- a/swamid-interfederations-2.0/waesidp.overtsoftware.com-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://waesidp.overtsoftware.com/idp/shibboleth">
- <!--
- This is a "Wolverhampton Adult Education Service" Shibboleth IdP for Overt Software Solutions Ltd.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T11:20:45Z"/>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">waesidp.overtsoftware.com</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDyjCCArICCQD98bKQTafbzTANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
- R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHDA1LaWRkZXJtaW5z
- dGVyMSEwHwYDVQQKDBhPdmVydCBTb2Z0d2FyZSBTb2x1dGlvbnMxHzAdBgNVBAsM
- Fk92ZXJ0IFNvZnR3YXJlIFN1cHBvcnQxIjAgBgNVBAMMGXdhZXNpZHAub3ZlcnRz
- b2Z0d2FyZS5jb20wHhcNMTIxMTIyMTU1NjIwWhcNMzIxMTE3MTU1NjIwWjCBpjEL
- MAkGA1UEBhMCR0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHDA1L
- aWRkZXJtaW5zdGVyMSEwHwYDVQQKDBhPdmVydCBTb2Z0d2FyZSBTb2x1dGlvbnMx
- HzAdBgNVBAsMFk92ZXJ0IFNvZnR3YXJlIFN1cHBvcnQxIjAgBgNVBAMMGXdhZXNp
- ZHAub3ZlcnRzb2Z0d2FyZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
- AoIBAQClkFrULsiQp0TWymOLBVV75u6/fcE5LdDk6iRfSDbjM7c2vqMWhJZWS+y4
- 5Lj7RL70QChLlXkt0du9Fn5DtL4AAg7lE47ptMqy0Wt+PjwGn6AtqyL30d04xAr9
- h5PigAhJttSknORSCObgrchpUs3vYUxM8vIrE61ButMh44bskPS36E31x/iON5gm
- MSIipVKacJODKpyC9GgTFhSCpSjjFNiCuSm4QonZZruQKy2iNHql7IlxFRSGwbgp
- /bpFcXhJc8OXhLTA89NPcLRqFGDWQrZsL8bqaGwWIMCtM0jTHkfldjv5/STOeLAP
- U6zH1vB4mQbU5RG2sDlciWmiceEnAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAFCT
- 3svdpyrgEJhwqR3Sq7NxVCrAKjQ0vWt++uQspxNJu+f/6HIHIkOIHak0tv/16sOO
- 3hTmVM7WketQnITSgMKv8ZLJEQ7JXBYX+Rvgjr0UfkyhM7Ji218LGlc2Xk2uftqt
- pgvVjwPB22aKsWPpwDtw9S5hrmFWoBTAvdTO+A8h25593+AQ9V+JsZtPlvO51TC+
- 5hY9jPMu4dCz7Zqfui9tHBsnfWEsIiFrPIL7RakAzCb+mcQHsu2Prehfdet2VUxG
- 9Q+aMQDCRW/kLjtZ7dJY3EHWBqS3XmOEpe5Aqam2UqMIAm71+fE8WiYXONAPoHVo
- pbi+iii0U0z46JpkNW4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://waesidp.overtsoftware.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://waesidp.overtsoftware.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://waesidp.overtsoftware.com/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://waesidp.overtsoftware.com/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://waesidp.overtsoftware.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://waesidp.overtsoftware.com/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">waesidp.overtsoftware.com</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDyjCCArICCQD98bKQTafbzTANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
- R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHDA1LaWRkZXJtaW5z
- dGVyMSEwHwYDVQQKDBhPdmVydCBTb2Z0d2FyZSBTb2x1dGlvbnMxHzAdBgNVBAsM
- Fk92ZXJ0IFNvZnR3YXJlIFN1cHBvcnQxIjAgBgNVBAMMGXdhZXNpZHAub3ZlcnRz
- b2Z0d2FyZS5jb20wHhcNMTIxMTIyMTU1NjIwWhcNMzIxMTE3MTU1NjIwWjCBpjEL
- MAkGA1UEBhMCR0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHDA1L
- aWRkZXJtaW5zdGVyMSEwHwYDVQQKDBhPdmVydCBTb2Z0d2FyZSBTb2x1dGlvbnMx
- HzAdBgNVBAsMFk92ZXJ0IFNvZnR3YXJlIFN1cHBvcnQxIjAgBgNVBAMMGXdhZXNp
- ZHAub3ZlcnRzb2Z0d2FyZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
- AoIBAQClkFrULsiQp0TWymOLBVV75u6/fcE5LdDk6iRfSDbjM7c2vqMWhJZWS+y4
- 5Lj7RL70QChLlXkt0du9Fn5DtL4AAg7lE47ptMqy0Wt+PjwGn6AtqyL30d04xAr9
- h5PigAhJttSknORSCObgrchpUs3vYUxM8vIrE61ButMh44bskPS36E31x/iON5gm
- MSIipVKacJODKpyC9GgTFhSCpSjjFNiCuSm4QonZZruQKy2iNHql7IlxFRSGwbgp
- /bpFcXhJc8OXhLTA89NPcLRqFGDWQrZsL8bqaGwWIMCtM0jTHkfldjv5/STOeLAP
- U6zH1vB4mQbU5RG2sDlciWmiceEnAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAFCT
- 3svdpyrgEJhwqR3Sq7NxVCrAKjQ0vWt++uQspxNJu+f/6HIHIkOIHak0tv/16sOO
- 3hTmVM7WketQnITSgMKv8ZLJEQ7JXBYX+Rvgjr0UfkyhM7Ji218LGlc2Xk2uftqt
- pgvVjwPB22aKsWPpwDtw9S5hrmFWoBTAvdTO+A8h25593+AQ9V+JsZtPlvO51TC+
- 5hY9jPMu4dCz7Zqfui9tHBsnfWEsIiFrPIL7RakAzCb+mcQHsu2Prehfdet2VUxG
- 9Q+aMQDCRW/kLjtZ7dJY3EHWBqS3XmOEpe5Aqam2UqMIAm71+fE8WiYXONAPoHVo
- pbi+iii0U0z46JpkNW4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://waesidp.overtsoftware.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://waesidp.overtsoftware.com:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Overt Software Solutions Ltd</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Wolverhampton Adult Education Service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.aes.wolverhampton.gov.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Overt Software Solutions Ltd Support</GivenName>
- <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Andre</SurName>
- <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wiki.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index 9e69670f..00000000
--- a/swamid-interfederations-2.0/wiki.cam.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.cam.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2 SP for the University of Cambridge.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.cam.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.cam.ac.uk/Shibboleth.sso/WAYF"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.cam.ac.uk/Shibboleth.sso/DS"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC6zCCAdOgAwIBAgIJALxgsrCx+TDKMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
- BAMTDDEzMS4xMTEuOC4yNTAeFw0xMTAxMTgxNjM1MTlaFw0yMTAxMTUxNjM1MTla
- MBcxFTATBgNVBAMTDDEzMS4xMTEuOC4yNTCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBAMFz7ge2OzAPQS7PH3J5XJY479khx+T8V5jAODzlk2TsPWOlhlFI
- MRnquoCUJtU1boQx84XGkyiroenCR0Y3noMm9lKVtkDXeVfTmrIze9HfScK4gC4Z
- 4UEqqNndhnTZS/4Wv3JivWz/Bb3cTLm9X+OkWeHW1ADEw7fYyfHYNV/fFbIwz7q2
- ZlQ0GSyw5751ViBB2BB//nHcwXL6scVwBjfWCow/X7eg0gg+slOcCgLtt9k6JPnY
- /5m7qUU+LTbUqOa2GplZELC9qxVWAK37spUhJNsz1TNBY5W0vOvFzJ0hjkSRTF3u
- SIELGEwSrKHyjbaBwGlQCg2UNICJLZ/VLX0CAwEAAaM6MDgwFwYDVR0RBBAwDoIM
- MTMxLjExMS44LjI1MB0GA1UdDgQWBBQ5ZMOSfqLc43MRkEB6YyHRtF0TnzANBgkq
- hkiG9w0BAQUFAAOCAQEAZYBwM11lTO9Qka9+qqcYcyEfNJs/6EpmbOC4akYfcoJ/
- dTJsVwQ3g2w9EVka83mg36+cAlJtHr8zfOd1ul+NnV5nJ274UrpQZRReYGP562Dg
- 1bzpKo0qex5EINkOUkg+UybB3qEmDUM4T2TzQg5EDayCDwNF9ffio6QECZ9rjNC7
- HBQjDcAhLBX6b+yRkBBSKloN6tsAHpmf/wYnB4kTWiBuzEPLyfXA9zu8Cn49j2N8
- XUTCln8U+YTW51B5oZre5jUhTqFNLVyqi0drdulE9eWPjHYCCXqwKZiMlhjzV6Kw
- ElyOiDmeccOIUqK4DqrN3+J7EEAhlbc/vBuC2fyPbA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Cambridge: Managed Wiki Service</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.cam.ac.uk/cs/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Wiki Support</GivenName>
- <EmailAddress>mailto:wiki-support@ucs.cam.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Wiki Support</GivenName>
- <EmailAddress>mailto:wiki-support@ucs.cam.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml
index f3daceb5..671d942c 100644
--- a/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml
@@ -3,7 +3,6 @@
<md:Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/wiki.mas.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/wiki.mas.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 1041ada7..00000000
--- a/swamid-interfederations-2.0/wiki.mas.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.mas.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Maths School Wiki Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-01T12:40:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDTCCAfWgAwIBAgIJAODuHO/6fjT8MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEXBvaXNzb24ubmNsLmFjLnVrMB4XDTExMDMyNDExNTQ1MFoXDTIxMDMyMTEx
- NTQ1MFowHDEaMBgGA1UEAxMRcG9pc3Nvbi5uY2wuYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQC+IGD/pMz62hUMmeyFL03kAhS9ZxL23ZQEV+uD
- 7DbiEhOpgPDiSIVihycH2FceKON6vaJrSjJtWNA0W929qQV8nSomsSVRHVlDP47A
- jKz4zHuc2QKu77Om4kkp00aQJfi674AafqDyDQvp71/sz5liSRPzs8ygMLQDGmRf
- Zcu1GE9NC0HtGQXW0Ytlg5yXmGzbuSoIM5Z56OFJiA5BFmYe3yVI8Mvkzx39+Do6
- nxX7ChzApsqLvz+AHp2q9aBDVHOJbvH4Y4fFwSmM818+n/0UDtHD0xhHFm7yjA/B
- I6Ex2tULv+MAF/ia2D8eepv0eDOndXHdtmYL/f9+uwAXTZTNAgMBAAGjUjBQMC8G
- A1UdEQQoMCaCEXBvaXNzb24ubmNsLmFjLnVrhhF3d3cubWFzLm5jbC5hYy51azAd
- BgNVHQ4EFgQUZEVeSqaoWw7awB9cftUwiseq77MwDQYJKoZIhvcNAQEFBQADggEB
- AEi0uguGZdMFbky7wppx2cp1TL2DPLHa0Yqwyyf1PzB1H+IZdevrV6zOclruRGCh
- fCSecS5czJCZbaUCOakh+99cVTKDLOJQYrWt4mbgI8g6IloeFCQ9c9SA1g5NK50K
- XSRR8Vf67Wv5I4GGj0Ic1qUaEHJwcVYo1KiUE206eZYcVS+NeZZ5fEihkwJ81lwM
- Xl3qiQMBTmYReoTGskMwOfIY+agbrDxrCZ8L0c049aqhDZvLEdIB6oTrTr8mP01A
- ETHcMrpuk6kXMRPI4ecCwTobTC2bwlp1S1hMxOPHtEbsSV04WuZEdhBcpCiVgobr
- ccH1ZOPmbjgfGMwNw2cculQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDTCCAfWgAwIBAgIJAODuHO/6fjT8MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEXBvaXNzb24ubmNsLmFjLnVrMB4XDTExMDMyNDExNTQ1MFoXDTIxMDMyMTEx
- NTQ1MFowHDEaMBgGA1UEAxMRcG9pc3Nvbi5uY2wuYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQC+IGD/pMz62hUMmeyFL03kAhS9ZxL23ZQEV+uD
- 7DbiEhOpgPDiSIVihycH2FceKON6vaJrSjJtWNA0W929qQV8nSomsSVRHVlDP47A
- jKz4zHuc2QKu77Om4kkp00aQJfi674AafqDyDQvp71/sz5liSRPzs8ygMLQDGmRf
- Zcu1GE9NC0HtGQXW0Ytlg5yXmGzbuSoIM5Z56OFJiA5BFmYe3yVI8Mvkzx39+Do6
- nxX7ChzApsqLvz+AHp2q9aBDVHOJbvH4Y4fFwSmM818+n/0UDtHD0xhHFm7yjA/B
- I6Ex2tULv+MAF/ia2D8eepv0eDOndXHdtmYL/f9+uwAXTZTNAgMBAAGjUjBQMC8G
- A1UdEQQoMCaCEXBvaXNzb24ubmNsLmFjLnVrhhF3d3cubWFzLm5jbC5hYy51azAd
- BgNVHQ4EFgQUZEVeSqaoWw7awB9cftUwiseq77MwDQYJKoZIhvcNAQEFBQADggEB
- AEi0uguGZdMFbky7wppx2cp1TL2DPLHa0Yqwyyf1PzB1H+IZdevrV6zOclruRGCh
- fCSecS5czJCZbaUCOakh+99cVTKDLOJQYrWt4mbgI8g6IloeFCQ9c9SA1g5NK50K
- XSRR8Vf67Wv5I4GGj0Ic1qUaEHJwcVYo1KiUE206eZYcVS+NeZZ5fEihkwJ81lwM
- Xl3qiQMBTmYReoTGskMwOfIY+agbrDxrCZ8L0c049aqhDZvLEdIB6oTrTr8mP01A
- ETHcMrpuk6kXMRPI4ecCwTobTC2bwlp1S1hMxOPHtEbsSV04WuZEdhBcpCiVgobr
- ccH1ZOPmbjgfGMwNw2cculQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.mas.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Maths School Wiki Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.canvas-lts.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.canvas-lts.co.uk-shibboleth.xml
deleted file mode 100644
index 95eaf201..00000000
--- a/swamid-interfederations-2.0/www.canvas-lts.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.canvas-lts.co.uk/shibboleth">
- <!--
- This is a 'CANVAS Virtual World' SP owned by Clicks and Links Ltd
- on behalf of Learning and Teaching Scotland.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIENDCCAxygAwIBAgIJAOILXI8lIZ4SMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
- VQQGEwJVSzETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
- cjEaMBgGA1UEChMRU2Vjb25kIFBsYWNlcyBMdGQxFjAUBgNVBAMTDVNlY29uZCBQ
- bGFjZXMxLTArBgkqhkiG9w0BCQEWHnN5c3RlbWFkbWluQGNsaWNrc2FuZGxpbmtz
- LmNvbTAeFw0xMTEwMTcxMjMwNTJaFw0yMTEwMTQxMjMwNTJaMIGaMQswCQYDVQQG
- EwJVSzETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3RlcjEa
- MBgGA1UEChMRU2Vjb25kIFBsYWNlcyBMdGQxFjAUBgNVBAMTDVNlY29uZCBQbGFj
- ZXMxLTArBgkqhkiG9w0BCQEWHnN5c3RlbWFkbWluQGNsaWNrc2FuZGxpbmtzLmNv
- bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANo4hn1CsD36YOBFHUI/
- 0i2gqxzKnDWePTuDxsmpX7QICX9vhxOFyhHPgITjKucKSxviF/J4Julaa2cuZNhj
- qegkhOBm7bzAWrtU83OVTSBhvR9EX4OLLAAEhudhSGjCZylGQtKgELeK+pO+wdNs
- 1EmhXkoYO++qkZe/vT0Mc7ChCdvS3ETMztA1vbIdQzkezgqcopjI+/uHdEue6ZtT
- unUwPww6qWJx95zjwNEC6oO0bSvShSrT+JZmqIsjoW4uD8d7KsjZzMmCFdyzhqEf
- r9D6upklsMDKg1pt312LVHKcNvaoaFlvHIvCmJdzTyfho3DLkOlIs9BFVrtmEWpV
- nX0CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
- ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFM03AkI0E8mqSLItSDX09d1R
- PGABMB8GA1UdIwQYMBaAFM03AkI0E8mqSLItSDX09d1RPGABMA0GCSqGSIb3DQEB
- BQUAA4IBAQCwVfQ/pVH2ckgxDBoRaeHCOMi8w9GrMTh1Ocd89A93ZTkd2J1glfbw
- RMsJX6GPlYHnYcvJOyoHwL404brF5GjspQQfR4MmT53XHc1XY20VJh0gkW9b+FcU
- XwFlWTor97mbuM66mHsqeR8JRSDDEy7n/smS+AyGnggt8NJw17MT6gpztNK6vu3P
- IKml13bSFgsK11hzmWJxUZECh2eb05X6FVTySii6c2eXHt1Qf6q0DgcrJ3MAPROd
- 5AMWh3eBgNvxr6pTGjNmHK6sWELp3Zhd5M7nLAocTlShxid5Ul4sWA26QQxm3IfH
- 4YrG9nGV2c3oyg7WmARkK+F35QHvucC1
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIENDCCAxygAwIBAgIJAOILXI8lIZ4SMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
- VQQGEwJVSzETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
- cjEaMBgGA1UEChMRU2Vjb25kIFBsYWNlcyBMdGQxFjAUBgNVBAMTDVNlY29uZCBQ
- bGFjZXMxLTArBgkqhkiG9w0BCQEWHnN5c3RlbWFkbWluQGNsaWNrc2FuZGxpbmtz
- LmNvbTAeFw0xMTEwMTcxMjMwNTJaFw0yMTEwMTQxMjMwNTJaMIGaMQswCQYDVQQG
- EwJVSzETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3RlcjEa
- MBgGA1UEChMRU2Vjb25kIFBsYWNlcyBMdGQxFjAUBgNVBAMTDVNlY29uZCBQbGFj
- ZXMxLTArBgkqhkiG9w0BCQEWHnN5c3RlbWFkbWluQGNsaWNrc2FuZGxpbmtzLmNv
- bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANo4hn1CsD36YOBFHUI/
- 0i2gqxzKnDWePTuDxsmpX7QICX9vhxOFyhHPgITjKucKSxviF/J4Julaa2cuZNhj
- qegkhOBm7bzAWrtU83OVTSBhvR9EX4OLLAAEhudhSGjCZylGQtKgELeK+pO+wdNs
- 1EmhXkoYO++qkZe/vT0Mc7ChCdvS3ETMztA1vbIdQzkezgqcopjI+/uHdEue6ZtT
- unUwPww6qWJx95zjwNEC6oO0bSvShSrT+JZmqIsjoW4uD8d7KsjZzMmCFdyzhqEf
- r9D6upklsMDKg1pt312LVHKcNvaoaFlvHIvCmJdzTyfho3DLkOlIs9BFVrtmEWpV
- nX0CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
- ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFM03AkI0E8mqSLItSDX09d1R
- PGABMB8GA1UdIwQYMBaAFM03AkI0E8mqSLItSDX09d1RPGABMA0GCSqGSIb3DQEB
- BQUAA4IBAQCwVfQ/pVH2ckgxDBoRaeHCOMi8w9GrMTh1Ocd89A93ZTkd2J1glfbw
- RMsJX6GPlYHnYcvJOyoHwL404brF5GjspQQfR4MmT53XHc1XY20VJh0gkW9b+FcU
- XwFlWTor97mbuM66mHsqeR8JRSDDEy7n/smS+AyGnggt8NJw17MT6gpztNK6vu3P
- IKml13bSFgsK11hzmWJxUZECh2eb05X6FVTySii6c2eXHt1Qf6q0DgcrJ3MAPROd
- 5AMWh3eBgNvxr6pTGjNmHK6sWELp3Zhd5M7nLAocTlShxid5Ul4sWA26QQxm3IfH
- 4YrG9nGV2c3oyg7WmARkK+F35QHvucC1
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.canvas-lts.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Clicks and Links Ltd</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Clicks and Links Ltd: CANVAS Virtual World</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ltscotland.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Olli</GivenName>
- <SurName>Aro</SurName>
- <EmailAddress>mailto:support@clicksandlinks.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Olli</GivenName>
- <SurName>Aro</SurName>
- <EmailAddress>mailto:systemadmin@clicksandlinks.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/resviz.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml
index d742a623..ea6ba9db 100644
--- a/swamid-interfederations-2.0/resviz.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://resviz.ncl.ac.uk/shibboleth/metadata">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.climatescience.cam.ac.uk/shibboleth">
<!--
- This is a "Newcastle University Resviz Server" Shibboleth SP for the University of Newcastle upon Tyne.
+ This is a "Cambridge Centre for Climate Science" Shibboleth SP for the University of Cambridge.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -20,40 +20,41 @@
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-11T09:42:04Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-05T15:47:46Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/WAYF"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/DS"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIC2TCCAcGgAwIBAgIJAPryWnNTsqYtMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
- BAMTBnJlc3ZpejAeFw0xNDA5MDkxNjE5NTRaFw0yNDA5MDYxNjE5NTRaMBExDzAN
- BgNVBAMTBnJlc3ZpejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMj9
- qKEBJ7owZiiX3JFBvb+MobE295X1gZLUlAFaustJegA6UmJJZK8Rln5Fpk+12pZm
- Ts7PYZohe1TqIrX1eLh++/DwC/N2FytJXHdavRTnwibS5wLVE/4KWq4qNypNhCrf
- Cc3KA7PAUSDhjzAVF1fRr7xFQ0uQ3lBrg2aynjN4pFIgDMEnWLqrqtg3pk7PVo7G
- BAPkuupqgbK8xbFH2wZi0PHS6YUuUrrvh/5IZrok53xtqJyzK7yAzh/bzFg/sCXm
- bcu42Y5FuvuQqhQ2P5vAXZtehurRcs64K5C5uqGhdwOQIkLQl6Aipel5jwk0dmv4
- ujkN20r2rqi70PanvKsCAwEAAaM0MDIwEQYDVR0RBAowCIIGcmVzdml6MB0GA1Ud
- DgQWBBQ/YGD4BVTIic3FT/9vBSUMfpf3hjANBgkqhkiG9w0BAQUFAAOCAQEAc0Xx
- tifN+9KteiuZPJ5M0FykxO6GX7BZlx0uaH8woWXgaiDe/hyIj83EE6JDJzRH7ijn
- Lyadprd/PVycQs9eFgfAIVhqflxDGihRnsh8z+bZUkjMSPQ9+YuWBDWYxNg/n7cW
- uxbcdqpMrBAoWP6SznSCM6k513aZ+aDuPc5wGFk0zPULrtNkVkkdgpvLhc2AQ46M
- nuzCJadsT9Ka+r1QHuLwpGcR0V0/tMO8XSlCL68BriFlTHXMH5sjXvtC77tcOUc3
- wjeZqDgrgKr2b3N24Ds2ORtTtehoip1p0A1sYZ8VQ3JLHsBEo0kMmpcDw0GfVycR
- eQN+cMjFGP0T4XhcCw==
+ MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+ BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+ MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+ azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+ tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+ HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+ gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+ GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+ YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+ +lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+ MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+ AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+ yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+ TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+ +k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+ O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+ RsenNm/aXp0wIU+jHVmi/GAPCQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
@@ -61,35 +62,33 @@
<EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://resviz.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Resviz Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/computing/</OrganizationURL>
+ <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Cambridge Centre for Climate Science</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://www.climatescience.cam.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
+ <GivenName>Falcon Support</GivenName>
+ <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Sebastion</GivenName>
- <SurName>Mellor</SurName>
- <EmailAddress>mailto:s.j.i.mellor@newcastle.ac.uk</EmailAddress>
+ <GivenName>Falcon Support</GivenName>
+ <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cpcc.group.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.cpcc.group.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index 76838a83..00000000
--- a/swamid-interfederations-2.0/www.cpcc.group.cam.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cpcc.group.cam.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2 'Cambridge Pancreas Cancer Centre' SP owned by the University of Cambridge.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
- MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
- tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
- HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
- gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
- GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
- YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
- +lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
- MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
- AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
- yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
- TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
- +k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
- O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
- RsenNm/aXp0wIU+jHVmi/GAPCQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
- MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
- tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
- HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
- gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
- GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
- YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
- +lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
- MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
- AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
- yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
- TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
- +k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
- O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
- RsenNm/aXp0wIU+jHVmi/GAPCQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cpcc.group.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Cambridge: Cambridge Pancreas Cancer Centre</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://www.cpcc.group.cam.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Falcon Support</GivenName>
- <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Falcon Support</GivenName>
- <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml
index 9ceee214..abd5ff60 100644
--- a/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.idcore.ac.uk/shibboleth">
<!--
- This is an IDCore Shibboleth SP for the University of Edinburgh.
+ This is an "IDCore: Industrial Doctoral Centre for Offshore Renewable Energy" Shibboleth SP for the University of Edinburgh.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
diff --git a/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml b/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml
index e4379b79..576fa0a5 100644
--- a/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml
@@ -1,12 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.liebertonline.com/shibboleth">
<!--
- This is a 'Liebert Online' service provider for Atypon Systems, Inc.
+ This is a "Mary Ann Liebert, Inc. publishers" OpenSAML SP for Atypon Systems, Inc.
-->
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-17T17:28:20Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Mary Ann Liebert</mdui:DisplayName>
+ <mdui:Description xml:lang="en">&gt;Mary Ann Liebert publishes integrated media content in biotechnology, biomedical research, clinical medicine and surgery, among others.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.liebertpub.com/nv/company/about-us/1/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMDCCAhigAwIBAgIJAKDOIiXpyPeZMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+ BAMTFW9ubGluZS5saWViZXJ0cHViLmNvbTAeFw0xNDAzMTQwNTAzNDlaFw0xNzAz
+ MTMwNTAzNDlaMCAxHjAcBgNVBAMTFW9ubGluZS5saWViZXJ0cHViLmNvbTCCASIw
+ DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7/SYDfsaPbVYvAvpyFaTm0N9gF
+ F3WclCufGBuJBHr985O6elVYWrANB0CLyIdUlHN6eCKTcZTv+aKD4gHX4ECDxnfj
+ ozWWL8e2xbAAWq7Q9e8Br9UQGMFcVe4n3gOoeazUDBXMDMR/XC9zX4SZgUij6Zk6
+ 1W3sNHXkT/+olQriyyWD9UmF+TZcqySxQaaiDXen3yVsqU542slFWHLCXN9DZGZ4
+ PtmBPInLWFD1D9oyXwg7F+nlielFxbY2MlT01O4URSZb8cIOOgXDGqFhcL1EytTY
+ 3FTQXgoa3gVFVz00u/zHyCIT7HjoDUcUSrbR/FTy5l2JVomFwY6BeQLVRCkCAwEA
+ AaNtMGswSgYDVR0RBEMwQYIVb25saW5lLmxpZWJlcnRwdWIuY29thihodHRwczov
+ L29ubGluZS5saWViZXJ0cHViLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBTUYAZ/
+ lW3+Qwv4itlnK8u9Mnus5jANBgkqhkiG9w0BAQUFAAOCAQEADCOUTrrLrH0I6BAO
+ aYbHu8hxIiwLKln0jUmCNcLhYfSDNErdCBkQ65FT7fuVFIBNFmvvmYbbelgVT5O+
+ gRN63p56RN9YSHGm4vTz59WWKlce6db87ZYy5SJneyOsVSj1eQ3VXA2mTV/v7beH
+ TvKOCRq1pLXrTW3CyvdBHbKCdXqN9JHXSc0Hw4afGEOecnrq3DoyBxh3/LX6i4Ty
+ kphk7xLp8dhGzs767f6GflqekCETspWcenJAJkzztaZfVr5AUMU4/nzhCEbTb6L3
+ H4DFy1CDquP13ggw0RaFwt090YnGMoTxkwIHbNHOk0b3ja9yD2qxqfNmnGPscktq
+ ghHcPQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -34,12 +69,12 @@
</ds:KeyInfo>
</KeyDescriptor>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.liebertpub.com/action/samlACS" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://online.liebertpub.com/action/samlACS" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.liebertpub.com/action/samlACS" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.liebertpub.com/action/saml2post" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.liebertpub.com/action/saml2artifact" index="3"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Atypon Systems: Mary Ann Liebert, Inc</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Mary Ann Liebert, Inc. publishers</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.liebertpub.com/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/www.mas.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.mas.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 9e4854c5..00000000
--- a/swamid-interfederations-2.0/www.mas.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mas.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Maths School" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-31T15:50:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDTCCAfWgAwIBAgIJAODuHO/6fjT8MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEXBvaXNzb24ubmNsLmFjLnVrMB4XDTExMDMyNDExNTQ1MFoXDTIxMDMyMTEx
- NTQ1MFowHDEaMBgGA1UEAxMRcG9pc3Nvbi5uY2wuYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQC+IGD/pMz62hUMmeyFL03kAhS9ZxL23ZQEV+uD
- 7DbiEhOpgPDiSIVihycH2FceKON6vaJrSjJtWNA0W929qQV8nSomsSVRHVlDP47A
- jKz4zHuc2QKu77Om4kkp00aQJfi674AafqDyDQvp71/sz5liSRPzs8ygMLQDGmRf
- Zcu1GE9NC0HtGQXW0Ytlg5yXmGzbuSoIM5Z56OFJiA5BFmYe3yVI8Mvkzx39+Do6
- nxX7ChzApsqLvz+AHp2q9aBDVHOJbvH4Y4fFwSmM818+n/0UDtHD0xhHFm7yjA/B
- I6Ex2tULv+MAF/ia2D8eepv0eDOndXHdtmYL/f9+uwAXTZTNAgMBAAGjUjBQMC8G
- A1UdEQQoMCaCEXBvaXNzb24ubmNsLmFjLnVrhhF3d3cubWFzLm5jbC5hYy51azAd
- BgNVHQ4EFgQUZEVeSqaoWw7awB9cftUwiseq77MwDQYJKoZIhvcNAQEFBQADggEB
- AEi0uguGZdMFbky7wppx2cp1TL2DPLHa0Yqwyyf1PzB1H+IZdevrV6zOclruRGCh
- fCSecS5czJCZbaUCOakh+99cVTKDLOJQYrWt4mbgI8g6IloeFCQ9c9SA1g5NK50K
- XSRR8Vf67Wv5I4GGj0Ic1qUaEHJwcVYo1KiUE206eZYcVS+NeZZ5fEihkwJ81lwM
- Xl3qiQMBTmYReoTGskMwOfIY+agbrDxrCZ8L0c049aqhDZvLEdIB6oTrTr8mP01A
- ETHcMrpuk6kXMRPI4ecCwTobTC2bwlp1S1hMxOPHtEbsSV04WuZEdhBcpCiVgobr
- ccH1ZOPmbjgfGMwNw2cculQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDTCCAfWgAwIBAgIJAODuHO/6fjT8MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
- BAMTEXBvaXNzb24ubmNsLmFjLnVrMB4XDTExMDMyNDExNTQ1MFoXDTIxMDMyMTEx
- NTQ1MFowHDEaMBgGA1UEAxMRcG9pc3Nvbi5uY2wuYWMudWswggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQC+IGD/pMz62hUMmeyFL03kAhS9ZxL23ZQEV+uD
- 7DbiEhOpgPDiSIVihycH2FceKON6vaJrSjJtWNA0W929qQV8nSomsSVRHVlDP47A
- jKz4zHuc2QKu77Om4kkp00aQJfi674AafqDyDQvp71/sz5liSRPzs8ygMLQDGmRf
- Zcu1GE9NC0HtGQXW0Ytlg5yXmGzbuSoIM5Z56OFJiA5BFmYe3yVI8Mvkzx39+Do6
- nxX7ChzApsqLvz+AHp2q9aBDVHOJbvH4Y4fFwSmM818+n/0UDtHD0xhHFm7yjA/B
- I6Ex2tULv+MAF/ia2D8eepv0eDOndXHdtmYL/f9+uwAXTZTNAgMBAAGjUjBQMC8G
- A1UdEQQoMCaCEXBvaXNzb24ubmNsLmFjLnVrhhF3d3cubWFzLm5jbC5hYy51azAd
- BgNVHQ4EFgQUZEVeSqaoWw7awB9cftUwiseq77MwDQYJKoZIhvcNAQEFBQADggEB
- AEi0uguGZdMFbky7wppx2cp1TL2DPLHa0Yqwyyf1PzB1H+IZdevrV6zOclruRGCh
- fCSecS5czJCZbaUCOakh+99cVTKDLOJQYrWt4mbgI8g6IloeFCQ9c9SA1g5NK50K
- XSRR8Vf67Wv5I4GGj0Ic1qUaEHJwcVYo1KiUE206eZYcVS+NeZZ5fEihkwJ81lwM
- Xl3qiQMBTmYReoTGskMwOfIY+agbrDxrCZ8L0c049aqhDZvLEdIB6oTrTr8mP01A
- ETHcMrpuk6kXMRPI4ecCwTobTC2bwlp1S1hMxOPHtEbsSV04WuZEdhBcpCiVgobr
- ccH1ZOPmbjgfGMwNw2cculQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mas.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Maths School</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Richie</GivenName>
- <SurName>James</SurName>
- <EmailAddress>mailto:Richard.James@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Michael</GivenName>
- <SurName>Beaty</SurName>
- <EmailAddress>mailto:michael.beaty@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.myprojects.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.myprojects.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index c47eb80e..00000000
--- a/swamid-interfederations-2.0/www.myprojects.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.myprojects.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Newcastle University: Online Thesis Repository" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-12T17:21:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDCTCCAfGgAwIBAgIJAL2q7grly1jWMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMTFm15cHJvLmNhbXB1cy5uY2wuYWMudWswHhcNMTEwMzMxMTMzOTMyWhcNMjEw
- MzI4MTMzOTMyWjAhMR8wHQYDVQQDExZteXByby5jYW1wdXMubmNsLmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz4Ih4lmVoSqa4AYGFdx3i4gH
- ZxJ2qCukN3IdAh6kFphkFe511jQ/nVSzsRu3ANoDQD3Z6BzVvNomwNREX3Qkl/E5
- LPByM94WwiGjol92AACTiy45ZaF11wh2pp97Nej7oLIyeoj11NqGdJI9nAQit6mO
- YmpYle7YHpIQlYyJTW9o5ENf//P1hyQUH9G+Kt74IvKRlAl/vW/INJheYzMmUvbw
- lIr5/pXDP+hUNcuLrp0cZS9PB1EDfUrXts2gv7LLD2+zpotAcsKJdhxWLeIirgYO
- ddaudI+cnlhlWY54ARdF6gwXsF3Wbml3UN4E2dRV1lRogPIL+RIJGgf27J3QVwID
- AQABo0QwQjAhBgNVHREEGjAYghZteXByby5jYW1wdXMubmNsLmFjLnVrMB0GA1Ud
- DgQWBBQMweUb28E/Gurspt3M1ZvIpfSBbjANBgkqhkiG9w0BAQUFAAOCAQEAnaCH
- CKMcFyFbxyIc0wg/SK/qFSa63Ygoogf7zDLHqZF1OlZ6HXgVP7owHOyBGQGb/he3
- WTS0RKFCdDzYSa1x425QVBScpNJZKEIJgNzYTIbpg0yyHxp+NP8DKlia8lSsCcUy
- C+/GxxAFjb5bgW02LO4BGkNr3t0IbMnr94D95BH/BN2Cd2ZB8O2lFRibH/pr0ZLT
- 2CNjzy5JEdMjriXPh/AqdQ7pAxprG+wvz6iCno97lFLsgVNLRYmTqf7qkXW4SCtv
- 0aOkPeLXflyyit9f9cSP47QW6jbFgK0ee0HL0nEMbvFDpsIt0mgo0eRjRRZ5lNrh
- Y5MnVguFhohGAMq6hA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.myprojects.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Online Thesis Repository</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>ISS Helpline</GivenName>
- <EmailAddress>mailto:helpline@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Caleb</GivenName>
- <SurName>Racey</SurName>
- <EmailAddress>mailto:Caleb.Racey@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 42c79e52..00000000
--- a/swamid-interfederations-2.0/www.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is an SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-07T15:35:16Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAJHOQuPimjO2MA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB3d3d2hvc3QwHhcNMTEwNTE4MTUxNTU0WhcNMjEwNTE1MTUxNTU0WjASMRAw
- DgYDVQQDEwd3d3dob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 7tNNFjhBfC+iE/QO8WPmKgH4DKH+vXgWu8okkkTfzrTHMz1aunDaBSEx00oK5sWk
- uMUvuOY2iEuXWTCAbx6E/CE3FJV4qpflj994o8BdFVFhqScLkW0YO8/hY7VD9RjF
- 5JKk15UcMTLs6ASqBw/NN7Yki0djjSJs3yahg11+uFk31JtdLgj0u9zN8nPxWyg7
- 2irmNqGAgeyngWAPRPYXA1XgcJ6ExyQkGBGeTVDYvJ5Rwkw2HYh3cxNEwhJ6kysr
- ow7qpgGufXH78BndxL4p/aEX4LiNZXC+N1thuKRlzCUQIdwTu6/SbKJfB74EYLzM
- ekEPS1M889+8QrDc35euAQIDAQABozUwMzASBgNVHREECzAJggd3d3dob3N0MB0G
- A1UdDgQWBBTXK4UZSZyEOtj+/b8gvRts4NwePDANBgkqhkiG9w0BAQUFAAOCAQEA
- uEp5N5BtcyO7tbEdMFLQPZB402t0NCWeNb5lQGMcU8C103PeN0yvoJBzoAfEGNgB
- QJsDPIdn7zQHSPgAOTtnjqabLVIMBkQztXbXPBfit2w+D94S7nKBimrA9etLfDdu
- NE+IlqLFssWhL1SSRZqFz9NiV4nU6RxtsMrtyBW/K6bw4D0BbRhSQgdUD8u4/k9d
- 9gTLPfdIVmOPh00QoLuuO3Ksz8dLdYuktDPVgT1k27vCUzocnZ9fn7bNxAp0ytCc
- j0aVdqr/bw0+572Zn1T6mGTAlthL5oQd7HRh1E71SNUO23mfIC5raWqoJh1LAqbB
- rr00l+L9cGCxJ8loIKSxWw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: www.ncl.ac.uk</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Helpline</GivenName>
- <EmailAddress>mailto:webmaster@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Caleb</GivenName>
- <SurName>Racey</SurName>
- <EmailAddress>mailto:Caleb.Racey@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nedtc.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.nedtc.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index fc8bbe6e..00000000
--- a/swamid-interfederations-2.0/www.nedtc.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nedtc.ac.uk/shibboleth/metadata">
- <!--
- This is a Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-20T14:15:11Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nedtc.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nedtc.ac.uk/Shibboleth.sso/SPNEGO"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAP2gLdgHSWHTMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGmRhbnRvb2luZS5jYW1wdXMubmNsLmFjLnVrMB4XDTEwMTIxMDE1MjMxMloX
- DTIwMTIwNzE1MjMxMlowJTEjMCEGA1UEAxMaZGFudG9vaW5lLmNhbXB1cy5uY2wu
- YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC96j7lMubJp+aX
- DqwLGDzxcrm2bxvKU3WjWK91L5rD0P0HYle7yr2VcuXsChz7jyFrMNZ+tCUhfvlA
- gRuhiKjXC9PRDf18NRx43UhPlRnwrvjN5OFhOH1Mvq4QFkpnTtqPHQ5RM7T3+U0l
- /lacgZtzhmXiCbY9KLOF0Qc5iLjD+ISwErSd6N1ovhIyNsZ4/44Cquz0fcFyV1PN
- BIzj1toMubMqStVY98OnKCVIDccOsKeZW7RPevLP4T5uglP88hgiFhN5auJDWy2B
- fm/AA9pjD/u9BsAggdVfrAE0WvatR+a6cpxngNTFjht9UUoxBlUq844RFZBqXf/v
- xLmipJUlAgMBAAGjSDBGMCUGA1UdEQQeMByCGmRhbnRvb2luZS5jYW1wdXMubmNs
- LmFjLnVrMB0GA1UdDgQWBBTHyeqX+oU3dzZx3e1+nYbV7evjejANBgkqhkiG9w0B
- AQUFAAOCAQEAIzxIXH09GMjE+nIpbGIACTI9ERepMQMzNnO+M8JugkhEhrLWXWvu
- XoswtdvxBH3rKMKZp1tJIk7T1toLDn3vCvn60S/6AjzQbyYzQ+qfDBij7X7kBU71
- jlfFn8dFGGcYNdPkl2EjrtWQ/pOTJiJAqal0rPQTcqmrFmi3UeDw+gtncRDIBEGx
- JvjufLt4NSdyg7ZHLLjLv2ntSGPk4ZFLjw0ihpigI6LLzhNv3zxuH/x/y1pIyolC
- MQHLbJL5+WUpb/syt6lRETX5WxKuJHTirlgkjz1edzAPDZ8SIKD3O/TcnKXB/rpF
- HitJuYtcRIR/YxPrydq4GCsFy99FLz336A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nedtc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nedtc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nedtc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nedtc.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nedtc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nedtc.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nedtc.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nedtc.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nedtc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nedtc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nedtc.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University hosted SP for North East Doctoral Training Centre</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.netskills.ac.uk-federation-entity-metadata.xml b/swamid-interfederations-2.0/www.netskills.ac.uk-federation-entity-metadata.xml
deleted file mode 100644
index c6f4336b..00000000
--- a/swamid-interfederations-2.0/www.netskills.ac.uk-federation-entity-metadata.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.netskills.ac.uk/federation/entity/metadata">
- <!--
- This is a "Netskills" SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-04T12:04:06Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">JISC Netskills</mdui:DisplayName>
- <mdui:Description xml:lang="en">Access to Netskills' online services, including Training Materials</mdui:Description>
- <mdui:Logo height="350" width="117">https://www.netskills.ac.uk/site/img/logos/netskills_logo_ukfederation_sp.png</mdui:Logo>
- </mdui:UIInfo>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.netskills.ac.uk/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.netskills.ac.uk/Shibboleth.sso/Login" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEETCCAvmgAwIBAgIJAM6qyiQwbaCDMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
- VQQGEwJ1azEQMA4GA1UECAwHRW5nbGFuZDEcMBoGA1UEBwwTTmV3Y2FzdGxlLXVw
- b24tVHluZTEXMBUGA1UECgwOSmlzYyBOZXRza2lsbHMxHDAaBgNVBAMME3d3dy5u
- ZXRza2lsbHMuYWMudWsxKDAmBgkqhkiG9w0BCQEWGWVucXVpcmllc0BuZXRza2ls
- bHMuYWMudWswHhcNMTQwNzEwMTMyMjQ2WhcNMjkwNzExMTMyMjQ2WjCBnjELMAkG
- A1UEBhMCdWsxEDAOBgNVBAgMB0VuZ2xhbmQxHDAaBgNVBAcME05ld2Nhc3RsZS11
- cG9uLVR5bmUxFzAVBgNVBAoMDkppc2MgTmV0c2tpbGxzMRwwGgYDVQQDDBN3d3cu
- bmV0c2tpbGxzLmFjLnVrMSgwJgYJKoZIhvcNAQkBFhllbnF1aXJpZXNAbmV0c2tp
- bGxzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyZaqJhi1
- ugJIwnxDn5IVzLcUU1gAHOFhNPpgIRACOj70q8QdqmppTXrLPUGLqKvFJ/mXsLEr
- Atov4TlRTSQad38Pzs03eTF5p6gZRTgQ+K6ci/pZfwzRlpSxWWbkL+N6FwkhDaQh
- J5VUNSpwe2ed2QxP2MJacnIwhVGBmxY5j/8h42nuvIArIwD4U+GPoKQeNP6/N4r/
- 4XbLObEMImxmpwFmz46YfgU2KFVaHXnVJfjbpHJcqXRlCTdGXxYOaP7BESR9bB6V
- 1grmHxlT2FWi2kuMC5nqVnzrefeBVTHbhdVJJT85+T/Fek/lCaVpxTsTsX+v6PrB
- vQRgSPPGGJ0mVwIDAQABo1AwTjAdBgNVHQ4EFgQUeFym3f+6vLTensL0plcxoQwO
- m9QwHwYDVR0jBBgwFoAUeFym3f+6vLTensL0plcxoQwOm9QwDAYDVR0TBAUwAwEB
- /zANBgkqhkiG9w0BAQUFAAOCAQEAKcbhSaIKdbMCSMMEN5aJkYd5SoAbG+J0YOMa
- zpqRaCKcNHUweQOBUgSP81erpoJy0bQDwlH4Y+A8++rwfhxMWjMudekg0juFVBpE
- 2Rrb1qdT1PXMtqPJX63x7priJzgU2DSzKX3hBcofH2JN8RZgv2U6PwaOd4gN9oEx
- +eEnfVZrzKsCHDTyXsoEWFfudlbfEkIfVvrFNQwv15XOP8scUup3PD5vS2Wtf6G3
- KmZhGEF6yC7y8XZhJVHOqxSQ9CbUsSdeLj7Xu+xhYt5f2eVDdfdC0bUdXXI13Kkw
- 30lR//cSj5KMfcymqjFtNZXyn8OLT6OD9vskw9CsvHg6sHhw5A==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.netskills.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.netskills.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.netskills.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.netskills.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.netskills.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.netskills.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.netskills.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: Netskills</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.netskills.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Netskills</GivenName>
- <EmailAddress>mailto:enquiries@netskills.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Carl</GivenName>
- <SurName>Vincent</SurName>
- <EmailAddress>mailto:carl.vincent@netskills.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml b/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml
index c89631a5..65a35a5e 100644
--- a/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml
@@ -4,43 +4,28 @@
This is a "RefWorks" Shibboleth SP for Proquest Information and Learning Limited.
-->
<Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-29T14:31:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEQjCCAyqgAwIBAgIJAPi0oqIBy55FMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
- VQQGEwJVUzERMA8GA1UECBMITWFyeWxhbmQxETAPBgNVBAcTCEJldGhlc2RhMRUw
- EwYDVQQKEwxQcm9RdWVzdCBMTEMxFTATBgNVBAsTDFJlZldvcmtzL0NPUzEZMBcG
- A1UEAxMQd3d3LnJlZndvcmtzLmNvbTEjMCEGCSqGSIb3DQEJARYUbmtlbm5leUBy
- ZWZ3b3Jrcy5jb20wHhcNMDgxMjE1MjIwMzA1WhcNMTgxMjEzMjIwMzA1WjCBoTEL
- MAkGA1UEBhMCVVMxETAPBgNVBAgTCE1hcnlsYW5kMREwDwYDVQQHEwhCZXRoZXNk
- YTEVMBMGA1UEChMMUHJvUXVlc3QgTExDMRUwEwYDVQQLEwxSZWZXb3Jrcy9DT1Mx
- GTAXBgNVBAMTEHd3dy5yZWZ3b3Jrcy5jb20xIzAhBgkqhkiG9w0BCQEWFG5rZW5u
- ZXlAcmVmd29ya3MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 0BNHVpHg+SvSXBH7Z9XWTpiRLEWISoqsL6N1hR7DaJeM7lqIkH3OuL9g1q76/75v
- 3zrV0QqSF1xj7rM1Lq5ZJd8O2mLdlWHZvdYSmJQNu5hrnOcqv5eDuc2GsXaaI7FE
- +ipw4xamo8ei3wm0BP3hCHGRS71iwk3lwVteSfWDpGxPBNTR1szx0tazTH2gwkmN
- Txlcxkim+tgdH4etIyCSgweRvb/9jG6y/nRvBB2j7CykzfM2E2tkA63cfax+P5Wd
- Crk7CCcgNrIcWr9dmP5wyerwbW1u9wZJOJYAhZDEY497h1bRxXJcwT+P1ZhYTJdk
- VCbAFSgxsNwOEtVGIJ7JNwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
- DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUqaa3
- a9bD274+w6y7JHvNGkoZRs4wHwYDVR0jBBgwFoAUqaa3a9bD274+w6y7JHvNGkoZ
- Rs4wDQYJKoZIhvcNAQEFBQADggEBAHjTPGg2GmOXGh0cboOOkFYXtXZmk3wXePyr
- Fa8OHe5CqEhZhcidRq1IrPt/QDF76KofX43SnpJ24Hha1RuXDKQu5vV387TwUTdl
- ufWJrWpAZybWZ55OMpG1crHbuozEFW+GGJ34s4e6fygeIcLTigkN6rf5WkbLBVyX
- 6qqB4GNdfqj+18xbVaM7yWMk0ShlBzFMl15DO25zoAh+l/J3Ti1vDbbusjE27H7D
- 207Q3sTfK+tvRQVkFrLeYce9IOUYgMS7f4drQAR/6pAnSXmMLzAFc5s896/iGDEX
- afJHv7LMPbJAn4/aPxZ+VDE8GBrYzc8sOy5DZzjvZ6uvw8VGMEI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
@@ -70,6 +55,15 @@
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.refworks.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.refworks.com/Shibboleth.sso/SLO/SOAP"/>
@@ -94,11 +88,11 @@
</Organization>
<ContactPerson contactType="support">
<GivenName>Technical Support Team</GivenName>
- <EmailAddress>mailto:support@refworks-cos.com</EmailAddress>
+ <EmailAddress>mailto:support@proquest.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Sanjay</GivenName>
<SurName>Joshi</SurName>
- <EmailAddress>mailto:Sanjay.Joshi@refworks-cos.com</EmailAddress>
+ <EmailAddress>mailto:Sanjay.Joshi@proquest.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml b/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml
index 6e0e6eaa..3c298e89 100644
--- a/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml
@@ -1,9 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rocksbackpages.com/shibboleth">
<!--
- This is a "Rock's Backpages" Shibboleth SP owned by Backpages Limited.
+ This is a "Rock's Backpages" Shibboleth SP for Backpages Limited.
-->
<Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-03-04T16:02:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
@@ -38,16 +54,21 @@
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rocksbackpages.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/Redirect"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/POST"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rocksbackpages.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rocksbackpages.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rocksbackpages.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rocksbackpages.com/Shibboleth.sso/NIM/Artifact"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/POST" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
diff --git a/swamid-interfederations-2.0/www.secure-project.org-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.secure-project.org-shibboleth-metadata.xml
deleted file mode 100644
index 5740b0c9..00000000
--- a/swamid-interfederations-2.0/www.secure-project.org-shibboleth-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.secure-project.org/shibboleth/metadata">
- <!--
- This is a Shibboleth 2 "SECURE" Research Project SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.secure-project.org/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0DCCAbigAwIBAgIJAI/j3HRlMDN6MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
- BAMTA2JhZzAeFw0wOTA1MDgwODMxMTdaFw0xOTA1MDYwODMxMTdaMA4xDDAKBgNV
- BAMTA2JhZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMP6vkxlF1CB
- 2xmkj2JcxdxRgvzyQGtUewRyVvKIKVmJamwVPdmmAVib/WWbv/nc9f2vbfwsyp8O
- ttN5R5XbjXi3kTgzCK7GipmUDFIZyRmer5dtwSLjxOI88qGzun7AlTY1Eb25LG9B
- hg71S0t2pTGJ/IdO9qKjZ07fpUTscQxTxdFOZlN1fSbuqd0U8lkDal4r3EDtC4pD
- Xbsokh61WavbaqbPMpTbow6pUbN1oGAZKDfA2sAhEEi8bRLXSLaT5Y/MJSQpw8nz
- f7RtyWZu3axS67gZky7gqqKN3cUa3EzHgYNH38VWkKVcow7L2yLTgw/prPd5gaf3
- jLWvcAh2JnMCAwEAAaMxMC8wDgYDVR0RBAcwBYIDYmFnMB0GA1UdDgQWBBQb6EP0
- sAGUoPE95TuC0VXRiliv4DANBgkqhkiG9w0BAQUFAAOCAQEARlyHStwJfmd1E1VV
- UrvZkoIB100pghTyl9KUSRCOFwdJ6s1FF7KpSCdjGxxbH5UA8Fkar5NMnhAfnrJC
- K0UErpalp39RWeizCS2KDLSMikLfIkVHvBYRFG/z5L60dQdtOB2u6ZCbf+DI3lIt
- Yc0QRQ4CvSb0r1DAaA3eDIgICfYJzlPzRwAMu0/Xcf2hwlTZaD94FvnQtECP5Ur8
- ue4NBUgDYOV3FtNoyPPTLNvoia4V0EtJQTPTlwZBJ/gg8h7/X0O+480i2soO2q7V
- iS8efZBylvnlzXdt1Pa3/8Rg4j4RKXKbZWFtqcQT/HioRbz2Leyonv3ohknr+Qnh
- fdxfVQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.secure-project.org/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.secure-project.org/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.secure-project.org/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.secure-project.org/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.secure-project.org/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.secure-project.org/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.secure-project.org/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.secure-project.org/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.secure-project.org/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.secure-project.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.secure-project.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.secure-project.org/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.secure-project.org/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.secure-project.org/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University: "SECURE" Research Project</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.societies.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.societies.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index c4075bb1..00000000
--- a/swamid-interfederations-2.0/www.societies.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.societies.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Newcastle University Societies Web Publishing Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T11:27:34Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0zCCAbugAwIBAgIJAIZF6MaskKxyMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
- BAMTBHBwdWIwHhcNMTQwMzEzMTMwNjQ3WhcNMjQwMzEwMTMwNjQ3WjAPMQ0wCwYD
- VQQDEwRwcHViMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv1osjgrk
- sOtRmtOlSIDwrK4c2K9q8OyZGXvD59NxmCe6+uyZpY/PM5PP1iWyIRPYCKOLmJ+w
- B/otpMHfX/DGy6aVbsNmnzpoUUEUHBLScClp/Fel5TNuHEsgmfxuBqefdkzQF5We
- Zcrp9JYeg5tAytKXGQ1xNrHN3LyXbq6hIBfr8idYhj8zC9NU9daetWJk0slqWg4K
- lgOGTBiK44WaAWT3Xm/WYb4uV/vjY2T8j4Ejc9HKy47CHYHilHaIZS3EV69JbkcH
- vBILR1HgQ57AO78cWQA1pQXkniyLcdqJTEyloaozbgpiX0qbzapFdsPwQrycIW0j
- cpq5uQ8TEJeL8wIDAQABozIwMDAPBgNVHREECDAGggRwcHViMB0GA1UdDgQWBBQI
- Q8D3PxTVT0EAovfqnEc/YqItHTANBgkqhkiG9w0BAQUFAAOCAQEAdNtAARhJlSrQ
- Zgt+uK6B4JU9rI8v9VmYtTpx3VI6Aj3Rf+5ohs340vuEMGcDw0+JHOj4iWe+Qybm
- oYIO/00+OX/bQwNVbuY1qo4Mle5a9y8gJq5QSPA+3NT54ft+5y78znEsUxygKOln
- YZDFCO1t0+PeTev7eBBc/HHa+VSbCNhuTq1KeyASHs1IY9b12O/0Bw+jiZ43HFAl
- RMSovOnTglYSbv+PnDnJz7lSGDyj0Gxbny8PD6ObsoyVrzbpmMMPashOrl6q82ZJ
- x6aZNeDrE1Ze6VQ0fZDYBWhh2zmu2tl63jm1KHB9nuVZZdqAOzzgtCkErkz1NbPi
- 0atNy8Sv4w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.societies.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Societies Web Publishing Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.staff.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.staff.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 21f5c900..00000000
--- a/swamid-interfederations-2.0/www.staff.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.staff.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Newcastle University Staff Web Publishing Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T11:41:28Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0zCCAbugAwIBAgIJAIZF6MaskKxyMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
- BAMTBHBwdWIwHhcNMTQwMzEzMTMwNjQ3WhcNMjQwMzEwMTMwNjQ3WjAPMQ0wCwYD
- VQQDEwRwcHViMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv1osjgrk
- sOtRmtOlSIDwrK4c2K9q8OyZGXvD59NxmCe6+uyZpY/PM5PP1iWyIRPYCKOLmJ+w
- B/otpMHfX/DGy6aVbsNmnzpoUUEUHBLScClp/Fel5TNuHEsgmfxuBqefdkzQF5We
- Zcrp9JYeg5tAytKXGQ1xNrHN3LyXbq6hIBfr8idYhj8zC9NU9daetWJk0slqWg4K
- lgOGTBiK44WaAWT3Xm/WYb4uV/vjY2T8j4Ejc9HKy47CHYHilHaIZS3EV69JbkcH
- vBILR1HgQ57AO78cWQA1pQXkniyLcdqJTEyloaozbgpiX0qbzapFdsPwQrycIW0j
- cpq5uQ8TEJeL8wIDAQABozIwMDAPBgNVHREECDAGggRwcHViMB0GA1UdDgQWBBQI
- Q8D3PxTVT0EAovfqnEc/YqItHTANBgkqhkiG9w0BAQUFAAOCAQEAdNtAARhJlSrQ
- Zgt+uK6B4JU9rI8v9VmYtTpx3VI6Aj3Rf+5ohs340vuEMGcDw0+JHOj4iWe+Qybm
- oYIO/00+OX/bQwNVbuY1qo4Mle5a9y8gJq5QSPA+3NT54ft+5y78znEsUxygKOln
- YZDFCO1t0+PeTev7eBBc/HHa+VSbCNhuTq1KeyASHs1IY9b12O/0Bw+jiZ43HFAl
- RMSovOnTglYSbv+PnDnJz7lSGDyj0Gxbny8PD6ObsoyVrzbpmMMPashOrl6q82ZJ
- x6aZNeDrE1Ze6VQ0fZDYBWhh2zmu2tl63jm1KHB9nuVZZdqAOzzgtCkErkz1NbPi
- 0atNy8Sv4w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.staff.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Staff Web Publishing Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.students.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.students.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 8d5fb60b..00000000
--- a/swamid-interfederations-2.0/www.students.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.students.ncl.ac.uk/shibboleth/metadata">
- <!--
- This is a "Newcastle University Students Web Publishing Server" Shibboleth SP for the University of Newcastle upon Tyne.
- -->
- <Extensions>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T11:49:19Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIC0zCCAbugAwIBAgIJAIZF6MaskKxyMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
- BAMTBHBwdWIwHhcNMTQwMzEzMTMwNjQ3WhcNMjQwMzEwMTMwNjQ3WjAPMQ0wCwYD
- VQQDEwRwcHViMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv1osjgrk
- sOtRmtOlSIDwrK4c2K9q8OyZGXvD59NxmCe6+uyZpY/PM5PP1iWyIRPYCKOLmJ+w
- B/otpMHfX/DGy6aVbsNmnzpoUUEUHBLScClp/Fel5TNuHEsgmfxuBqefdkzQF5We
- Zcrp9JYeg5tAytKXGQ1xNrHN3LyXbq6hIBfr8idYhj8zC9NU9daetWJk0slqWg4K
- lgOGTBiK44WaAWT3Xm/WYb4uV/vjY2T8j4Ejc9HKy47CHYHilHaIZS3EV69JbkcH
- vBILR1HgQ57AO78cWQA1pQXkniyLcdqJTEyloaozbgpiX0qbzapFdsPwQrycIW0j
- cpq5uQ8TEJeL8wIDAQABozIwMDAPBgNVHREECDAGggRwcHViMB0GA1UdDgQWBBQI
- Q8D3PxTVT0EAovfqnEc/YqItHTANBgkqhkiG9w0BAQUFAAOCAQEAdNtAARhJlSrQ
- Zgt+uK6B4JU9rI8v9VmYtTpx3VI6Aj3Rf+5ohs340vuEMGcDw0+JHOj4iWe+Qybm
- oYIO/00+OX/bQwNVbuY1qo4Mle5a9y8gJq5QSPA+3NT54ft+5y78znEsUxygKOln
- YZDFCO1t0+PeTev7eBBc/HHa+VSbCNhuTq1KeyASHs1IY9b12O/0Bw+jiZ43HFAl
- RMSovOnTglYSbv+PnDnJz7lSGDyj0Gxbny8PD6ObsoyVrzbpmMMPashOrl6q82ZJ
- x6aZNeDrE1Ze6VQ0fZDYBWhh2zmu2tl63jm1KHB9nuVZZdqAOzzgtCkErkz1NbPi
- 0atNy8Sv4w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.students.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newcastle University Students Web Publishing Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Chris</GivenName>
- <SurName>Franks</SurName>
- <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.translationalmicro.medschl.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.translationalmicro.medschl.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index ff760a75..00000000
--- a/swamid-interfederations-2.0/www.translationalmicro.medschl.cam.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.translationalmicro.medschl.cam.ac.uk/shibboleth">
- <!--
- This is a Shibboleth 2 Cambridge Translational Microbiology SP for the University of Cambridge.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/WAYF"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/DS"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
- MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
- tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
- HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
- gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
- GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
- YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
- +lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
- MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
- AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
- yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
- TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
- +k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
- O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
- RsenNm/aXp0wIU+jHVmi/GAPCQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.translationalmicro.medschl.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Cambridge: Translational Microbiology</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://snf.esc.cam.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Falcon Support</GivenName>
- <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Falcon Support</GivenName>
- <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>