summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Domeij <fredrik.domeij@umu.se>2020-06-10 07:59:58 +0200
committerFredrik Domeij <fredrik.domeij@umu.se>2020-06-10 08:00:53 +0200
commit963d34835a08f49cef8962d57fc900eeb0714835 (patch)
tree585c8d1b02169103d4dceb740c59e72288ca3f3c
parent7382c3cd9103845da6303f0c4944c257be4e009c (diff)
errorURL added to ladok3.its.umu.se
-rw-r--r--swamid-2.0/acc-nais.uhr.se-shibboleth.xml6
-rw-r--r--swamid-2.0/acc.valda.uhr.se-shibboleth.xml6
-rw-r--r--swamid-2.0/account-idac.ki.se-shibboleth.xml10
-rw-r--r--swamid-2.0/adfs.artologik.net-adfs-services-trust.xml14
-rw-r--r--swamid-2.0/adfs.hv.se-adfs-services-trust.xml18
-rw-r--r--swamid-2.0/adfs.ju.se-adfs-services-trust.xml4
-rw-r--r--swamid-2.0/adfs.rkh.se-adfs-services-trust.xml22
-rw-r--r--swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml10
-rw-r--r--swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml18
-rw-r--r--swamid-2.0/admin.selma7.its.uu.se-shibboleth.sso.xml18
-rw-r--r--swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml6
-rw-r--r--swamid-2.0/aktivera.su.se-shibboleth.sso.xml6
-rw-r--r--swamid-2.0/almagest.sai.kau.se.xml6
-rw-r--r--swamid-2.0/ams.ki.se-shibboleth.xml6
-rw-r--r--swamid-2.0/apps.convertus.se-shibboleth.xml10
-rw-r--r--swamid-2.0/appstest.convertus.se-shibboleth.xml10
-rw-r--r--swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml14
-rw-r--r--swamid-2.0/auth.asiaportal.info.xml10
-rw-r--r--swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml14
-rw-r--r--swamid-2.0/backweb.antagning.se-hubble-sp.xml18
-rw-r--r--swamid-2.0/bdh.local-85-shibboleth.xml14
-rw-r--r--swamid-2.0/betafoo.nordu.net-saml2-metadata.xml6
-rw-r--r--swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml14
-rw-r--r--swamid-2.0/bookings.kib.ki.se-shibboleth.xml14
-rw-r--r--swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml6
-rw-r--r--swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml6
-rw-r--r--swamid-2.0/client200-151.its.umu.se-shibboleth.xml6
-rw-r--r--swamid-2.0/cloudmore.com-shibboleth.xml10
-rw-r--r--swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml14
-rw-r--r--swamid-2.0/connect-beta.sunet.se-shibboleth.xml10
-rw-r--r--swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml10
-rw-r--r--swamid-2.0/daisy.dsv.su.se-shibboleth.xml18
-rw-r--r--swamid-2.0/daisy2.dsv.su.se-shibboleth.xml18
-rw-r--r--swamid-2.0/data.houseoffinance.se-shibboleth.xml6
-rw-r--r--swamid-2.0/dedserv79.levonline.com-shibboleth.xml10
-rw-r--r--swamid-2.0/dev.cloudmore.com-shibboleth.xml10
-rw-r--r--swamid-2.0/dev.nais.uhr.se-shibboleth.xml6
-rw-r--r--swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml14
-rw-r--r--swamid-2.0/du.hr.evry.se-shibboleth.xml10
-rw-r--r--swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml6
-rw-r--r--swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml6
-rw-r--r--swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml10
-rw-r--r--swamid-2.0/emrex-test.its.umu.se-shibboleth.xml6
-rw-r--r--swamid-2.0/fs.vemendo.net-adfs-services-trust.xml10
-rw-r--r--swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml6
-rw-r--r--swamid-2.0/gerrit.cs.lth.se-shibboleth.xml6
-rw-r--r--swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml6
-rw-r--r--swamid-2.0/halon-eu.sunet.se-shibboleth.xml10
-rw-r--r--swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml14
-rw-r--r--swamid-2.0/hh.hr.evry.se-shibboleth.xml10
-rw-r--r--swamid-2.0/hhs-personality-quiz.eu-gb.mybluemix.net.xml6
-rw-r--r--swamid-2.0/hhs-se.zoom.us.xml6
-rw-r--r--swamid-2.0/his.hr.evry.se-shibboleth.xml10
-rw-r--r--swamid-2.0/hkr.hr.evry.se-shibboleth.xml10
-rw-r--r--swamid-2.0/hr.liu.se-shibboleth.xml10
-rw-r--r--swamid-2.0/humio.sunet.se-shibboleth.xml10
-rw-r--r--swamid-2.0/id.statenssc.se-adfs-services-trust.xml18
-rw-r--r--swamid-2.0/idp-test.comanage.sunet.se-idp.xml14
-rw-r--r--swamid-2.0/idp-test.comanage.sunet.se-sp.xml14
-rw-r--r--swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml18
-rw-r--r--swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml6
-rw-r--r--swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml10
-rw-r--r--swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml10
-rw-r--r--swamid-2.0/idp.antagning.se-aws-idp.xml18
-rw-r--r--swamid-2.0/idp.esh.se-idp-shibboleth.xml10
-rw-r--r--swamid-2.0/idp.kva.se-idp-shibboleth.xml18
-rw-r--r--swamid-2.0/idp.lnu.se-idp-shibboleth.xml10
-rw-r--r--swamid-2.0/idp.mah.se-idp-shibboleth.xml18
-rw-r--r--swamid-2.0/idp.nordu.net-idp-shibboleth.xml18
-rw-r--r--swamid-2.0/idp.oru.se-idp-shibboleth.xml18
-rw-r--r--swamid-2.0/idp.sunet.se-idp.xml14
-rw-r--r--swamid-2.0/idp.test.antagning.se-aws-idp.xml18
-rw-r--r--swamid-2.0/idp.test.sunet.se-idp.xml14
-rw-r--r--swamid-2.0/idp02.gih.se-idp-shibboleth.xml18
-rw-r--r--swamid-2.0/idp1.artologik.net-adfs-services-trust.xml14
-rw-r--r--swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml18
-rw-r--r--swamid-2.0/idp2.his.se-idp-shibboleth.xml18
-rw-r--r--swamid-2.0/idp2.kkh.se-idp-shibboleth.xml18
-rw-r--r--swamid-2.0/idp3.hig.se-idp-shibboleth.xml18
-rw-r--r--swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml22
-rw-r--r--swamid-2.0/idp3.sics.se-idp-shibboleth.xml10
-rw-r--r--swamid-2.0/idpproxy.dev.eduid.se-idp.xml18
-rw-r--r--swamid-2.0/idpproxy.dev.eduid.se-sp.xml18
-rw-r--r--swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml22
-rw-r--r--swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml6
-rw-r--r--swamid-2.0/idpv4.lu.se-idp-shibboleth.xml22
-rw-r--r--swamid-2.0/indico.test.uu.se-shibboleth.xml14
-rw-r--r--swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml14
-rw-r--r--swamid-2.0/int-admin.selma7.its.uu.se-shibboleth.sso.xml18
-rw-r--r--swamid-2.0/isoffan.sprakochfolkminnen.se.xml10
-rw-r--r--swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml10
-rw-r--r--swamid-2.0/jenkins.led.ladok.se-securityrealm-finishlogin.xml14
-rw-r--r--swamid-2.0/jira-stage.its.umu.se-shibboleth.xml6
-rw-r--r--swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml18
-rw-r--r--swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml18
-rw-r--r--swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml14
-rw-r--r--swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml10
-rw-r--r--swamid-2.0/kauplay.kau.se.xml18
-rw-r--r--swamid-2.0/kb-se.zoom.us.xml6
-rw-r--r--swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml10
-rw-r--r--swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml10
-rw-r--r--swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml18
-rw-r--r--swamid-2.0/konto-test.test.hb.se-shibboleth.xml14
-rw-r--r--swamid-2.0/ladok3.its.umu.se-shibboleth.xml14
-rw-r--r--swamid-2.0/ladok3.its.umu.se-user-idp.xml2
-rw-r--r--swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml14
-rw-r--r--swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml6
-rw-r--r--swamid-2.0/login-dev.du.se-idp-shibboleth.xml10
-rw-r--r--swamid-2.0/login.idp.eduid.se-idp.xml.xml18
-rw-r--r--swamid-2.0/login.ifmsa.se-spp.xml10
-rw-r--r--swamid-2.0/login1.fhs.se-adfs-services-trust.xml18
-rw-r--r--swamid-2.0/ludicris.lub.lu.se-shibboleth.xml6
-rw-r--r--swamid-2.0/ludwig.lub.lu.se-sp.xml6
-rw-r--r--swamid-2.0/luvit.education.lu.se-shibboleth.xml10
-rw-r--r--swamid-2.0/maps.slu.se-shibboleth.xml10
-rw-r--r--swamid-2.0/medlem.disk.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml6
-rw-r--r--swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml6
-rw-r--r--swamid-2.0/meta.eduroam.se.xml10
-rw-r--r--swamid-2.0/mondo-test.su.se-shibboleth.sso.xml6
-rw-r--r--swamid-2.0/moodle.lhs.se-shibboleth.xml10
-rw-r--r--swamid-2.0/moodle.media.nordu.net.xml10
-rw-r--r--swamid-2.0/moodle2.cs.lth.se-shibboleth.xml6
-rw-r--r--swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml6
-rw-r--r--swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml18
-rw-r--r--swamid-2.0/play.bth.se.xml22
-rw-r--r--swamid-2.0/play.chalmers.se.xml10
-rw-r--r--swamid-2.0/play.education.lu.se-shibboleth.xml10
-rw-r--r--swamid-2.0/play.fhs.se.xml18
-rw-r--r--swamid-2.0/play.hb.se.xml18
-rw-r--r--swamid-2.0/play.hhs.se.xml18
-rw-r--r--swamid-2.0/play.hkr.se.xml18
-rw-r--r--swamid-2.0/play.hv.se.xml10
-rw-r--r--swamid-2.0/play.mau.se.xml10
-rw-r--r--swamid-2.0/play.miun.se.xml10
-rw-r--r--swamid-2.0/play.oru.se.xml10
-rw-r--r--swamid-2.0/play.rkh.se.xml10
-rw-r--r--swamid-2.0/play.sh.se.xml18
-rw-r--r--swamid-2.0/play.shh.se.xml10
-rw-r--r--swamid-2.0/play.sunet.se.xml18
-rw-r--r--swamid-2.0/play.test.umu.se.xml10
-rw-r--r--swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml6
-rw-r--r--swamid-2.0/primula.mah.se-shibboleth.xml10
-rw-r--r--swamid-2.0/prisma.research.se-shibboleth.xml14
-rw-r--r--swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml10
-rw-r--r--swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml6
-rw-r--r--swamid-2.0/redcap.ki.se-shibboleth.xml6
-rw-r--r--swamid-2.0/registry.swamid.se-saml2-metadata.xml14
-rw-r--r--swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml14
-rw-r--r--swamid-2.0/sam.control.lth.se-shibboleth.xml6
-rw-r--r--swamid-2.0/scalear-staging2.herokuapp.com.xml18
-rw-r--r--swamid-2.0/se.timeedit.net-bth-stud.xml10
-rw-r--r--swamid-2.0/se.timeedit.net-chalmers-sp.xml6
-rw-r--r--swamid-2.0/se.timeedit.net-fhs-staff.xml6
-rw-r--r--swamid-2.0/se.timeedit.net-kau-student-sp.xml10
-rw-r--r--swamid-2.0/se.timeedit.net-lu-general-sp.xml10
-rw-r--r--swamid-2.0/se.timeedit.net-su-employee-sp.xml6
-rw-r--r--swamid-2.0/se.timeedit.net-umu-student-sp.xml6
-rw-r--r--swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml6
-rw-r--r--swamid-2.0/selfservice.hb.se-shibboleth.xml14
-rw-r--r--swamid-2.0/service.projectplace.com-saml-metadata.xml14
-rw-r--r--swamid-2.0/sesam.uu.se-shibboleth.xml10
-rw-r--r--swamid-2.0/sgw.africa-grid.org-shibboleth.xml14
-rw-r--r--swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml10
-rw-r--r--swamid-2.0/smultron.catalogix.se-8090-sp.xml10
-rw-r--r--swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml6
-rw-r--r--swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml10
-rw-r--r--swamid-2.0/sp.sprakochfolkminnen.se.xml10
-rw-r--r--swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml14
-rw-r--r--swamid-2.0/staging-us.cloudmore.com-shibboleth.xml10
-rw-r--r--swamid-2.0/staging.cloudmore.com-shibboleth.xml10
-rw-r--r--swamid-2.0/staging.ilabsolutions.com.xml14
-rw-r--r--swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml14
-rw-r--r--swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml10
-rw-r--r--swamid-2.0/student.integrationstest.ladok.se-student-sp.xml14
-rw-r--r--swamid-2.0/studiumbb.uu.se-studium.xml6
-rw-r--r--swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml10
-rw-r--r--swamid-2.0/swamid2.shh.se-idp-shibboleth.xml18
-rw-r--r--swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml6
-rw-r--r--swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml6
-rw-r--r--swamid-2.0/tentaadmin.uhr.se-shibboleth.xml6
-rw-r--r--swamid-2.0/test-du.hr.evry.se-shibboleth.xml10
-rw-r--r--swamid-2.0/test-hh.hr.evry.se-shibboleth.xml10
-rw-r--r--swamid-2.0/test-his.hr.evry.se-shibboleth.xml10
-rw-r--r--swamid-2.0/test-ki.pingpong.net-shibboleth.xml6
-rw-r--r--swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml10
-rw-r--r--swamid-2.0/test-mah.hr.evry.se-shibboleth.xml10
-rw-r--r--swamid-2.0/test.gdb.vr.se.xml10
-rw-r--r--swamid-2.0/test.itslearning.com.xml14
-rw-r--r--swamid-2.0/test.mp.uu.se-shibboleth-sso.xml14
-rw-r--r--swamid-2.0/test.play.hv.se.xml10
-rw-r--r--swamid-2.0/test.scalable-learning.com.xml18
-rw-r--r--swamid-2.0/test0.release-check.swamid.se-shibboleth.xml10
-rw-r--r--swamid-2.0/testplay.hhs.se.xml10
-rw-r--r--swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml6
-rw-r--r--swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml22
-rw-r--r--swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml10
-rw-r--r--swamid-2.0/urn-auth0-safarijv-uppsala-university.xml18
-rw-r--r--swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml14
-rw-r--r--swamid-2.0/vartuppdrag.se.xml6
-rw-r--r--swamid-2.0/verify-l.myunidays.com-shibboleth.xml18
-rw-r--r--swamid-2.0/verify.studentbeans.com-shibboleth.xml10
-rw-r--r--swamid-2.0/vfu-test.su.se-shibboleth.sso.xml6
-rw-r--r--swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml6
-rw-r--r--swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml6
-rw-r--r--swamid-2.0/webinar.nordu.net-shibboleth.xml10
-rw-r--r--swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml30
-rw-r--r--swamid-2.0/weblogin.uu.se-idp-shibboleth.xml22
-rw-r--r--swamid-2.0/wiki2.its.uu.se-shibboleth.xml18
-rw-r--r--swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml6
-rw-r--r--swamid-2.0/www.researchprofessional.com-shibboleth.xml6
-rw-r--r--swamid-2.0/www.student.ladok.se-student-sp.xml14
-rw-r--r--swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml6
-rw-r--r--swamid-2.0/www.test.ladok.se-gui-sp.xml14
213 files changed, 1236 insertions, 1236 deletions
diff --git a/swamid-2.0/acc-nais.uhr.se-shibboleth.xml b/swamid-2.0/acc-nais.uhr.se-shibboleth.xml
index 695620d8..94a27ea5 100644
--- a/swamid-2.0/acc-nais.uhr.se-shibboleth.xml
+++ b/swamid-2.0/acc-nais.uhr.se-shibboleth.xml
@@ -90,9 +90,9 @@ BwquFopAQg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acc-nais.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc-nais.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Carina</md:GivenName>
<md:SurName>Lindström</md:SurName>
<md:EmailAddress>mailto:support@reqtest-services.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/acc.valda.uhr.se-shibboleth.xml b/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
index 18c63acc..9351ffa7 100644
--- a/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
+++ b/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
@@ -90,9 +90,9 @@ BwquFopAQg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acc.valda.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc.valda.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Carina</md:GivenName>
<md:SurName>Lindström</md:SurName>
<md:EmailAddress>mailto:valdasupport@uhr.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/account-idac.ki.se-shibboleth.xml b/swamid-2.0/account-idac.ki.se-shibboleth.xml
index 5974baae..07299441 100644
--- a/swamid-2.0/account-idac.ki.se-shibboleth.xml
+++ b/swamid-2.0/account-idac.ki.se-shibboleth.xml
@@ -116,14 +116,14 @@ kSL+CA/rbpXwRm3nHNg1rnjc3bw7VZn6mPa66U0FisLPsrkcuYS+AZAdA0fO02bL
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Eric</md:GivenName>
<md:SurName>Johansson</md:SurName>
<md:EmailAddress>mailto:eric.johansson@ki.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:GivenName>IT-support</md:GivenName>
<md:EmailAddress>mailto:it-support@ki.se</md:EmailAddress>
<md:TelephoneNumber>+46852482222</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml b/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml
index a15d7398..9724a0f9 100644
--- a/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml
@@ -46,16 +46,16 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.artologik.net/adfs/ls/" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.artologik.net/adfs/ls/" index="2"/>
</SPSSODescriptor>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+
+
+
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<SurName>Helpdesk</SurName>
<EmailAddress>mailto:helpdesk@artologik.com</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<SurName>Info</SurName>
<EmailAddress>mailto:info@artisan.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<SurName>Hostmaster</SurName>
<EmailAddress>mailto:hostmaster@artisan.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.hv.se-adfs-services-trust.xml b/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
index 8310153b..58502419 100644
--- a/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
@@ -58,30 +58,30 @@
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.hv.se/adfs/ls/"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.hv.se/adfs/ls/"/>
</IDPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="sv">HV</OrganizationName>
<OrganizationName xml:lang="en">HV</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Högskolan Väst ny</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">University West new</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>University West</Company>
<SurName>Magnus Andersson</SurName>
<EmailAddress>mailto:Magnus.Andersson@hv.se</EmailAddress>
<TelephoneNumber>+46 520 223193</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>University West</Company>
<SurName>Christian Jiresjö</SurName>
<EmailAddress>mailto:Christian.Jiresjo@hv.se</EmailAddress>
<TelephoneNumber>+46 520 223189</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>University West</Company>
<SurName>Servicedesk Högkoslan Väst</SurName>
<EmailAddress>mailto:servicedesk@hv.se</EmailAddress>
<TelephoneNumber>+46 520 223300</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.ju.se-adfs-services-trust.xml b/swamid-2.0/adfs.ju.se-adfs-services-trust.xml
index 3f933286..dcd6a25a 100644
--- a/swamid-2.0/adfs.ju.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.ju.se-adfs-services-trust.xml
@@ -47,5 +47,5 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.ju.se/adfs/ls/" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.ju.se/adfs/ls/" index="2"/>
</SPSSODescriptor>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support"/>
-</md:EntityDescriptor>
+
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support"/></md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
index 8ff6d477..583dfefc 100644
--- a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
@@ -40,28 +40,28 @@
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.rkh.se/adfs/ls/"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.rkh.se/adfs/ls/"/>
</IDPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="sv">Röda Korsets Högskola</OrganizationName>
<OrganizationName xml:lang="en">Swedish Red Cross University College</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://www.rkh.se/</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.rkh.se/</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Röda Korsets Högskola</Company>
<EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Röda Korsets Högskola</Company>
<EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Röda Korsets Högskola</Company>
<EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<Company>Röda Korsets Högskola</Company>
<EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
index 29d8e140..09fc6ad7 100644
--- a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
+++ b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
@@ -59,14 +59,14 @@ iJJZ3BjPM7Q/BJ92X8XQT/47DwhoNQCqHpQzOKiH
<ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://admin-tug-1.eduid.se:6544/saml2/ls/"/>
<ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://admin-tug-1.eduid.se:6544/saml2/acs/" index="1"/>
</ns0:SPSSODescriptor>
- <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+<ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
<ns0:OrganizationName xml:lang="en">eduID</ns0:OrganizationName>
<ns0:OrganizationDisplayName xml:lang="en">eduID</ns0:OrganizationDisplayName>
<ns0:OrganizationURL xml:lang="en">http://www.eduid.se</ns0:OrganizationURL>
- </ns0:Organization>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<ns0:Company>eduID</ns0:Company>
<ns0:GivenName>Sysadmin</ns0:GivenName>
<ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
- </ns0:ContactPerson>
-</md:EntityDescriptor>
+ </ns0:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml b/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml
index 798da199..ba385ac7 100644
--- a/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml
+++ b/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml
@@ -99,26 +99,26 @@ dmnjsWwQMCk0fiL6Hw9dUd0jCjA3pTYm0YG2Upzg/zV4AasjkFXIUNoXSHkIsnMZ
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
<md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
+ </md:Organization><md:ContactPerson contactType="administrative">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
<md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
<md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/admin.selma7.its.uu.se-shibboleth.sso.xml b/swamid-2.0/admin.selma7.its.uu.se-shibboleth.sso.xml
index c717dcef..cdfa7a23 100644
--- a/swamid-2.0/admin.selma7.its.uu.se-shibboleth.sso.xml
+++ b/swamid-2.0/admin.selma7.its.uu.se-shibboleth.sso.xml
@@ -98,26 +98,26 @@ AocMRPrYxEzWA9by/CGg2/1sBRqgajeC545dwR7ayQVNGbTmhp+0LHrb2fb610uc
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
<md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
+ </md:Organization><md:ContactPerson contactType="administrative">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
<md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
<md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml b/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
index 58961beb..33997850 100644
--- a/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
+++ b/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
@@ -96,9 +96,9 @@ rNkzHliVfNgyZqak7Ay9DNyx8hSt/1/CBfgQsPjOLxpyKxGIdME86uCTbe32i9mz
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://administrationsverktyg.test.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://administrationsverktyg.test.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+<md:ContactPerson contactType="administrative">
<md:GivenName>Tommy</md:GivenName>
<md:SurName>Larsson</md:SurName>
<md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/aktivera.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
index 421f82bd..cc0ba9ef 100644
--- a/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
@@ -85,8 +85,8 @@ mqvHC5Aeiw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aktivera.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/almagest.sai.kau.se.xml b/swamid-2.0/almagest.sai.kau.se.xml
index 6149210b..7cf8b3c6 100644
--- a/swamid-2.0/almagest.sai.kau.se.xml
+++ b/swamid-2.0/almagest.sai.kau.se.xml
@@ -79,8 +79,8 @@ wGwCM8JWEBn/5y8d2MEoE88o20w=
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://almagest.sai.kau.se/Shibboleth.sso/SLO/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://almagest.sai.kau.se/Shibboleth.sso/SAML2/POST" index="1"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ams.ki.se-shibboleth.xml b/swamid-2.0/ams.ki.se-shibboleth.xml
index 02312ed4..89b4d4d4 100644
--- a/swamid-2.0/ams.ki.se-shibboleth.xml
+++ b/swamid-2.0/ams.ki.se-shibboleth.xml
@@ -120,7 +120,7 @@ uA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ams.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ams.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:EmailAddress>mailto:technicalsupport@a-tune.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/apps.convertus.se-shibboleth.xml b/swamid-2.0/apps.convertus.se-shibboleth.xml
index adb8ccac..f26644ca 100644
--- a/swamid-2.0/apps.convertus.se-shibboleth.xml
+++ b/swamid-2.0/apps.convertus.se-shibboleth.xml
@@ -82,12 +82,12 @@ zHEpRj4+aQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.convertus.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://apps.convertus.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+
+<md:ContactPerson contactType="technical">
<md:SurName>Sebastian Schleussner</md:SurName>
<md:EmailAddress>mailto:sebastian.schleussner@convertus.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:support@convertus.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/appstest.convertus.se-shibboleth.xml b/swamid-2.0/appstest.convertus.se-shibboleth.xml
index a95c6c7a..3e8b7d8d 100644
--- a/swamid-2.0/appstest.convertus.se-shibboleth.xml
+++ b/swamid-2.0/appstest.convertus.se-shibboleth.xml
@@ -85,12 +85,12 @@ osdSjbJvuw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appstest.convertus.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appstest.convertus.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+
+<md:ContactPerson contactType="technical">
<md:SurName>Sebastian Schleussner</md:SurName>
<md:EmailAddress>mailto:sebastian.schleussner@convertus.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:support@convertus.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml b/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
index 2c10312e..8fbf1f55 100644
--- a/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
@@ -87,17 +87,17 @@ HGYrlNKYma5Wmcg0BqTiZPbh4Z8VWJBWGHIGND3F23ElplSxM+j63k4=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://artisan-saas-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://artisan-saas-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">SUNET Survey</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">SUNET Survey</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Technical</md:GivenName>
<md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:GivenName>Support</md:GivenName>
<md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/auth.asiaportal.info.xml b/swamid-2.0/auth.asiaportal.info.xml
index e355457c..c9dcb919 100644
--- a/swamid-2.0/auth.asiaportal.info.xml
+++ b/swamid-2.0/auth.asiaportal.info.xml
@@ -44,13 +44,13 @@
<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:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Nordic Institute of Asian Studies</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">NIAS - Nordic Institute of Asian Studies</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.nias.ku.dk</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Administrator</md:GivenName>
<md:EmailAddress>mailto:bib@nias.ku.dk</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml b/swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml
index e8577367..c11c4b64 100644
--- a/swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml
+++ b/swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml
@@ -64,20 +64,20 @@ urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
</md:NameIDFormat>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdub.bridgeapp.com/saml/callback/fcadf6cd-b759-4923-bf03-b4d41bde6f79" index="0"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Eskil</md:GivenName>
<md:SurName>Swahn</md:SurName>
<md:EmailAddress>mailto:eskil.swahn@ldu.lu.se</md:EmailAddress>
<md:TelephoneNumber>+46 46 222 1323</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
+ </md:ContactPerson><md:ContactPerson contactType="administrative">
<md:GivenName>Maria</md:GivenName>
<md:SurName>Hedberg</md:SurName>
<md:EmailAddress>mailto:maria.hedberg@ub.lu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:SurName>LU Servicedesk</md:SurName>
<md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
<md:TelephoneNumber>+46 46 222 9000</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/backweb.antagning.se-hubble-sp.xml b/swamid-2.0/backweb.antagning.se-hubble-sp.xml
index 8b3e9ae3..4be373ef 100644
--- a/swamid-2.0/backweb.antagning.se-hubble-sp.xml
+++ b/swamid-2.0/backweb.antagning.se-hubble-sp.xml
@@ -91,28 +91,28 @@ nTUEA0OqfI3tFzYigYztt7ALtQHK0XO5K3MdCHus2srw+NKUe6mwy3NcSv2U0SI=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://backweb.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://backweb.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<md:Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </md:Organization><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<md:Company>Swedish Council for Higher Education</md:Company>
<md:SurName>UHR Systemdrift</md:SurName>
<md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
<md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<md:Company>Swedish Council for Higher Education</md:Company>
<md:SurName>Håkan Pettersson</md:SurName>
<md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
<md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<md:Company>Swedish Council for Higher Education</md:Company>
<md:SurName>UHR Systemdrift</md:SurName>
<md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
<md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/bdh.local-85-shibboleth.xml b/swamid-2.0/bdh.local-85-shibboleth.xml
index e092ff80..56809fd3 100644
--- a/swamid-2.0/bdh.local-85-shibboleth.xml
+++ b/swamid-2.0/bdh.local-85-shibboleth.xml
@@ -100,19 +100,19 @@ DuMB1+WkDA6AFQItEiWBPnP8PMeaSmyVARFszw6waZ6MumNeQKmi7mK6KsQM/Fje
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Therese</md:GivenName>
<md:SurName>Majlöf</md:SurName>
<md:EmailAddress>mailto:therese.majlov@umu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
+ </md:ContactPerson><md:ContactPerson contactType="administrative">
<md:GivenName>Therese</md:GivenName>
<md:SurName>Majlöf</md:SurName>
<md:EmailAddress>mailto:therese.majlov@umu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:GivenName>Therese</md:GivenName>
<md:SurName>Majlöf</md:SurName>
<md:EmailAddress>mailto:therese.majlov@umu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml b/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml
index 9344f4c0..e00292de 100644
--- a/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml
@@ -37,10 +37,10 @@ FqI3Il3tF2U+FgOT+nizupQelaoagRNerw3p2FHEYeBaTCYiW3IF7lUMIjoX2MYI
<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="false"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:Company>NORDUnet A/S</md:Company>
<md:GivenName>Johan</md:GivenName>
<md:SurName>Lundberg</md:SurName>
<md:EmailAddress>mailto:lundberg@nordu.net</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml b/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml
index edd25029..6caf8c3f 100644
--- a/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml
@@ -103,16 +103,16 @@ zn8Uq6fIUHLfP4vxCjJIGmGoF4J/bPabGTzBrQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bookings-stage.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bookings-stage.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="support">
+
+
+
+<md:ContactPerson contactType="support">
<md:SurName>IT-support</md:SurName>
<md:EmailAddress>mailto:itsupport@kib.ki.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
+ </md:ContactPerson><md:ContactPerson contactType="administrative">
<md:SurName>IT-support</md:SurName>
<md:EmailAddress>mailto:itsupport@kib.ki.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:SurName>IT-support</md:SurName>
<md:EmailAddress>mailto:itsupport@kib.ki.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/bookings.kib.ki.se-shibboleth.xml b/swamid-2.0/bookings.kib.ki.se-shibboleth.xml
index 3e6a94cf..519cfe24 100644
--- a/swamid-2.0/bookings.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/bookings.kib.ki.se-shibboleth.xml
@@ -97,16 +97,16 @@ zn8Uq6fIUHLfP4vxCjJIGmGoF4J/bPabGTzBrQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bookings.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bookings.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="support">
+
+
+
+<md:ContactPerson contactType="support">
<md:SurName>IT-support</md:SurName>
<md:EmailAddress>mailto:itsupport@kib.ki.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
+ </md:ContactPerson><md:ContactPerson contactType="administrative">
<md:SurName>IT-support</md:SurName>
<md:EmailAddress>mailto:itsupport@kib.ki.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:SurName>IT-support</md:SurName>
<md:EmailAddress>mailto:itsupport@kib.ki.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml
index 567a8af9..c9d3f154 100644
--- a/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml
@@ -24,9 +24,9 @@
<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://box-idp.sunet.se/simplesaml/saml2/idp/SSOService.php"/>
</md:IDPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>SUNET</md:GivenName>
<md:SurName>NOC</md:SurName>
<md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
index 12b6a0eb..4e0b7e27 100644
--- a/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
+++ b/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
@@ -41,9 +41,9 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://careergate.student.uu.se/simplesaml/module.php/saml/sp/saml1-acs.php/gl_gateway/artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://careergate.student.uu.se/simplesaml/module.php/saml/sp/saml2-acs.php/gl_gateway" index="4"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Morten</md:GivenName>
<md:SurName>Petersen</md:SurName>
<md:EmailAddress>mailto:morten@graduateland.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/client200-151.its.umu.se-shibboleth.xml b/swamid-2.0/client200-151.its.umu.se-shibboleth.xml
index 5acee493..3da3c7b6 100644
--- a/swamid-2.0/client200-151.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/client200-151.its.umu.se-shibboleth.xml
@@ -90,9 +90,9 @@ a0EsY32piHtFDD51gh4rI8GPrW6p/iP1w7REWkZq0yIrTpEI
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://client200-151.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://client200-151.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+<md:ContactPerson contactType="administrative">
<md:GivenName>Tommy</md:GivenName>
<md:SurName>Larsson</md:SurName>
<md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/cloudmore.com-shibboleth.xml b/swamid-2.0/cloudmore.com-shibboleth.xml
index 8eae421b..792a32f1 100644
--- a/swamid-2.0/cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/cloudmore.com-shibboleth.xml
@@ -86,12 +86,12 @@ KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml b/swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml
index 651a9c6b..6233ca59 100644
--- a/swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml
@@ -47,21 +47,21 @@ wXXiBDXS3PNHXQnnpys=
<md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">NORDUNet</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:Company>NORDUnet</md:Company>
<md:GivenName>Leif</md:GivenName>
<md:SurName>Johansson</md:SurName>
<md:EmailAddress>mailto:leifj@nordu.net</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>NORDUnet</md:Company>
<md:GivenName>Johan</md:GivenName>
<md:SurName>Berggren</md:SurName>
<md:EmailAddress>mailto:jbn@nordu.net</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
index 1382c94a..bcdcb6ba 100644
--- a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
@@ -100,13 +100,13 @@ H/AVOR5U++JOt28OOfoi7mtxOFPxkge3AooWLNFOEOGMSF78BG8NCrT0l59OnAtN
<md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:Company>NORDUnet NOC</md:Company>
<md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml b/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
index 1654ae74..3477ff04 100644
--- a/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
+++ b/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
@@ -88,14 +88,14 @@ D265cqy6Le/toVg=
<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:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">ICOS Carbon Portal</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Carbon Portal</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://icos-cp.eu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Oleg</md:GivenName>
<md:SurName>Mirzov</md:SurName>
<md:EmailAddress>mailto:oleg.mirzov@nateko.lu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/daisy.dsv.su.se-shibboleth.xml b/swamid-2.0/daisy.dsv.su.se-shibboleth.xml
index b7c248cd..bb01e29d 100644
--- a/swamid-2.0/daisy.dsv.su.se-shibboleth.xml
+++ b/swamid-2.0/daisy.dsv.su.se-shibboleth.xml
@@ -68,24 +68,24 @@ QhkStwIG6VXQAVJpMKGblsSIk+TqRD1okkUSY5BHAob80RAoOCmbhw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://daisy.dsv.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://daisy.dsv.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+
+
+<md:ContactPerson contactType="administrative">
<md:Company>DSV, Stockholm University</md:Company>
<md:GivenName>DMC</md:GivenName>
<md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>DSV, Stockholm University</md:Company>
<md:GivenName>DMC</md:GivenName>
<md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>DSV, Stockholm University</md:Company>
<md:GivenName>DMC</md:GivenName>
<md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>DSV, Stockholm University</md:Company>
<md:GivenName>Security DMC</md:GivenName>
<md:EmailAddress>mailto:incident@dsv.su.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml b/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml
index 5c82e150..dee2034b 100644
--- a/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml
+++ b/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml
@@ -97,24 +97,24 @@ z5YBnMaQJe+rBcMSFlxo5Iw8sVICkj3tKC9gROCAXNqi0/w1RA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+
+
+<md:ContactPerson contactType="administrative">
<md:Company>DSV, Stockholm University</md:Company>
<md:GivenName>DMC</md:GivenName>
<md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>DSV, Stockholm University</md:Company>
<md:GivenName>DMC</md:GivenName>
<md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>DSV, Stockholm University</md:Company>
<md:GivenName>DMC</md:GivenName>
<md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>DSV, Stockholm University</md:Company>
<md:GivenName>Security DMC</md:GivenName>
<md:EmailAddress>mailto:incident@dsv.su.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/data.houseoffinance.se-shibboleth.xml b/swamid-2.0/data.houseoffinance.se-shibboleth.xml
index 36a1a6bb..71fabc5f 100644
--- a/swamid-2.0/data.houseoffinance.se-shibboleth.xml
+++ b/swamid-2.0/data.houseoffinance.se-shibboleth.xml
@@ -84,9 +84,9 @@ bi+i8GP0b/0=
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://data.houseoffinance.se/Shibboleth.sso/SLO/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://data.houseoffinance.se/Shibboleth.sso/SAML2/POST" index="1"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+<md:ContactPerson contactType="administrative">
<md:GivenName>Carmine</md:GivenName>
<md:SurName>Palombo</md:SurName>
<md:EmailAddress>mailto:Carmine.Palombo@hhs.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/dedserv79.levonline.com-shibboleth.xml b/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
index 6eca94a8..3618c717 100644
--- a/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
+++ b/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
@@ -34,15 +34,15 @@ qlG83cbyWydqYCCYruAVslAykrwfBXAXdCs4YBs=</ds:X509Certificate>
</KeyDescriptor>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dedserv79.levonline.com/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
</SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">Emanuel</OrganizationName>
<OrganizationDisplayName xml:lang="en">Emanuel AB</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.emanuel.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Emanuel AB</Company>
<GivenName>Fredrik</GivenName>
<SurName>Näslund</SurName>
<EmailAddress>mailto:fredrik.naslund@emanuel.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/dev.cloudmore.com-shibboleth.xml b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
index 3d3d4a5a..d14fd5c5 100644
--- a/swamid-2.0/dev.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
@@ -93,12 +93,12 @@ KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
<md:RequestedAttribute FriendlyName="eppn" 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" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/dev.nais.uhr.se-shibboleth.xml b/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
index e11ca73c..2e03f2eb 100644
--- a/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
+++ b/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
@@ -92,9 +92,9 @@ JPCgGoM1ape2Nyf198u6F4qXp5MZsS+vBOXxAyvHzWOr5uMzxg0oAJQwpkVp/b2z
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.nais.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.nais.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Carina</md:GivenName>
<md:SurName>Lindström</md:SurName>
<md:EmailAddress>mailto:support@reqtest-services.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml b/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
index fc4e20d1..a11dc637 100644
--- a/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
+++ b/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
@@ -33,17 +33,17 @@
<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://diskus-demo.ub.uu.se/saml/acs" index="1"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Uppsala University Library</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.ub.ud.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Fredrik Lysen</md:GivenName>
<md:EmailAddress>mailto:fredrik.lysen@ub.uu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:GivenName>Helpdesk</md:GivenName>
<md:EmailAddress>mailto:helpdesk@ub.uu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/du.hr.evry.se-shibboleth.xml b/swamid-2.0/du.hr.evry.se-shibboleth.xml
index a2fc14a2..507c7a16 100644
--- a/swamid-2.0/du.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/du.hr.evry.se-shibboleth.xml
@@ -76,14 +76,14 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
<md:RequestedAttribute FriendlyName="eppn" 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:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:GivenName>Primula</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index d40833b1..ccb9e9f1 100644
--- a/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -40,8 +40,8 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://durin.sau.kau.se/simplesaml/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://durin.sau.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>IT-avdelningen</md:GivenName>
<md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index a1692bcd..043d48df 100644
--- a/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -40,8 +40,8 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edit.kau.se/simplesaml/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://edit.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>IT-avdelningen</md:GivenName>
<md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml b/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
index 20cad86e..e961fe9d 100644
--- a/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
+++ b/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
@@ -35,14 +35,14 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-acs.php/frontwalkersp" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml1-acs.php/frontwalkersp/artifact" index="3"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="sv">Retendo</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Retendo</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Mikael</md:GivenName>
<md:SurName>Westoo</md:SurName>
<md:EmailAddress>mailto:mikael.westoo@e-identitet.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml b/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml
index 7190a5b5..48a11383 100644
--- a/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml
@@ -98,9 +98,9 @@ Rh2KVHAiKOIu9nyDsz3aAY17J2ju15aJRQc=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+<md:ContactPerson contactType="administrative">
<md:GivenName>Risto</md:GivenName>
<md:SurName>Järvi</md:SurName>
<md:EmailAddress>mailto:risto.jarvi@umu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml b/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml
index 344efb5b..e1656593 100644
--- a/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml
+++ b/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml
@@ -46,16 +46,16 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.vemendo.net/adfs/ls/" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.vemendo.net/adfs/ls/" index="2"/>
</SPSSODescriptor>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+
+
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<GivenName>Jan</GivenName>
<SurName>Aldoson</SurName>
<EmailAddress>mailto:jan.aldoson@bygg.lu.se</EmailAddress>
<TelephoneNumber>+46462220467</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<GivenName>Jan</GivenName>
<SurName>Aldoson</SurName>
<EmailAddress>mailto:jan.aldoson@bygg.lu.se</EmailAddress>
<TelephoneNumber>+46462220467</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml b/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
index 441b31f5..1279222c 100644
--- a/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
+++ b/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
@@ -32,9 +32,9 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://funk.chs.chalmers.se/saml/www/module.php/saml/sp/saml2-acs.php/Funk" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://funk.chs.chalmers.se/saml/www/module.php/saml/sp/saml1-acs.php/Funk/artifact" index="3"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Robin</md:GivenName>
<md:SurName>Jensen</md:SurName>
<md:EmailAddress>mailto:robin@montania.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml b/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml
index b98cf051..f55d2275 100644
--- a/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml
+++ b/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml
@@ -90,9 +90,9 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Peter</md:GivenName>
<md:SurName>Moller</md:SurName>
<md:EmailAddress>mailto:peter.moller@cs.lth.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
index b3a102df..0e4adf7c 100644
--- a/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
+++ b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
@@ -32,9 +32,9 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://graduateland.com/simplesaml/module.php/saml/sp/saml2-acs.php/gl_gateway" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://graduateland.com/simplesaml/module.php/saml/sp/saml1-acs.php/gl_gateway/artifact" index="3"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Morten</md:GivenName>
<md:SurName>Petersen</md:SurName>
<md:EmailAddress>mailto:morten@graduateland.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/halon-eu.sunet.se-shibboleth.xml b/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
index f970c853..c421f608 100644
--- a/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
+++ b/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
@@ -89,14 +89,14 @@ uQHAppDUMcAVcciXyqOjeW25eKnOv6Dnkg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">SUNET</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
+ </md:Organization><md:ContactPerson contactType="administrative">
<md:GivenName>Fredrik</md:GivenName>
<md:SurName>Pettai</md:SurName>
<md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
index 8cdcab0e..316edd2f 100644
--- a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
@@ -219,22 +219,22 @@ YPbGFDgtXE/LKeKsvKgyQIfKUW8=
<!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
<!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
</AttributeAuthorityDescriptor>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+
+
+
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>University of Borås</Company>
<SurName>IT</SurName>
<EmailAddress>mailto:it@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>University of Borås</Company>
<SurName>IT</SurName>
<EmailAddress>mailto:it@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>University of Borås</Company>
<SurName>IT</SurName>
<EmailAddress>mailto:it@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/hh.hr.evry.se-shibboleth.xml b/swamid-2.0/hh.hr.evry.se-shibboleth.xml
index fa89fc3f..d83e548e 100644
--- a/swamid-2.0/hh.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/hh.hr.evry.se-shibboleth.xml
@@ -76,14 +76,14 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
<md:RequestedAttribute FriendlyName="eppn" 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:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:GivenName>Primula</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/hhs-personality-quiz.eu-gb.mybluemix.net.xml b/swamid-2.0/hhs-personality-quiz.eu-gb.mybluemix.net.xml
index c7d10296..7ad63f85 100644
--- a/swamid-2.0/hhs-personality-quiz.eu-gb.mybluemix.net.xml
+++ b/swamid-2.0/hhs-personality-quiz.eu-gb.mybluemix.net.xml
@@ -24,8 +24,8 @@
<md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hhs-personality-quiz.eu-gb.mybluemix.net/login/callback" index="1"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Adam Sawert</md:GivenName>
<md:EmailAddress>mailto:adam.sawert@ibm.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/hhs-se.zoom.us.xml b/swamid-2.0/hhs-se.zoom.us.xml
index 19a0863d..a57a0240 100644
--- a/swamid-2.0/hhs-se.zoom.us.xml
+++ b/swamid-2.0/hhs-se.zoom.us.xml
@@ -103,8 +103,8 @@ qoBVRu5DVnqs1dZZiZdHqRt3Tt22k0sDdvtQWnVISyGVqqSzPxq8YrLDVTA380eaXiYDbxoO1SN+
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hhs-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hhs-se.zoom.us/saml/SSO" index="1"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:SurName>Gottfried Gemzell</md:SurName>
<md:EmailAddress>mailto:Gottfried.Gemzell@hhs.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/his.hr.evry.se-shibboleth.xml b/swamid-2.0/his.hr.evry.se-shibboleth.xml
index 9dd89503..615e633a 100644
--- a/swamid-2.0/his.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/his.hr.evry.se-shibboleth.xml
@@ -69,14 +69,14 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
<md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:GivenName>Primula</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/hkr.hr.evry.se-shibboleth.xml b/swamid-2.0/hkr.hr.evry.se-shibboleth.xml
index 3201d0ff..747597d6 100644
--- a/swamid-2.0/hkr.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/hkr.hr.evry.se-shibboleth.xml
@@ -69,14 +69,14 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
<md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:GivenName>Primula</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/hr.liu.se-shibboleth.xml b/swamid-2.0/hr.liu.se-shibboleth.xml
index 1d0d2b0b..26bd9c12 100644
--- a/swamid-2.0/hr.liu.se-shibboleth.xml
+++ b/swamid-2.0/hr.liu.se-shibboleth.xml
@@ -70,7 +70,9 @@ Zgu8vav6NzPHTYy+UoBYKhwMNtFqIg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hr.liu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hr.liu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">
EVRY HR Solutions AB
</md:OrganizationName>
@@ -80,9 +82,7 @@ Zgu8vav6NzPHTYy+UoBYKhwMNtFqIg==
<md:OrganizationURL xml:lang="en">
http://www.evry.se
</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>Primulasupport</md:SurName>
<md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/humio.sunet.se-shibboleth.xml b/swamid-2.0/humio.sunet.se-shibboleth.xml
index ef8213b5..e169a028 100644
--- a/swamid-2.0/humio.sunet.se-shibboleth.xml
+++ b/swamid-2.0/humio.sunet.se-shibboleth.xml
@@ -89,14 +89,14 @@ MJcrninQKsm/XcSCCWQWEg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://humio.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://humio.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">SUNET</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
+ </md:Organization><md:ContactPerson contactType="administrative">
<md:GivenName>Fredrik</md:GivenName>
<md:SurName>Pettai</md:SurName>
<md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/id.statenssc.se-adfs-services-trust.xml b/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
index 9616e504..bd74c925 100644
--- a/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
+++ b/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
@@ -44,26 +44,26 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://id.statenssc.se/adfs/ls/" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.statenssc.se/adfs/ls/" index="2"/>
</SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="sv">Statens Servicecenter</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Accounting and payroll services for employees at Swedish authorities</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://www.statenssc.se/</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<GivenName>Johan</GivenName>
<SurName>Göthberg</SurName>
<EmailAddress>mailto:johan.gothberg@statenssc.se</EmailAddress>
<TelephoneNumber>0771456000</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<SurName>Johan Larsson</SurName>
<EmailAddress>mailto:johan.larsson@statenssc.se</EmailAddress>
<TelephoneNumber>+46 10-456 03 10</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<SurName>Lars Forsgren</SurName>
<EmailAddress>mailto:lars.forsgren@tieto.com</EmailAddress>
<TelephoneNumber>+46 10-481 01 97</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.comanage.sunet.se-idp.xml b/swamid-2.0/idp-test.comanage.sunet.se-idp.xml
index 1a9542c9..52fc727b 100644
--- a/swamid-2.0/idp-test.comanage.sunet.se-idp.xml
+++ b/swamid-2.0/idp-test.comanage.sunet.se-idp.xml
@@ -56,17 +56,17 @@ ygB2VM+8ymwkDfAm/TbcW1I6hFRKJKKJDqk/iuHN
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.comanage.sunet.se/Saml2SP/SUNET-TEST/sso/redirect"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.comanage.sunet.se/Saml2SP/SUNET-TEST/sso/post"/>
</md:IDPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Sunet IdPaaS Test</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Sunet IdPaaS Test</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Technical</md:GivenName>
<md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:GivenName>Support</md:GivenName>
<md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.comanage.sunet.se-sp.xml b/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
index 24108a63..927b01c8 100644
--- a/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
+++ b/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
@@ -52,17 +52,17 @@ ygB2VM+8ymwkDfAm/TbcW1I6hFRKJKKJDqk/iuHN
</KeyDescriptor>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.comanage.sunet.se/Saml2SP/acs/post" index="1"/>
</SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">SUNET</OrganizationName>
<OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.sunet.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<GivenName>Technical</GivenName>
<EmailAddress>mailto:noc@sunet.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<GivenName>Support</GivenName>
<EmailAddress>mailto:noc@sunet.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml
index e271fedd..186f4e30 100644
--- a/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml
@@ -60,28 +60,28 @@ UebM+vdVeYb0JLMqQevfKMQVbhC3sLuZEGHLh0VE/ZSY5GQGDAshuw0e7Xfrxcd6
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.it.su.se/idp/profile/SAML2/POST/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">SU</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Stockholms universitet (test)</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Stockholm University (test)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Stockholm University</Company>
<SurName>Helpdesk</SurName>
<EmailAddress>mailto:helpdesk@su.se</EmailAddress>
<TelephoneNumber>+46 8 16 1999</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Stockholm University</Company>
<SurName>Helpdesk</SurName>
<EmailAddress>mailto:helpdesk@su.se</EmailAddress>
<TelephoneNumber>+46 8 16 1999</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Stockholm University</Company>
<SurName>Helpdesk</SurName>
<EmailAddress>mailto:helpdesk@su.se</EmailAddress>
<TelephoneNumber>+46 8 16 1999</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
index 4429f411..857944d7 100644
--- a/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
@@ -24,9 +24,9 @@
<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-test.nordu.net/simplesaml/saml2/idp/SSOService.php"/>
</md:IDPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>SUNET</md:GivenName>
<md:SurName>NOC</md:SurName>
<md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
index 6e5400cb..39a26aa1 100644
--- a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
@@ -58,18 +58,18 @@
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
</IDPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="sv">Konstfack</OrganizationName>
<OrganizationName xml:lang="en">Konstfack</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Konstfack</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Konstfack</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://www.konstfack.se/</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.konstfack.se/en</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<GivenName>Håkan</GivenName>
<SurName>Pettersson</SurName>
<EmailAddress>mailto:netsupport@konstfack.se</EmailAddress>
<TelephoneNumber>+46-8-4504100</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
index 2d1408ce..1f5e79bf 100644
--- a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
@@ -52,18 +52,18 @@
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
</IDPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="sv">Södertörns högskola</OrganizationName>
<OrganizationName xml:lang="en">Södertörn University</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Södertörns högskola</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Södertörn University</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://www.sh.se</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.sh.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<GivenName>Tomas</GivenName>
<SurName>Legat</SurName>
<EmailAddress>mailto:server@sh.se</EmailAddress>
<TelephoneNumber>+46(0)8-6084000</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.antagning.se-aws-idp.xml b/swamid-2.0/idp.antagning.se-aws-idp.xml
index c5b8e715..2571d026 100644
--- a/swamid-2.0/idp.antagning.se-aws-idp.xml
+++ b/swamid-2.0/idp.antagning.se-aws-idp.xml
@@ -52,28 +52,28 @@ MIICBDCCAW2gAwIBAgIJANzswMCdTsm7MA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRh
<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">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">UHR</OrganizationName>
<OrganizationDisplayName xml:lang="sv">www.antagning.se</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">www.universityadmissions.se</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Universityadmissions.se</Company>
<SurName>UHR Systemdrift</SurName>
<EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
<TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Universityadmissions.se</Company>
<SurName>Håkan Pettersson</SurName>
<EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
<TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Universityadmissions.se</Company>
<SurName>UHR Systemdrift</SurName>
<EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
<TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.esh.se-idp-shibboleth.xml b/swamid-2.0/idp.esh.se-idp-shibboleth.xml
index 15de65f5..8885cb67 100644
--- a/swamid-2.0/idp.esh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.esh.se-idp-shibboleth.xml
@@ -87,15 +87,15 @@ geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
<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">
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="sv">Ersta Sköndal Högskola</OrganizationName>
<OrganizationName xml:lang="en">Ersta Sköndal University College</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Ersta Sköndal Högskola</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Ersta Sköndal University College</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://www.esh.se/</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.esh.se/in-english/ersta-skondal-hogskola---english.html</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<EmailAddress>mailto:klas.eriksson@esh.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
index a4131584..1a2025fc 100644
--- a/swamid-2.0/idp.kva.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
@@ -95,25 +95,25 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
<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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">KVA</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Kungliga Vetenskapsakademien</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">The Royal Swedish Academy of Sciences</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.kva.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>The Royal Swedish Academy of Sciences</Company>
<EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
<TelephoneNumber>+46 70 6739792</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>The Royal Swedish Academy of Sciences</Company>
<EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
<TelephoneNumber>+46 70 6739792</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>The Royal Swedish Academy of Sciences</Company>
<EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
<TelephoneNumber>+46 70 6739792</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.lnu.se-idp-shibboleth.xml b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
index 99a22c1f..45a69378 100644
--- a/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
@@ -108,14 +108,14 @@
<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">
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">LNU</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Linnaeus University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://lnu.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Linnæus University</Company>
<EmailAddress>mailto:it-idp@list.lnu.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
index 3ff6c3f6..6fcfbe8d 100644
--- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
@@ -200,28 +200,28 @@ Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
</AttributeAuthorityDescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">MAH</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Malmö universitet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Malmö University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://www.mau.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Malmö University</Company>
<SurName>IT Drift</SurName>
<EmailAddress>mailto:drift@mau.se</EmailAddress>
<TelephoneNumber>+46 709 655480</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Malmö University</Company>
<SurName>IT Drift</SurName>
<EmailAddress>mailto:drift@mau.se</EmailAddress>
<TelephoneNumber>+46 709 655480</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Malmö University</Company>
<SurName>IT Servicedesk</SurName>
<EmailAddress>mailto:support@mau.se</EmailAddress>
<TelephoneNumber>+46 40 6657555</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
index e3a698bd..588903f4 100644
--- a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
+++ b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
@@ -91,24 +91,24 @@ JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
<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">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">NORDUnet</OrganizationName>
<OrganizationDisplayName xml:lang="sv">NORDUnet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">NORDUnet</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>NORDUnet</Company>
<SurName>noc@nordu.net</SurName>
<EmailAddress>mailto:noc@nordu.net</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>NORDUnet</Company>
<EmailAddress>mailto:noc@nordu.net</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>NORDUnet</Company>
<SurName>NUNOC</SurName>
<EmailAddress>mailto:noc@nordu.net</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.oru.se-idp-shibboleth.xml b/swamid-2.0/idp.oru.se-idp-shibboleth.xml
index 4932e502..39657701 100644
--- a/swamid-2.0/idp.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.oru.se-idp-shibboleth.xml
@@ -167,26 +167,26 @@ qzdjBhUfdsHeXtWHnx4=
<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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">Orebro University</OrganizationName>
<OrganizationDisplayName xml:lang="en">Orebro University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://idp.oru.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Örebro University</Company>
<SurName>IT Avdelningen</SurName>
<EmailAddress>mailto:itsupport@oru.se</EmailAddress>
<TelephoneNumber>+46 19 303166</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Örebro universitet</Company>
<SurName>IT-support</SurName>
<EmailAddress>mailto:itsupport@oru.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Örebro University</Company>
<SurName>IT Avdelningen Örebro universitet</SurName>
<EmailAddress>mailto:itsupport@oru.se</EmailAddress>
<TelephoneNumber>+46 19 303166</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.sunet.se-idp.xml b/swamid-2.0/idp.sunet.se-idp.xml
index 8d9bab67..e288576d 100644
--- a/swamid-2.0/idp.sunet.se-idp.xml
+++ b/swamid-2.0/idp.sunet.se-idp.xml
@@ -72,17 +72,17 @@ jiN2PVb/fS119Yu9s/jk86TcHIATZtmc/h6y5FkHzADUHGPPNum92l027dPIVqeT
<saml:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sunet.se/Saml2SP/sso/redirect"/>
<saml:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sunet.se/Saml2SP/sso/post"/>
</saml:IDPSSODescriptor>
- <saml:Organization xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+<saml:Organization xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata">
<saml:OrganizationName xml:lang="en">SUNET</saml:OrganizationName>
<saml:OrganizationDisplayName xml:lang="en">SUNET</saml:OrganizationDisplayName>
<saml:OrganizationURL xml:lang="en">https://sunet.se</saml:OrganizationURL>
- </saml:Organization>
- <saml:ContactPerson xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </saml:Organization><saml:ContactPerson xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<saml:GivenName>Technical</saml:GivenName>
<saml:EmailAddress>mailto:noc@sunet.se</saml:EmailAddress>
- </saml:ContactPerson>
- <saml:ContactPerson xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </saml:ContactPerson><saml:ContactPerson xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<saml:GivenName>Support</saml:GivenName>
<saml:EmailAddress>mailto:noc@sunet.se</saml:EmailAddress>
- </saml:ContactPerson>
-</md:EntityDescriptor>
+ </saml:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.test.antagning.se-aws-idp.xml b/swamid-2.0/idp.test.antagning.se-aws-idp.xml
index 4583425a..15e145d3 100644
--- a/swamid-2.0/idp.test.antagning.se-aws-idp.xml
+++ b/swamid-2.0/idp.test.antagning.se-aws-idp.xml
@@ -53,28 +53,28 @@ MIIDEzCCAfugAwIBAgIJAISr5vVr4OFKMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0
<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">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">UHR</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Antagning.se - Test</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Universityadmissions.se - Test</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Universityadmissions.se</Company>
<SurName>UHR Systemdrift</SurName>
<EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
<TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Universityadmissions.se</Company>
<SurName>Håkan Pettersson</SurName>
<EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
<TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Universityadmissions.se</Company>
<SurName>UHR Systemdrift</SurName>
<EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
<TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.test.sunet.se-idp.xml b/swamid-2.0/idp.test.sunet.se-idp.xml
index 746683bb..8a38a764 100644
--- a/swamid-2.0/idp.test.sunet.se-idp.xml
+++ b/swamid-2.0/idp.test.sunet.se-idp.xml
@@ -76,17 +76,17 @@ w1/klZ0omp5S
<ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.test.sunet.se/Saml2SP/sso/post"/>
<ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.sunet.se/Saml2SP/sso/redirect"/>
</ns0:IDPSSODescriptor>
- <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+<ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
<ns0:OrganizationName xml:lang="en">SUNET Staff Login</ns0:OrganizationName>
<ns0:OrganizationDisplayName xml:lang="en">SUNET - Test</ns0:OrganizationDisplayName>
<ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
- </ns0:Organization>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<ns0:GivenName>Technical</ns0:GivenName>
<ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
- </ns0:ContactPerson>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<ns0:GivenName>Support</ns0:GivenName>
<ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
- </ns0:ContactPerson>
-</md:EntityDescriptor>
+ </ns0:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp02.gih.se-idp-shibboleth.xml b/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
index 596d1f33..1da6acfb 100644
--- a/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
@@ -180,28 +180,28 @@ kfpzToDw7cwPkXGX3xVBCLSNhnhot3urMFbpFSDWig==
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.gih.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
</AttributeAuthorityDescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">The Swedish School of Sport and Health Sciences (Test)</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan (Test)</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences (Test)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.gih.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>The Swedish School of Sport and Health Sciences</Company>
<SurName>Fredrik Nilsson</SurName>
<EmailAddress>mailto:fredrik.nilsson@gih.se</EmailAddress>
<TelephoneNumber>+46 8 12053734</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>The Swedish School of Sport and Health Sciences</Company>
<SurName>Michael Thunell</SurName>
<EmailAddress>mailto:michael.thunell@gih.se</EmailAddress>
<TelephoneNumber>+46 8 12053807</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>The Swedish School of Sport and Health Sciences</Company>
<SurName>Charlie Skog</SurName>
<EmailAddress>mailto:charlie.skog@gih.se</EmailAddress>
<TelephoneNumber>+46 8 12053792</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml b/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml
index 0d7d2852..eda53b22 100644
--- a/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml
+++ b/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml
@@ -46,16 +46,16 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp1.artologik.net/adfs/ls/" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.artologik.net/adfs/ls/" index="2"/>
</SPSSODescriptor>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+
+
+
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<SurName>Helpdesk</SurName>
<EmailAddress>mailto:helpdesk@artologik.com</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<SurName>Info</SurName>
<EmailAddress>mailto:info@artisan.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<SurName>Hostmaster</SurName>
<EmailAddress>mailto:hostmaster@artisan.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml b/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml
index 78440179..d086dcc7 100644
--- a/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml
@@ -81,22 +81,22 @@ YDkKy11d6W9v8pPknySJoAC5hL1v26ov7NpY6LN+tNAhuSfMSKo1ugFmOfX/CAIc
<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">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet (test)</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science (test)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<GivenName>SAML Admins</GivenName>
<EmailAddress>mailto:saml-admins@slu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<GivenName>SAML Admins</GivenName>
<EmailAddress>mailto:saml-admins@slu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<GivenName>Help Desk</GivenName>
<EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp2.his.se-idp-shibboleth.xml b/swamid-2.0/idp2.his.se-idp-shibboleth.xml
index 9b8c698c..cf4c089e 100644
--- a/swamid-2.0/idp2.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.his.se-idp-shibboleth.xml
@@ -196,28 +196,28 @@ lydgJ83mLCTu9Bueh30Fp3aQ64DAHbCABkgW
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.his.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
</AttributeAuthorityDescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">HIS</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">University of Skövde</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.his.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>University of Skövde</Company>
<SurName>HiS Netadmin</SurName>
<EmailAddress>mailto:netadmin@his.se</EmailAddress>
<TelephoneNumber>+46 500 448800</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>University of Skövde</Company>
<SurName>HiS Netadmin</SurName>
<EmailAddress>mailto:netadmin@his.se</EmailAddress>
<TelephoneNumber>+46 500 448800</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>University of Skövde</Company>
<SurName>IT Helpdesk Högskolan i Skövde</SurName>
<EmailAddress>mailto:helpdesk@his.se</EmailAddress>
<TelephoneNumber>+46 500 448800</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
index c5e1d4f1..0e870fbe 100644
--- a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
@@ -203,28 +203,28 @@ R/BU8rcOeQ5KU1e3ooJqSzIKBhWce80g4TaX1u1rYibKqkSUwgp1Jh2MSnKN0B8c
<!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kkh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
<!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
</AttributeAuthorityDescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">KKH</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Royal Institute of Art</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.kkh.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Kungl. Konsthögskolan</Company>
<SurName>Fredrik Reuterswärd</SurName>
<EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
<TelephoneNumber>+4686144064</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Kungl. Konsthögskolan</Company>
<SurName>Fredrik Reuterswärd</SurName>
<EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
<TelephoneNumber>+4686144064</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Kungl. Konsthögskolan</Company>
<SurName>Fredrik Reuterswärd</SurName>
<EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
<TelephoneNumber>+4686144064</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp3.hig.se-idp-shibboleth.xml b/swamid-2.0/idp3.hig.se-idp-shibboleth.xml
index 4a90509f..2713552c 100644
--- a/swamid-2.0/idp3.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp3.hig.se-idp-shibboleth.xml
@@ -201,28 +201,28 @@ uSUv8QvuQcOa9kYsSNH4o1+qTVp8mrFCghss
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
</AttributeAuthorityDescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">HIG</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">University of Gävle</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>University of Gävle</Company>
<SurName>Network Operations</SurName>
<EmailAddress>mailto:nat@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>University of Gävle</Company>
<SurName>Operations</SurName>
<EmailAddress>mailto:nat@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>University of Gävle</Company>
<SurName>IT Support</SurName>
<EmailAddress>mailto:itsupport@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml
index 55266d5a..78ccbe76 100644
--- a/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml
@@ -197,30 +197,30 @@ mbmfzT51FSO1LI3Xw2lAtTgYi5oMWqxMao2yJl8MZKP4OY3Y
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
</AttributeAuthorityDescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">GU</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">University of Gothenburg</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>University of Gothenburg</Company>
<SurName>Lena Ström</SurName>
<EmailAddress>mailto:lena.strom@gu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>University of Gothenburg</Company>
<SurName>Tobias Galéus</SurName>
<EmailAddress>mailto:tobias.galeus@gu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>University of Gothenburg</Company>
<SurName>GU-Support</SurName>
<EmailAddress>mailto:support@gu.se</EmailAddress>
<TelephoneNumber>+46317862020</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<GivenName>IRT GU</GivenName>
<EmailAddress>mailto:irt@gu.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp3.sics.se-idp-shibboleth.xml b/swamid-2.0/idp3.sics.se-idp-shibboleth.xml
index 51e6fb41..092207e1 100644
--- a/swamid-2.0/idp3.sics.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp3.sics.se-idp-shibboleth.xml
@@ -188,15 +188,15 @@ RSPI3dYXTAE9qA5awk/PGw+gfj7d8mqBUfuSj+KU4A==
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.sics.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
</AttributeAuthorityDescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">SICS</OrganizationName>
<OrganizationDisplayName xml:lang="en">SICS</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="sv">SICS</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://www.sics.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>SICS</Company>
<SurName>CRIT</SurName>
<EmailAddress>mailto:crit@sics.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idpproxy.dev.eduid.se-idp.xml b/swamid-2.0/idpproxy.dev.eduid.se-idp.xml
index a2b42d90..f514b8e4 100644
--- a/swamid-2.0/idpproxy.dev.eduid.se-idp.xml
+++ b/swamid-2.0/idpproxy.dev.eduid.se-idp.xml
@@ -58,21 +58,21 @@
<ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpproxy.dev.eduid.se/Saml2SP/sso/post"/>
<ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpproxy.dev.eduid.se/Saml2SP/sso/redirect"/>
</ns0:IDPSSODescriptor>
- <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
<ns0:OrganizationName xml:lang="en">eduID Proxy IdP Sweden</ns0:OrganizationName>
<ns0:OrganizationDisplayName xml:lang="en">eduID Proxy IdP Sweden</ns0:OrganizationDisplayName>
<ns0:OrganizationURL xml:lang="en">https://eduid.se</ns0:OrganizationURL>
- </ns0:Organization>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<ns0:GivenName>Administrative</ns0:GivenName>
<ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
- </ns0:ContactPerson>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<ns0:GivenName>Technical</ns0:GivenName>
<ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
- </ns0:ContactPerson>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<ns0:GivenName>Support</ns0:GivenName>
<ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
- </ns0:ContactPerson>
-</md:EntityDescriptor>
+ </ns0:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idpproxy.dev.eduid.se-sp.xml b/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
index 7a1c5680..15a55d46 100644
--- a/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
+++ b/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
@@ -101,21 +101,21 @@ rZkPdbEo7RWd1WEorEEtb9EOKsnhiuj5ZwQmFMt3NX76nWdFDwhNAi3X0r7M/CnE
<ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpproxy.dev.eduid.se/Saml2SP/acs/post" index="1"/>
<ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpproxy.dev.eduid.se/Saml2SP/acs/redirect" index="2"/>
</ns0:SPSSODescriptor>
- <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
<ns0:OrganizationName xml:lang="en">eduID Proxy SP Sweden</ns0:OrganizationName>
<ns0:OrganizationDisplayName xml:lang="en">eduID Proxy SP Sweden</ns0:OrganizationDisplayName>
<ns0:OrganizationURL xml:lang="en">https://eduid.se</ns0:OrganizationURL>
- </ns0:Organization>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<ns0:GivenName>Administrative</ns0:GivenName>
<ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
- </ns0:ContactPerson>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<ns0:GivenName>Technical</ns0:GivenName>
<ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
- </ns0:ContactPerson>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<ns0:GivenName>Support</ns0:GivenName>
<ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
- </ns0:ContactPerson>
-</md:EntityDescriptor>
+ </ns0:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
index ac8b416b..8922d1e3 100644
--- a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
@@ -209,32 +209,32 @@ CQNfH97cIrTE5N/RQ7XWcw==
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
</AttributeAuthorityDescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">IRF</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Swedish Institute of Space Physics</Company>
<SurName>Mats Luspa</SurName>
<EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
<TelephoneNumber>+4698079000</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Swedish Institute of Space Physics</Company>
<SurName>Mats Luspa</SurName>
<EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
<TelephoneNumber>+4698079022</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Swedish Institute of Space Physics</Company>
<SurName>Mats Luspa</SurName>
<EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
<TelephoneNumber>+4698079022</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<GivenName>Security Response Team</GivenName>
<EmailAddress>mailto:abuse@irf.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml
index e47a7fff..fadab913 100644
--- a/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml
@@ -24,9 +24,9 @@
<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://idpsimplesaml.irf.se/simplesaml/saml2/idp/SSOService.php"/>
</md:IDPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Mats</md:GivenName>
<md:SurName>Luspa</md:SurName>
<md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idpv4.lu.se-idp-shibboleth.xml b/swamid-2.0/idpv4.lu.se-idp-shibboleth.xml
index 8c98b6ca..8543e37b 100644
--- a/swamid-2.0/idpv4.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpv4.lu.se-idp-shibboleth.xml
@@ -239,29 +239,29 @@
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv4.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
</AttributeAuthorityDescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">LU</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Lunds universitet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.lu.se/</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<GivenName>Eskil</GivenName>
<SurName>Swahn</SurName>
<EmailAddress>mailto:eskil.swahn@ldc.lu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<GivenName>Johan</GivenName>
<SurName>Silverup</SurName>
<EmailAddress>mailto:johan.silverup@ldc.lu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<SurName>LU Servicedesk</SurName>
<EmailAddress>mailto:servicedesk@lu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<GivenName>IRT Lund University</GivenName>
<EmailAddress>mailto:abuse@lu.se</EmailAddress>
<TelephoneNumber>+46462229000</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/indico.test.uu.se-shibboleth.xml b/swamid-2.0/indico.test.uu.se-shibboleth.xml
index fc1c606f..b5964456 100644
--- a/swamid-2.0/indico.test.uu.se-shibboleth.xml
+++ b/swamid-2.0/indico.test.uu.se-shibboleth.xml
@@ -103,21 +103,21 @@ acjhlnJDt40YvXKkX07QZm3Ti5EjNpo4xpmj7+U=
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
<md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </md:ContactPerson><md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
<md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
<md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml b/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
index 1d33aa6a..8a2c8ec4 100644
--- a/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
+++ b/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
@@ -42,16 +42,16 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/inslaget-sp" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/inslaget-sp/artifact" index="3"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+
+<md:ContactPerson contactType="administrative">
<md:SurName>Kommunikationsavdelningen</md:SurName>
<md:EmailAddress>mailto:info@kau.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/int-admin.selma7.its.uu.se-shibboleth.sso.xml b/swamid-2.0/int-admin.selma7.its.uu.se-shibboleth.sso.xml
index 89c4e996..2eff6726 100644
--- a/swamid-2.0/int-admin.selma7.its.uu.se-shibboleth.sso.xml
+++ b/swamid-2.0/int-admin.selma7.its.uu.se-shibboleth.sso.xml
@@ -98,26 +98,26 @@ anxX2H7r9sM0hI7ab91KNPMboeQdS+LlJKQZnhBVoknctxcZsO8WTXlZPA==
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
<md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
+ </md:Organization><md:ContactPerson contactType="administrative">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
<md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
<md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/isoffan.sprakochfolkminnen.se.xml b/swamid-2.0/isoffan.sprakochfolkminnen.se.xml
index 7a6c07ad..dc1e4fec 100644
--- a/swamid-2.0/isoffan.sprakochfolkminnen.se.xml
+++ b/swamid-2.0/isoffan.sprakochfolkminnen.se.xml
@@ -58,13 +58,13 @@ DMnPXE0Z/FnZTDRBzUKknOSwHZ7qmWZOQOGYWV49tE+Ho+/SK0x62h/Pviehr4iuSEguDl1teP8=</ds
<md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isoffan.sprakochfolkminnen.se/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Intranät</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Intranät</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://isoffan.sprakochfolkminnen.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:Company>Intranät</md:Company>
<md:EmailAddress>mailto:linn.kierkegaard@sprakochfolkminnen.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml b/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml
index 6afec710..6d490963 100644
--- a/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml
+++ b/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml
@@ -85,15 +85,15 @@ R8goZylfLlaYH0RQyMuClSC5BJlBB7yL58kraKY=
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/SLO/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/SAML2/POST" index="1"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Umeå universitet</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.umu.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Erik</md:GivenName>
<md:SurName>Jonsson</md:SurName>
<md:EmailAddress>mailto:erik.jonsson@umu.se</md:EmailAddress>
<md:TelephoneNumber>+46907869295</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/jenkins.led.ladok.se-securityrealm-finishlogin.xml b/swamid-2.0/jenkins.led.ladok.se-securityrealm-finishlogin.xml
index 08c5d388..e6a14b48 100644
--- a/swamid-2.0/jenkins.led.ladok.se-securityrealm-finishlogin.xml
+++ b/swamid-2.0/jenkins.led.ladok.se-securityrealm-finishlogin.xml
@@ -83,19 +83,19 @@ aeTtz7U=</ds:X509Certificate>
<md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jenkins.led.ladok.se/securityRealm/finishLogin" index="0"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+
+<md:ContactPerson contactType="administrative">
<md:Company>ITS, Umea universitet</md:Company>
<md:SurName>Anders Sigfridsson</md:SurName>
<md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>ITS, Umea universitet</md:Company>
<md:SurName>Anders Sigfridsson</md:SurName>
<md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>ITS, Umea universitet</md:Company>
<md:SurName>Anders Sigfridsson</md:SurName>
<md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml b/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
index 93a6679c..e36d6c59 100644
--- a/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
@@ -97,8 +97,8 @@ LUM1EdYsX8qUyvMYoftcOdiik08=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:SurName>Risto Järvi</md:SurName>
<md:EmailAddress>mailto:risto.jarvi@umu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml b/swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml
index 40a2afbc..901004df 100644
--- a/swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml
+++ b/swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml
@@ -97,25 +97,25 @@ U5AETOMMoTnJdA9/jkaK7+TbmcoHo0DgN2OdtAnZfHwbpvwxCNaGys4nfx+4ghrd
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira.its.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira.its.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
<OrganizationName xml:lang="en">Uppsala University</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Uppsala universitet</Company>
<EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Uppsala universitet</Company>
<EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Uppsala universitet</Company>
<EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
<TelephoneNumber>+46184714400</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml b/swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml
index 52603bd3..8b649670 100644
--- a/swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml
+++ b/swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml
@@ -70,25 +70,25 @@ PTppbqE=</ds:X509Certificate>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://juridicum.blackboard.com/auth-saml/saml/SSO" index="0" isDefault="true"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://juridicum.blackboard.com/auth-saml/saml/SSO" index="1"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">LU</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.lu.se/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
+ </md:Organization><md:ContactPerson contactType="administrative">
<md:Company>Lund University</md:Company>
<md:SurName>Stefan Bengtsson</md:SurName>
<md:EmailAddress>mailto:stefan.bengtsson@jur.lu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>Lund University</md:Company>
<md:SurName>Stefan Bengtsson</md:SurName>
<md:EmailAddress>mailto:stefan.bengtsson@jur.lu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>Lund University</md:Company>
<md:SurName>Stefan Bengtsson</md:SurName>
<md:EmailAddress>mailto:stefan.bengtsson@jur.lu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml b/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
index aae8ba64..a5249d81 100644
--- a/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
+++ b/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
@@ -85,17 +85,17 @@ vwUCgOYar5qF3huByMQmNfVFXoU6UDElCkeX
<ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas-idp-test.swamid.se/Saml2/acs/post" index="1"/>
<ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saas-idp-test.swamid.se/Saml2/acs/redirect" index="2"/>
</ns0:SPSSODescriptor>
- <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+<ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
<ns0:OrganizationName xml:lang="en">SUNET Play</ns0:OrganizationName>
<ns0:OrganizationDisplayName xml:lang="en">SUNET Play</ns0:OrganizationDisplayName>
<ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
- </ns0:Organization>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<ns0:GivenName>Technical</ns0:GivenName>
<ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
- </ns0:ContactPerson>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<ns0:GivenName>Support</ns0:GivenName>
<ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
- </ns0:ContactPerson>
-</md:EntityDescriptor>
+ </ns0:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml b/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
index 3f0a19c1..d68924a5 100644
--- a/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
+++ b/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
@@ -59,13 +59,13 @@ PMS4rjAWc41dsrr8CuH3t/NKbvDc9Rn6U+qLGttLcJ1Jlpw2i3fPGGJ+osSsX9+h3KUdLv9j7zJB
<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://kantarainitiative.org/confluence/plugins/servlet/samlsso" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Kantara Initiative Inc</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Kantara Initiative Inc</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://kantarainitiative.org</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:SurName>Kantara Initiative</md:SurName>
<md:EmailAddress>mailto:info@kantarainitiative.org</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/kauplay.kau.se.xml b/swamid-2.0/kauplay.kau.se.xml
index 9f684e48..b5fa3465 100644
--- a/swamid-2.0/kauplay.kau.se.xml
+++ b/swamid-2.0/kauplay.kau.se.xml
@@ -38,23 +38,23 @@
<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://kauplay.kau.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
<md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.kau.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:SurName>IT department</md:SurName>
<md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:SurName>Kenneth Boström</md:SurName>
<md:EmailAddress>mailto:av@kau.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
+ </md:ContactPerson><md:ContactPerson contactType="administrative">
<md:SurName>Monika Allöv Andersson</md:SurName>
<md:EmailAddress>mailto:av@kau.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/kb-se.zoom.us.xml b/swamid-2.0/kb-se.zoom.us.xml
index dff401c8..7c92620b 100644
--- a/swamid-2.0/kb-se.zoom.us.xml
+++ b/swamid-2.0/kb-se.zoom.us.xml
@@ -103,8 +103,8 @@ qoBVRu5DVnqs1dZZiZdHqRt3Tt22k0sDdvtQWnVISyGVqqSzPxq8YrLDVTA380eaXiYDbxoO1SN+
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kb-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kb-se.zoom.us/saml/SSO" index="1"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:SurName>Daniel Jakobsson</md:SurName>
<md:EmailAddress>mailto:daniel.jakobsson@kb.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml b/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
index 22238a33..09e795e6 100644
--- a/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
@@ -53,15 +53,15 @@ wXXiBDXS3PNHXQnnpys=
<md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">NORDUNet</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:Company>NORDUnet</md:Company>
<md:GivenName>Leif</md:GivenName>
<md:SurName>Johansson</md:SurName>
<md:EmailAddress>mailto:leifj@nordu.net</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
index da366ce7..3ee4d642 100644
--- a/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
+++ b/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
@@ -85,13 +85,13 @@
<md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">SUNET Cloud Services</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>Technical Support (SafeSpring)</md:SurName>
<md:EmailAddress>mailto:iaas@cloud.ipnett.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml b/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
index 7372ad9a..f5c6380e 100644
--- a/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
+++ b/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
@@ -35,21 +35,21 @@
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Ex Libris (Germany)</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Ex Libris (Germany)</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.exlibrisgroup.com</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </md:Organization><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<SurName>Caroline Myrberg</SurName>
<EmailAddress>mailto:caroline.myrberg@ki.se</EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<SurName>Frank Bieber</SurName>
<EmailAddress>mailto:frank.bieber@exlibrisgroup.com</EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<SurName>Frank Bieber</SurName>
<EmailAddress>mailto:frank.bieber@exlibrisgroup.com</EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/konto-test.test.hb.se-shibboleth.xml b/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
index f6a64bde..28df3001 100644
--- a/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
+++ b/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
@@ -131,22 +131,22 @@ jdkRrWzWFJhSCRj04tS0Oyw=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+
+
+
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>University of Borås</Company>
<SurName>IT</SurName>
<EmailAddress>mailto:it@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>University of Borås</Company>
<SurName>IT</SurName>
<EmailAddress>mailto:it@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>University of Borås</Company>
<SurName>IT</SurName>
<EmailAddress>mailto:it@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
index 6a86ffd2..942e0ecc 100644
--- a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
@@ -97,19 +97,19 @@ vqX2O1UUS1leSB8AnvrsfuoKlZQQKgsrokXQTEo=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+
+<md:ContactPerson contactType="administrative">
<md:Company>ITS, Umea universitet</md:Company>
<md:SurName>Fredrik Domeij</md:SurName>
<md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>ITS, Umea universitet</md:Company>
<md:SurName>Fredrik Domeij</md:SurName>
<md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>ITS, Umea universitet</md:Company>
<md:SurName>Fredrik Domeij</md:SurName>
<md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3.its.umu.se-user-idp.xml b/swamid-2.0/ladok3.its.umu.se-user-idp.xml
index 232371f0..40e0f4ad 100644
--- a/swamid-2.0/ladok3.its.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3.its.umu.se-user-idp.xml
@@ -5,7 +5,7 @@
<mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.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">
+ <IDPSSODescriptor errorURL="https://ladok3.its.umu.se/errorURL/ERRORURL_CODE.php?ERRORURL_TS&amp;rp=ERRORURL_RP&amp;tid=ERRORURL_TID&amp;ctx=ERRORURL_CTX" 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 regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
</Extensions>
diff --git a/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml b/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
index f7055a33..cf6e9227 100644
--- a/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
+++ b/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
@@ -122,16 +122,16 @@ dl48KQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+
+<md:ContactPerson contactType="administrative">
<md:SurName>Hans Nielsen</md:SurName>
<md:EmailAddress>mailto:hans.nielsen@med.lu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:SurName>Hans Nielsen</md:SurName>
<md:EmailAddress>mailto:hans.nielsen@med.lu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:SurName>Rikard Johansson</md:SurName>
<md:EmailAddress>mailto:rikard.johansson@med.lu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml b/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml
index fb988871..50383956 100644
--- a/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml
+++ b/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml
@@ -119,7 +119,7 @@ lmNgza+oGPGkyvuOaiCHWwyRsT9UmlVUOgZK1z5rZVSSSJiR7tRdYrE=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lartorget.sll.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lartorget.sll.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="support">
+
+<md:ContactPerson contactType="support">
<md:EmailAddress>mailto:lartorget.hsf@sll.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login-dev.du.se-idp-shibboleth.xml b/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
index f0f7e2c3..ca04563f 100644
--- a/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
+++ b/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
@@ -79,13 +79,13 @@ xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=
<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">
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">du.se</OrganizationName>
<OrganizationDisplayName xml:lang="en">Högskolan Dalarna (Dev)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.du.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Högskolan Dalarna</Company>
<EmailAddress>mailto:dempa@du.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
index 55ecb1c8..47205909 100644
--- a/swamid-2.0/login.idp.eduid.se-idp.xml.xml
+++ b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
@@ -95,27 +95,27 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
<ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/sso/redirect"/>
<ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/sso/post"/>
</ns0:IDPSSODescriptor>
- <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
<ns0:OrganizationName xml:lang="en">Sunet</ns0:OrganizationName>
<ns0:OrganizationName xml:lang="sv">Sunet</ns0:OrganizationName>
<ns0:OrganizationDisplayName xml:lang="en">eduID Sweden</ns0:OrganizationDisplayName>
<ns0:OrganizationDisplayName xml:lang="sv">eduID Sverige</ns0:OrganizationDisplayName>
<ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
- </ns0:Organization>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<ns0:Company>eduID</ns0:Company>
<ns0:SurName>Valter Nordh</ns0:SurName>
<ns0:EmailAddress>mailto:valter@sunet.se</ns0:EmailAddress>
<ns0:TelephoneNumber>+46707884742</ns0:TelephoneNumber>
- </ns0:ContactPerson>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<ns0:Company>eduID</ns0:Company>
<ns0:SurName>SUNET eduID team</ns0:SurName>
<ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
- </ns0:ContactPerson>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<ns0:Company>eduID</ns0:Company>
<ns0:SurName>eduID Support</ns0:SurName>
<ns0:EmailAddress>mailto:support@eduid.se</ns0:EmailAddress>
- </ns0:ContactPerson>
-</md:EntityDescriptor>
+ </ns0:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login.ifmsa.se-spp.xml b/swamid-2.0/login.ifmsa.se-spp.xml
index a37f2548..8f454163 100644
--- a/swamid-2.0/login.ifmsa.se-spp.xml
+++ b/swamid-2.0/login.ifmsa.se-spp.xml
@@ -32,15 +32,15 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ifmsa.se/spp/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://login.ifmsa.se/spp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">IFMSA-Sweden</md:OrganizationName>
<md:OrganizationName xml:lang="sv">IFMSA-Sweden</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">IFMSA-Sweden</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="sv">IFMSA-Sweden</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">www.ifmsa.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Admin</md:GivenName>
<md:EmailAddress>mailto:admin@ifmsa.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login1.fhs.se-adfs-services-trust.xml b/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
index 1a801a4c..afefe2d0 100644
--- a/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
@@ -66,30 +66,30 @@
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login1.fhs.se/adfs/ls/"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login1.fhs.se/adfs/ls/"/>
</IDPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="sv">Försvarshögskolan</OrganizationName>
<OrganizationName xml:lang="en">Swedish Defence University</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Försvarshögskolan</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Swedish Defence University</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://www.fhs.se/</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.fhs.se/en</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Swedish Defence University</Company>
<SurName>FHS IT Helpdesk</SurName>
<EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
<TelephoneNumber>+46 8 55342545</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Swedish Defence University</Company>
<SurName>FHS IT Helpdesk</SurName>
<EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
<TelephoneNumber>+46 8 55342545</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Swedish Defence University</Company>
<SurName>FHS IT Helpdesk</SurName>
<EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
<TelephoneNumber>+46 8 55342545</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml b/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
index d71d2df4..bccecd0f 100644
--- a/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
+++ b/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
@@ -81,9 +81,9 @@ uuNxKggJPJhRph8bitha6sR6EQ==</ds:X509Certificate>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://ludicris.lub.lu.se/admin/saml/SSO/alias/pure" index="0"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://ludicris.lub.lu.se/admin/saml/SSO/alias/pure" index="1" isDefault="true"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>David</md:GivenName>
<md:SurName>Holoshka</md:SurName>
<md:EmailAddress>mailto:david.holoshka@ub.lu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ludwig.lub.lu.se-sp.xml b/swamid-2.0/ludwig.lub.lu.se-sp.xml
index 2da5a5f8..077d07ec 100644
--- a/swamid-2.0/ludwig.lub.lu.se-sp.xml
+++ b/swamid-2.0/ludwig.lub.lu.se-sp.xml
@@ -56,9 +56,9 @@ HlE3GhfD6xYLE1DVbCmqzrnz4epcjc/5w0zd67HEJ0FTBxGGQvsExlvaA37vCKUZ
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML/POST" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML/Artifact" index="4"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Dave</md:GivenName>
<md:SurName>Sherohman</md:SurName>
<md:EmailAddress>mailto:Dave.Sherohman@ub.lu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/luvit.education.lu.se-shibboleth.xml b/swamid-2.0/luvit.education.lu.se-shibboleth.xml
index 4c389120..2d417f3e 100644
--- a/swamid-2.0/luvit.education.lu.se-shibboleth.xml
+++ b/swamid-2.0/luvit.education.lu.se-shibboleth.xml
@@ -87,14 +87,14 @@ OTMXxdAawBca6aO1CpUMAwipgLVKJyNkmxV7+aPSdkp/U466LROEWhraZg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://luvit.education.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://luvit.education.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+<md:ContactPerson contactType="administrative">
<md:GivenName>Sidika</md:GivenName>
<md:SurName>Basic</md:SurName>
<md:EmailAddress>mailto:sidika.basic@ahu.lu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:GivenName>Peter</md:GivenName>
<md:SurName>Nilsson</md:SurName>
<md:EmailAddress>mailto:peter.nilsson@grade.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/maps.slu.se-shibboleth.xml b/swamid-2.0/maps.slu.se-shibboleth.xml
index 5e7a29f9..3ecb4179 100644
--- a/swamid-2.0/maps.slu.se-shibboleth.xml
+++ b/swamid-2.0/maps.slu.se-shibboleth.xml
@@ -59,14 +59,14 @@ QM0LY0RQjVj4+R+UdaRYQfizHG1rnKcEiRzi/mXYt2YXSjKuyvNUn6uc1GY9/3aJ
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://maps.slu.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://maps.slu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+<md:ContactPerson contactType="administrative">
<md:GivenName>Mats</md:GivenName>
<md:SurName>Högström</md:SurName>
<md:EmailAddress>mailto:mats.hogstrom@slu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:GivenName>Johan</md:GivenName>
<md:SurName>Fransson</md:SurName>
<md:EmailAddress>mailto:johan.fransson@slu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.disk.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.disk.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 6020814e..0f197298 100644
--- a/swamid-2.0/medlem.disk.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.disk.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -41,9 +41,9 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.disk.su.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://medlem.disk.su.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="4"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Johan</md:GivenName>
<md:SurName>Sölve</md:SurName>
<md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 152cf46e..04739456 100644
--- a/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -40,9 +40,9 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.gotastudentkar.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.gotastudentkar.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Johan</md:GivenName>
<md:SurName>Sölve</md:SurName>
<md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/meta.eduroam.se.xml b/swamid-2.0/meta.eduroam.se.xml
index eaa4c28a..56f2e6d0 100644
--- a/swamid-2.0/meta.eduroam.se.xml
+++ b/swamid-2.0/meta.eduroam.se.xml
@@ -81,14 +81,14 @@ n1KiEHawTUUJfngoFN0QtwwvnExeTkUoAOa6ZYr5BscvnB9xKgaDgw==
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/POST" index="1"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Paul</md:GivenName>
<md:SurName>Scott</md:SurName>
<md:EmailAddress>mailto:paul.scott@kau.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
+ </md:ContactPerson><md:ContactPerson contactType="administrative">
<md:GivenName>Anders</md:GivenName>
<md:SurName>Nilsson</md:SurName>
<md:EmailAddress>mailto:anders.nilsson@umu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
index da370f89..78a56b1a 100644
--- a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
@@ -69,8 +69,8 @@ snJSQ/YlB4ldg4xiZo0aKDvUVZqlhkCcwEKNcNrwiXxMtkx0ekUmiHv5SA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/moodle.lhs.se-shibboleth.xml b/swamid-2.0/moodle.lhs.se-shibboleth.xml
index 253e4062..8616eb57 100644
--- a/swamid-2.0/moodle.lhs.se-shibboleth.xml
+++ b/swamid-2.0/moodle.lhs.se-shibboleth.xml
@@ -39,14 +39,14 @@ t7tgUUB+rUENHrqryPN6AJ6QZR6UIWE6J6biQJVmXQldKGrGrMEnRecGyokj9kqi</ds:X509Certifi
</KeyDescriptor>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.lhs.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
</SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">SU</OrganizationName>
<OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Stockholm university</Company>
<SurName>helpdesk</SurName>
<EmailAddress>mailto:helpdesk@it.su.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/moodle.media.nordu.net.xml b/swamid-2.0/moodle.media.nordu.net.xml
index 1b3dacf9..1d4ba0f7 100644
--- a/swamid-2.0/moodle.media.nordu.net.xml
+++ b/swamid-2.0/moodle.media.nordu.net.xml
@@ -60,14 +60,14 @@
<md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">NORDUnet A/S</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.nordu.net/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>NORDUnet</md:GivenName>
<md:SurName>Media</md:SurName>
<md:EmailAddress>mailto:support@media.nordu.net</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml b/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml
index 178d1cc1..9146bd6a 100644
--- a/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml
+++ b/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml
@@ -89,9 +89,9 @@ IPtsyyR5LVUuRnyvOaw=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Peter</md:GivenName>
<md:SurName>Möller</md:SurName>
<md:EmailAddress>mailto:peter.moller@cs.lth.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 621a6443..06bffe48 100644
--- a/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -40,8 +40,8 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moria.sai.kau.se/simplesaml/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://moria.sai.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>IT-Avdelningen</md:GivenName>
<md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml b/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml
index 25c993f5..8760898e 100644
--- a/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml
+++ b/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml
@@ -46,28 +46,28 @@ tK5eKJ70Qsj0YizWe90n9K+VGOryORdurTNkxJNVHxSvPZRuFQ==
<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://pingpong.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Borås University</md:OrganizationName>
<md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Borås University</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.hb.se/en/</md:OrganizationURL>
<md:OrganizationURL xml:lang="sv">https://www.hb.se/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:EmailAddress>mailto:pingpong@hb.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>Ping Pong AB</md:Company>
<md:GivenName>Palle</md:GivenName>
<md:SurName>Girgensohn</md:SurName>
<md:EmailAddress>mailto:girgen@pingpong.se</md:EmailAddress>
<md:TelephoneNumber>+46856628000</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="other">
+ </md:ContactPerson><md:ContactPerson contactType="other">
<md:Company>Högskolan i Borås</md:Company>
<md:SurName>IT</md:SurName>
<md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
<md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.bth.se.xml b/swamid-2.0/play.bth.se.xml
index 314142fa..32a7da9d 100644
--- a/swamid-2.0/play.bth.se.xml
+++ b/swamid-2.0/play.bth.se.xml
@@ -37,32 +37,32 @@
<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://play.bth.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">BTH</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Blekinge Institute of Technology</Company>
<SurName>IT Helpdesk</SurName>
<EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Blekinge Institute of Technology</Company>
<SurName>IT Helpdesk</SurName>
<EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Blekinge Institute of Technology</Company>
<SurName>IT Helpdesk</SurName>
<EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 381500</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<GivenName>Security Response Team</GivenName>
<EmailAddress>mailto:abuse@bth.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.chalmers.se.xml b/swamid-2.0/play.chalmers.se.xml
index 4ee8248a..ca0d89b1 100644
--- a/swamid-2.0/play.chalmers.se.xml
+++ b/swamid-2.0/play.chalmers.se.xml
@@ -39,13 +39,13 @@
<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://play.chalmers.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Chalmers (PROD)</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Chalmers (PROD)</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://play.chalmers.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.education.lu.se-shibboleth.xml b/swamid-2.0/play.education.lu.se-shibboleth.xml
index 93a6a796..9bcfc87c 100644
--- a/swamid-2.0/play.education.lu.se-shibboleth.xml
+++ b/swamid-2.0/play.education.lu.se-shibboleth.xml
@@ -39,13 +39,13 @@
<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://play.education.lu.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Lunds universitet</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://play.education.lu.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.fhs.se.xml b/swamid-2.0/play.fhs.se.xml
index 94cceb03..af5324f0 100644
--- a/swamid-2.0/play.fhs.se.xml
+++ b/swamid-2.0/play.fhs.se.xml
@@ -39,23 +39,23 @@
<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://play.fhs.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Försvarshögskolan</md:OrganizationName>
<md:OrganizationName xml:lang="sv">Försvarshögskolan</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Försvarshögskolan</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="sv">Försvarshögskolan</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.fhs.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
+ </md:Organization><md:ContactPerson contactType="administrative">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:lms@fhs.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:lms@fhs.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:helpdesk@fhs.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.hb.se.xml b/swamid-2.0/play.hb.se.xml
index c5710090..aeb0d541 100644
--- a/swamid-2.0/play.hb.se.xml
+++ b/swamid-2.0/play.hb.se.xml
@@ -39,24 +39,24 @@
<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://play.hb.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
<md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.hb.se/en</md:OrganizationURL>
<md:OrganizationURL xml:lang="sv">https://www.hb.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:SurName>IT</md:SurName>
<md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
+ </md:ContactPerson><md:ContactPerson contactType="administrative">
<md:SurName>IT</md:SurName>
<md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:SurName>IT</md:SurName>
<md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.hhs.se.xml b/swamid-2.0/play.hhs.se.xml
index 83be61b6..6b85ec47 100644
--- a/swamid-2.0/play.hhs.se.xml
+++ b/swamid-2.0/play.hhs.se.xml
@@ -39,24 +39,24 @@
<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://play.hhs.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Stockholm School of Economics</md:OrganizationName>
<md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.hhs.se/en</md:OrganizationURL>
<md:OrganizationURL xml:lang="sv">https://www.hhs.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
+ </md:Organization><md:ContactPerson contactType="administrative">
<md:SurName>Pär Mårtensson</md:SurName>
<md:EmailAddress>mailto:par.martensson@hhs.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:SurName>Richard Wester</md:SurName>
<md:EmailAddress>mailto:richard.wester@exedsse.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:SurName>IMG_PLAY</md:SurName>
<md:EmailAddress>mailto:support@imgplay.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.hkr.se.xml b/swamid-2.0/play.hkr.se.xml
index a89eb2ba..2eb242bd 100644
--- a/swamid-2.0/play.hkr.se.xml
+++ b/swamid-2.0/play.hkr.se.xml
@@ -39,24 +39,24 @@
<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://play.hkr.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="sv">Högskolan Kristianstad</md:OrganizationName>
<md:OrganizationName xml:lang="en">University of Kristianstad</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">University of Kristianstad</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="sv">https://www.hkr.se</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">https://www.hkr.se/en</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
+ </md:ContactPerson><md:ContactPerson contactType="administrative">
<md:SurName>Dan Wirdefalk</md:SurName>
<md:EmailAddress>mailto:dan.wirdefalk@hkr.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.hv.se.xml b/swamid-2.0/play.hv.se.xml
index 5b632668..514ed69e 100644
--- a/swamid-2.0/play.hv.se.xml
+++ b/swamid-2.0/play.hv.se.xml
@@ -39,13 +39,13 @@
<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://play.hv.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">HV Play </md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">HV Play</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://play.hv.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.mau.se.xml b/swamid-2.0/play.mau.se.xml
index b62a4cce..9c405ceb 100644
--- a/swamid-2.0/play.mau.se.xml
+++ b/swamid-2.0/play.mau.se.xml
@@ -37,14 +37,14 @@
<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://play.mau.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Mau play</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Mau play</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://play.mau.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>NORDUnet</md:GivenName>
<md:SurName>SAML Admin</md:SurName>
<md:EmailAddress>mailto:saml@media.nordu.net</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.miun.se.xml b/swamid-2.0/play.miun.se.xml
index 693f4c71..319917aa 100644
--- a/swamid-2.0/play.miun.se.xml
+++ b/swamid-2.0/play.miun.se.xml
@@ -42,13 +42,13 @@
<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://play.miun.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Mittuniversitetet (PROD)</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Mittuniversitetet (PROD)</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://play.miun.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.oru.se.xml b/swamid-2.0/play.oru.se.xml
index c452100a..a8406b88 100644
--- a/swamid-2.0/play.oru.se.xml
+++ b/swamid-2.0/play.oru.se.xml
@@ -39,13 +39,13 @@
<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://play.oru.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">ORU Play</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">ORU Play</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://play.oru.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.rkh.se.xml b/swamid-2.0/play.rkh.se.xml
index a317fb48..78d7b926 100644
--- a/swamid-2.0/play.rkh.se.xml
+++ b/swamid-2.0/play.rkh.se.xml
@@ -39,13 +39,13 @@
<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://play.rkh.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Röda Korsets Högskola</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Röda Korsets Högskola</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://play.rkh.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.sh.se.xml b/swamid-2.0/play.sh.se.xml
index 2dbacdcb..e7b9baa9 100644
--- a/swamid-2.0/play.sh.se.xml
+++ b/swamid-2.0/play.sh.se.xml
@@ -39,18 +39,18 @@
<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://play.sh.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Södertörns högskola</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Södertörns högskola</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.sh.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
+ </md:Organization><md:ContactPerson contactType="administrative">
<md:EmailAddress>mailto:webbforvaltning@sh.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:EmailAddress>mailto:webbforvaltning@sh.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:EmailAddress>mailto:webbforvaltning@sh.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.shh.se.xml b/swamid-2.0/play.shh.se.xml
index 9e0fa6a8..5337fd9b 100644
--- a/swamid-2.0/play.shh.se.xml
+++ b/swamid-2.0/play.shh.se.xml
@@ -39,14 +39,14 @@
<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://play.shh.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Sophiahemmet Högskola</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Sophiahemmet Högskola</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://play.shh.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>NORDUnet</md:GivenName>
<md:SurName>SAML Admin</md:SurName>
<md:EmailAddress>mailto:saml@media.nordu.net</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.sunet.se.xml b/swamid-2.0/play.sunet.se.xml
index a3c87c40..3e1e746b 100644
--- a/swamid-2.0/play.sunet.se.xml
+++ b/swamid-2.0/play.sunet.se.xml
@@ -39,22 +39,22 @@
<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://play.sunet.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
<md:OrganizationName xml:lang="sv">SUNET</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">SUNET</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
+ </md:Organization><md:ContactPerson contactType="administrative">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:media@sunet.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:media@sunet.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:media@sunet.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.test.umu.se.xml b/swamid-2.0/play.test.umu.se.xml
index 2cf0c49b..ba6b6763 100644
--- a/swamid-2.0/play.test.umu.se.xml
+++ b/swamid-2.0/play.test.umu.se.xml
@@ -39,13 +39,13 @@
<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://play.test.umu.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Umeå universitet (TEST)</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Umeå universitet (TEST)</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://play.test.umu.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 15ee5251..5e56bdd0 100644
--- a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -49,9 +49,9 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="4"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Johan</md:GivenName>
<md:SurName>Sölve</md:SurName>
<md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/primula.mah.se-shibboleth.xml b/swamid-2.0/primula.mah.se-shibboleth.xml
index cd8cc51e..a8e29915 100644
--- a/swamid-2.0/primula.mah.se-shibboleth.xml
+++ b/swamid-2.0/primula.mah.se-shibboleth.xml
@@ -65,14 +65,14 @@ r4tfM1hij14r1PrjpJUPif6LEWVzjs23O6VQoKe7oEXlBwFRfw==
<md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:GivenName>Primula</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/prisma.research.se-shibboleth.xml b/swamid-2.0/prisma.research.se-shibboleth.xml
index ede7cbc7..c6d7d9ba 100644
--- a/swamid-2.0/prisma.research.se-shibboleth.xml
+++ b/swamid-2.0/prisma.research.se-shibboleth.xml
@@ -95,19 +95,19 @@ Yw==
<md:RequestedAttribute FriendlyName="eppn" 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" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Prisma - prisma.research.se</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Prisma - prisma.research.se</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://prisma.research.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
+ </md:Organization><md:ContactPerson contactType="administrative">
<md:GivenName>Peter</md:GivenName>
<md:SurName>Borg</md:SurName>
<md:EmailAddress>mailto:peter.borg@vr.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:GivenName>Robert</md:GivenName>
<md:SurName>Chrudina</md:SurName>
<md:EmailAddress>mailto:robert.chrudina@tieto.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml b/swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml
index 352d9bb8..89757135 100644
--- a/swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml
+++ b/swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml
@@ -77,14 +77,14 @@ ozpzY2SFlw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">The RA21 Project</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Resource Access for the 21st Century (RA21)</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://ra21.org</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>SWAMID</md:GivenName>
<md:SurName>Operations</md:SurName>
<md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml b/swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml
index b9dc64c3..1fc4c992 100644
--- a/swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml
@@ -99,9 +99,9 @@ ryntMn54coBlF2Vqrm4Fa2XUyUIkurCv3FZtdN5W
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubtestnew.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pubtestnew.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+<md:ContactPerson contactType="administrative">
<md:GivenName>KIB-IT</md:GivenName>
<md:SurName>IT Helpdesk</md:SurName>
<md:EmailAddress>mailto:itsupport@kib.ki.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/redcap.ki.se-shibboleth.xml b/swamid-2.0/redcap.ki.se-shibboleth.xml
index b0ccf4f5..9659175d 100644
--- a/swamid-2.0/redcap.ki.se-shibboleth.xml
+++ b/swamid-2.0/redcap.ki.se-shibboleth.xml
@@ -90,9 +90,9 @@ DOBgIJcDatI=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://redcap.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.ki.se/Shibboleth.sso/SAML2/POST" index="7"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+<md:ContactPerson contactType="administrative">
<md:GivenName>Michal</md:GivenName>
<md:SurName>Kment</md:SurName>
<md:EmailAddress>mailto:michal.kment@ki.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/registry.swamid.se-saml2-metadata.xml b/swamid-2.0/registry.swamid.se-saml2-metadata.xml
index 94b63b60..4a618853 100644
--- a/swamid-2.0/registry.swamid.se-saml2-metadata.xml
+++ b/swamid-2.0/registry.swamid.se-saml2-metadata.xml
@@ -54,24 +54,24 @@ jkl44jhVvXLSythVxryo/Mf7b8QbicsObxpxFMb9ifVbWyi5ri0WLgvQAXpyw/MH
<md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
<md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">SWAMID</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">SWAMID</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:Company>SWAMID</md:Company>
<md:GivenName>Anders</md:GivenName>
<md:SurName>Lordal</md:SurName>
<md:EmailAddress>mailto:anders.lordal@hig.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
+ </md:ContactPerson><md:ContactPerson contactType="administrative">
<md:Company>SWAMID</md:Company>
<md:GivenName>Anders</md:GivenName>
<md:SurName>Lordal</md:SurName>
<md:EmailAddress>mailto:anders.lordal@hig.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml b/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
index 208d10a4..8c373d50 100644
--- a/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
+++ b/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
@@ -45,17 +45,17 @@ zJkE6G+EYWU=
<ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://s2s.ifmsa.se/Saml2/acs/post" index="1"/>
<ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://s2s.ifmsa.se/Saml2/acs/redirect" index="2"/>
</ns0:SPSSODescriptor>
- <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+<ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
<ns0:OrganizationName xml:lang="en">IFMSA-Sweden</ns0:OrganizationName>
<ns0:OrganizationDisplayName xml:lang="en">IFMSA-Sweden</ns0:OrganizationDisplayName>
<ns0:OrganizationURL xml:lang="en">https://www.ifmsa.se</ns0:OrganizationURL>
- </ns0:Organization>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<ns0:GivenName>Admin</ns0:GivenName>
<ns0:EmailAddress>mailto:admin@ifmsa.se</ns0:EmailAddress>
- </ns0:ContactPerson>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<ns0:GivenName>Admin</ns0:GivenName>
<ns0:EmailAddress>mailto:admin@ifmsa.se</ns0:EmailAddress>
- </ns0:ContactPerson>
-</md:EntityDescriptor>
+ </ns0:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sam.control.lth.se-shibboleth.xml b/swamid-2.0/sam.control.lth.se-shibboleth.xml
index a7eb9287..dd480055 100644
--- a/swamid-2.0/sam.control.lth.se-shibboleth.xml
+++ b/swamid-2.0/sam.control.lth.se-shibboleth.xml
@@ -94,9 +94,9 @@ R83DjysdqOkJezZxfXnsgdhDpyo=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sam.control.lth.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sam.control.lth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Anders</md:GivenName>
<md:SurName>Nilsson</md:SurName>
<md:EmailAddress>mailto:anders.nilsson@control.lth.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/scalear-staging2.herokuapp.com.xml b/swamid-2.0/scalear-staging2.herokuapp.com.xml
index c51dc79c..26a05b81 100644
--- a/swamid-2.0/scalear-staging2.herokuapp.com.xml
+++ b/swamid-2.0/scalear-staging2.herokuapp.com.xml
@@ -69,22 +69,22 @@ B2dCYBmx
<md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://scalear-staging2.herokuapp.com</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </md:Organization><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>ScalableLearning</Company>
<EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>ScalableLearning</Company>
<EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<Company>ScalableLearning</Company>
<GivenName>Security Response Team</GivenName>
<EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-bth-stud.xml b/swamid-2.0/se.timeedit.net-bth-stud.xml
index 641aee6d..d07c07dc 100644
--- a/swamid-2.0/se.timeedit.net-bth-stud.xml
+++ b/swamid-2.0/se.timeedit.net-bth-stud.xml
@@ -41,14 +41,14 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
<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" isDefault="false" index="0" Location="https://cloud.timeedit.net/bth/web/timeedit/ssoResponse/bth_saml2_stud"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="sv">TimeEdit AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">TimeEdit AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="sv">http://www.timeedit.com/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>TimeEdit</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:support@timeedit.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-chalmers-sp.xml b/swamid-2.0/se.timeedit.net-chalmers-sp.xml
index e6813d7b..cf1f6454 100644
--- a/swamid-2.0/se.timeedit.net-chalmers-sp.xml
+++ b/swamid-2.0/se.timeedit.net-chalmers-sp.xml
@@ -40,9 +40,9 @@ GImnaeS4</ds:X509Certificate>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
<md:AssertionConsumerService index="0" isDefault="false" Location="https://cloud.timeedit.net/chalmers/web/timeedit/ssoResponse/saml2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>TimeEdit</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-fhs-staff.xml b/swamid-2.0/se.timeedit.net-fhs-staff.xml
index 74c36758..e6b04a97 100644
--- a/swamid-2.0/se.timeedit.net-fhs-staff.xml
+++ b/swamid-2.0/se.timeedit.net-fhs-staff.xml
@@ -41,9 +41,9 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
<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" isDefault="false" index="0" Location="https://cloud.timeedit.net/fhs_se/web/timeedit/ssoResponse/saml2-staff"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>TimeEdit</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-kau-student-sp.xml b/swamid-2.0/se.timeedit.net-kau-student-sp.xml
index 5c04d82d..b142f455 100644
--- a/swamid-2.0/se.timeedit.net-kau-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-kau-student-sp.xml
@@ -47,13 +47,13 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
<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" isDefault="false" index="0" Location="https://cloud.timeedit.net/kau/web/timeedit/ssoResponse/student_saml2"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+
+<md:ContactPerson contactType="technical">
<md:GivenName>TimeEdit</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-lu-general-sp.xml b/swamid-2.0/se.timeedit.net-lu-general-sp.xml
index e288c8e5..1aa9ec38 100644
--- a/swamid-2.0/se.timeedit.net-lu-general-sp.xml
+++ b/swamid-2.0/se.timeedit.net-lu-general-sp.xml
@@ -47,14 +47,14 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
<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" isDefault="false" index="0" Location="https://cloud.timeedit.net/lu/web/timeedit/ssoResponse/lu_generic_saml2"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+
+<md:ContactPerson contactType="technical">
<md:GivenName>TimeEdit</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
+ </md:ContactPerson><md:ContactPerson contactType="administrative">
<md:GivenName>Rikard</md:GivenName>
<md:SurName>Stymne</md:SurName>
<md:EmailAddress>mailto:rikard.stymne@ht.lu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-su-employee-sp.xml b/swamid-2.0/se.timeedit.net-su-employee-sp.xml
index 17158838..95aa4211 100644
--- a/swamid-2.0/se.timeedit.net-su-employee-sp.xml
+++ b/swamid-2.0/se.timeedit.net-su-employee-sp.xml
@@ -40,9 +40,9 @@ GImnaeS4</ds:X509Certificate>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
<md:AssertionConsumerService index="0" isDefault="false" Location="https://cloud.timeedit.net/su/web/timeedit/ssoResponse/su_anst_saml2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>TimeEdit</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-umu-student-sp.xml b/swamid-2.0/se.timeedit.net-umu-student-sp.xml
index 34fcf74c..a6d45264 100644
--- a/swamid-2.0/se.timeedit.net-umu-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-umu-student-sp.xml
@@ -46,9 +46,9 @@ GImnaeS4</ds:X509Certificate>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
<md:AssertionConsumerService index="0" isDefault="false" Location="https://cloud.timeedit.net/umu/web/timeedit/ssoResponse/umu_stud_saml2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>TimeEdit</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
index 75afb809..7703c1d4 100644
--- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
+++ b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
@@ -46,9 +46,9 @@ GImnaeS4</ds:X509Certificate>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
<md:AssertionConsumerService index="0" isDefault="false" Location="https://cloud.timeedit.net/lnu/web/timeedit/ssoResponse/lnu_stud_saml2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>TimeEdit</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/selfservice.hb.se-shibboleth.xml b/swamid-2.0/selfservice.hb.se-shibboleth.xml
index d7b4f188..c91ce561 100644
--- a/swamid-2.0/selfservice.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice.hb.se-shibboleth.xml
@@ -129,22 +129,22 @@ toA=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://selfservice.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://selfservice.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+
+
+
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>University of Borås</Company>
<SurName>IT</SurName>
<EmailAddress>mailto:it@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>University of Borås</Company>
<SurName>IT</SurName>
<EmailAddress>mailto:it@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>University of Borås</Company>
<SurName>IT</SurName>
<EmailAddress>mailto:it@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/service.projectplace.com-saml-metadata.xml b/swamid-2.0/service.projectplace.com-saml-metadata.xml
index 972940e8..1a824d40 100644
--- a/swamid-2.0/service.projectplace.com-saml-metadata.xml
+++ b/swamid-2.0/service.projectplace.com-saml-metadata.xml
@@ -41,15 +41,15 @@ qn0pH3p8ik4RiHD3Od8k9acHCj/dO4PyTbAjgYuUS23yUBbJOmow6eje/HNpQs9E
</md:KeyDescriptor>
<md:AssertionConsumerService index="0" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://service.projectplace.com/saml/login" isDefault="true"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Projectplace International AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Projectplace International AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.projectplace.com/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:EmailAddress>mailto:support@projectplace.com</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:EmailAddress>mailto:saml@projectplace.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sesam.uu.se-shibboleth.xml b/swamid-2.0/sesam.uu.se-shibboleth.xml
index 0dc4e560..c9a9dd21 100644
--- a/swamid-2.0/sesam.uu.se-shibboleth.xml
+++ b/swamid-2.0/sesam.uu.se-shibboleth.xml
@@ -67,15 +67,15 @@ Ob0pZI5pkqdbQ/X+dGRz0ifwq1CQ44OjMnFi
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sesam.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sesam.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Uppsala universitet</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:Company>Uppsala universitet</md:Company>
<md:SurName>IT Servicedesk</md:SurName>
<md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
<md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sgw.africa-grid.org-shibboleth.xml b/swamid-2.0/sgw.africa-grid.org-shibboleth.xml
index e683c874..60c8f845 100644
--- a/swamid-2.0/sgw.africa-grid.org-shibboleth.xml
+++ b/swamid-2.0/sgw.africa-grid.org-shibboleth.xml
@@ -93,21 +93,21 @@ j/MCNlE=
<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:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Marco</md:GivenName>
<md:SurName>Fargetta</md:SurName>
<md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
<md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
+ </md:ContactPerson><md:ContactPerson contactType="administrative">
<md:GivenName>Roberto</md:GivenName>
<md:SurName>Barbera</md:SurName>
<md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
<md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml b/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
index 493f36c6..3069a9fa 100644
--- a/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
@@ -50,14 +50,14 @@
<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://siths-idp.sunet.se/saml2/idp/SSOService.php"/>
</md:IDPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">SITHS Login (SUNET)</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">SITHS Login (SUNET)</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Leif</md:GivenName>
<md:SurName>Johansson</md:SurName>
<md:EmailAddress>mailto:leifj@sunet.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/smultron.catalogix.se-8090-sp.xml b/swamid-2.0/smultron.catalogix.se-8090-sp.xml
index af6b3290..3a7f9fec 100644
--- a/swamid-2.0/smultron.catalogix.se-8090-sp.xml
+++ b/swamid-2.0/smultron.catalogix.se-8090-sp.xml
@@ -31,13 +31,13 @@ zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
</ns0:KeyDescriptor>
<ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://smultron.catalogix.se:8090/" index="1"/>
</ns0:SPSSODescriptor>
- <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+<ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
<ns0:OrganizationName xml:lang="en">The GEMbus registry at Ladok</ns0:OrganizationName>
<ns0:OrganizationDisplayName xml:lang="en">The GEMbus registry at Ladok</ns0:OrganizationDisplayName>
<ns0:OrganizationURL xml:lang="en">http://smultron.catalogix.se:8090/gembus.html</ns0:OrganizationURL>
- </ns0:Organization>
- <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<ns0:GivenName>Roland</ns0:GivenName>
<ns0:SurName>Hedberg</ns0:SurName>
- </ns0:ContactPerson>
-</md:EntityDescriptor>
+ </ns0:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml
index f3bdc305..b6663f1f 100644
--- a/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml
@@ -59,8 +59,8 @@ ZZ++pFd6COZSWkvz3O0kbDXKOANgr4ZylWIxYz+Fj1y8i5PN5C85ojDAIvzZ93J5
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
index bf9787b3..dfd95a6c 100644
--- a/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
@@ -52,17 +52,17 @@
<md:RequestedAttribute FriendlyName="givenName" isRequired="false" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">SND Gothenburg University</md:OrganizationName>
<md:OrganizationName xml:lang="sv">SND Göteborgs universitet</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Swedish National Data Service Gothenburg University</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="sv">Svensk Nationell Datatjänsti Göteborgs universitet</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://snd.gu.se/en</md:OrganizationURL>
<md:OrganizationURL xml:lang="sv">https://snd.gu.se/sv</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Pablo</md:GivenName>
<md:SurName>Millet</md:SurName>
<md:EmailAddress>mailto:pablo.millet@gu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sp.sprakochfolkminnen.se.xml b/swamid-2.0/sp.sprakochfolkminnen.se.xml
index 12ff60bd..f99d1e8d 100644
--- a/swamid-2.0/sp.sprakochfolkminnen.se.xml
+++ b/swamid-2.0/sp.sprakochfolkminnen.se.xml
@@ -42,17 +42,17 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.sprakochfolkminnen.se/simplesaml/module.php/saml/sp/saml2-acs.php/federated" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.sprakochfolkminnen.se/simplesaml/module.php/saml/sp/saml1-acs.php/federated/artifact" index="3"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Institute for Language and Folklore</md:OrganizationName>
<md:OrganizationName xml:lang="sv">Institutet för språk och folkminnen</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Institute for Language and Folklore</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="sv">Institutet för språk och folkminnen</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.sprakochfolkminnen.se/</md:OrganizationURL>
<md:OrganizationURL xml:lang="sv">https://www.sprakochfolkminnen.se/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Magnus</md:GivenName>
<md:SurName>Ahltorp</md:SurName>
<md:EmailAddress>mailto:magnus.ahltorp@sprakochfolkminnen.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
index e1913312..5f1994cc 100644
--- a/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
+++ b/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -47,20 +47,20 @@
<md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">SoNET</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">SoNET Systems</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://sonet.com.au</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:Company>SoNET Systems</md:Company>
<md:GivenName>Software</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
<md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:GivenName>Support</md:GivenName>
<md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml b/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
index 5c3e9161..fedf87fc 100644
--- a/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
@@ -93,12 +93,12 @@ LAkq68U=
<md:RequestedAttribute FriendlyName="eppn" 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" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/staging.cloudmore.com-shibboleth.xml b/swamid-2.0/staging.cloudmore.com-shibboleth.xml
index fe8fae5f..796babd2 100644
--- a/swamid-2.0/staging.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/staging.cloudmore.com-shibboleth.xml
@@ -94,12 +94,12 @@ KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
<md:RequestedAttribute FriendlyName="eppn" 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" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/staging.ilabsolutions.com.xml b/swamid-2.0/staging.ilabsolutions.com.xml
index 4c12387c..f5a79fea 100644
--- a/swamid-2.0/staging.ilabsolutions.com.xml
+++ b/swamid-2.0/staging.ilabsolutions.com.xml
@@ -57,17 +57,17 @@
<RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</AttributeConsumingService>
</SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">ILab Solutions, LLC</OrganizationName>
<OrganizationDisplayName xml:lang="en">ILab Solutions, LLC</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.ilabsolutions.com/</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<GivenName>ID Integration support</GivenName>
<EmailAddress>mailto:integrations_id@ilabsolutions.com</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<GivenName>Support</GivenName>
<EmailAddress>mailto:ilab-support@agilent.com</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 781997a6..1f099be7 100644
--- a/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -36,18 +36,18 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats.inacademia.org/simplesaml/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://stats.inacademia.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://inacademia.org</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:GivenName>InAcademia</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:GivenName>InAcademia Technical Support</md:GivenName>
<md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml b/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
index fc35001b..7ea95a65 100644
--- a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
+++ b/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
@@ -56,14 +56,14 @@ lQDSN7w4inBTDBIKvjWfVg==</ds:X509Certificate>
<md:AssertionConsumerService xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="http://stipendieansokan-test.uaf.uu.se:80/stipendium/saml/HoKSSO/alias/defaultAlias" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="3"/>
<md:AssertionConsumerService xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="http://stipendieansokan-test.uaf.uu.se:80/stipendium/saml/HoKSSO/alias/defaultAlias" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="4"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">UU</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Uppsala universitet</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:Company>Uppsala universitet</md:Company>
<md:SurName>Stipendiehantering</md:SurName>
<md:EmailAddress>mailto:stipendie-datordrift@its.uu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml b/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
index 148cd660..73c79346 100644
--- a/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
@@ -77,22 +77,22 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.integrationstest.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.integrationstest.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+
+<md:ContactPerson contactType="administrative">
<md:Company>ITS, Umeå universitet</md:Company>
<md:SurName>Fredrik Domeij</md:SurName>
<md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46907866600</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>ITS, Umeå universitet</md:Company>
<md:SurName>Fredrik Domeij</md:SurName>
<md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46907866600</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>ITS, Umeå universitet</md:Company>
<md:SurName>Ladok-supporten</md:SurName>
<md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46907866600</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/studiumbb.uu.se-studium.xml b/swamid-2.0/studiumbb.uu.se-studium.xml
index 4d564186..8ba13353 100644
--- a/swamid-2.0/studiumbb.uu.se-studium.xml
+++ b/swamid-2.0/studiumbb.uu.se-studium.xml
@@ -75,9 +75,9 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studiumbb.uu.se/auth-saml/saml/SSO/alias/_122_1" index="0" isDefault="true"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studiumbb.uu.se/auth-saml/saml/SSO/alias/_122_1" index="1"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:Company>Uppsala universitet</md:Company>
<md:SurName>Studium</md:SurName>
<md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
index 86ba72e4..838a22ca 100644
--- a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
+++ b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
@@ -36,13 +36,13 @@
<md:RequestedAttribute Name="mail" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="sv">Svensk E-identitet SP</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Svensk E-identitet AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>Svensk E-identitet / GrandID Support</md:GivenName>
<md:EmailAddress>mailto:support@grandid.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
index 0e185710..27417596 100644
--- a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
@@ -97,28 +97,28 @@ URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
<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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">SHH</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Sophiahemmet Högskola</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Sophiahemmet University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.shh.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Sophiahemmet University</Company>
<SurName>Sophiahemmet IT</SurName>
<EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
<TelephoneNumber>+46 8 406 2525</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Sophiahemmet University</Company>
<SurName>Sophiahemmet IT</SurName>
<EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
<TelephoneNumber>+46 8 406 2525</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Sophiahemmet University</Company>
<SurName>Sophiahemmet IT</SurName>
<EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
<TelephoneNumber>+46 8 406 2525</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml b/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml
index 2449336b..897aa72e 100644
--- a/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml
+++ b/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml
@@ -91,9 +91,9 @@ k0b3OPSaUvVNsZGwMOZ6RUXc9dK+jXX+Xx7HoQYPlfRtBtF+e+U1alxrQXCmxF+f
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tentaadmin-demo.test.umu.se/Shibboleth.sso/SAML2/ECP" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmin-demo.test.umu.se/Shibboleth.sso/SAML2/POST" index="10"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Tommy</md:GivenName>
<md:SurName>Larsson</md:SurName>
<md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml b/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
index 32962989..43ac4774 100644
--- a/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
+++ b/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
@@ -91,9 +91,9 @@ k0b3OPSaUvVNsZGwMOZ6RUXc9dK+jXX+Xx7HoQYPlfRtBtF+e+U1alxrQXCmxF+f
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tentaadmin.test.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tentaadmin.test.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Tommy</md:GivenName>
<md:SurName>Larsson</md:SurName>
<md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml b/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
index f7c3f78d..5f9b06d1 100644
--- a/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
+++ b/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
@@ -86,9 +86,9 @@ gA74GRgPQ3FGnqF2PkasBH+5Vkxk2rTdAroEO3WXRBOsk6JgO3lB/QY8x/lOfg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Anders</md:GivenName>
<md:SurName>Möllström</md:SurName>
<md:EmailAddress>mailto:Anders.mollstrom@uhr.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test-du.hr.evry.se-shibboleth.xml b/swamid-2.0/test-du.hr.evry.se-shibboleth.xml
index 7a76fc75..20f9d043 100644
--- a/swamid-2.0/test-du.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-du.hr.evry.se-shibboleth.xml
@@ -65,14 +65,14 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
<md:RequestedAttribute FriendlyName="eppn" 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:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:GivenName>Primula</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test-hh.hr.evry.se-shibboleth.xml b/swamid-2.0/test-hh.hr.evry.se-shibboleth.xml
index ac5439b7..efc79410 100644
--- a/swamid-2.0/test-hh.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-hh.hr.evry.se-shibboleth.xml
@@ -65,14 +65,14 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
<md:RequestedAttribute FriendlyName="eppn" 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:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:GivenName>Primula</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test-his.hr.evry.se-shibboleth.xml b/swamid-2.0/test-his.hr.evry.se-shibboleth.xml
index 884bf875..c9014f8b 100644
--- a/swamid-2.0/test-his.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-his.hr.evry.se-shibboleth.xml
@@ -59,14 +59,14 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
<md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:GivenName>Primula</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test-ki.pingpong.net-shibboleth.xml b/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
index 3be8d2a9..7f4689b1 100644
--- a/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
+++ b/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
@@ -50,9 +50,9 @@ kRz90uqHpg==
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-ki.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-ki.pingpong.net/Shibboleth.sso/SAML2/POST" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+<md:Organization>
<md:OrganizationName xml:lang="en">KI</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
- </md:Organization>
-</md:EntityDescriptor>
+ </md:Organization></md:EntityDescriptor>
diff --git a/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml b/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
index c04a3bf8..55efee33 100644
--- a/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
@@ -73,14 +73,14 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
<md:RequestedAttribute FriendlyName="eppn" 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:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:GivenName>Primula</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml b/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml
index 545ff280..0c140153 100644
--- a/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml
@@ -59,14 +59,14 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
<md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
+ </md:Organization><md:ContactPerson contactType="support">
<md:GivenName>Primula</md:GivenName>
<md:SurName>Support</md:SurName>
<md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test.gdb.vr.se.xml b/swamid-2.0/test.gdb.vr.se.xml
index ca1afaaa..0e3b49a5 100644
--- a/swamid-2.0/test.gdb.vr.se.xml
+++ b/swamid-2.0/test.gdb.vr.se.xml
@@ -89,14 +89,14 @@ Ipo2oUGm1iXxmDB7XIubtQ==
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.gdb.vr.se/Shibboleth.sso/SLO/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.gdb.vr.se/Shibboleth.sso/SAML2/POST" index="1"/>
</md:SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">VR</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">The Swedish Research Council</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<SurName>Morgan Nyman</SurName>
<EmailAddress>mailto:morgan.nyman@visma.com</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test.itslearning.com.xml b/swamid-2.0/test.itslearning.com.xml
index 3dd056e1..6251db6d 100644
--- a/swamid-2.0/test.itslearning.com.xml
+++ b/swamid-2.0/test.itslearning.com.xml
@@ -77,15 +77,15 @@ L0Gxkp4Wyq0nkpjQ4E2v9nFsPiXf4kL8Cc7Oa87n</ds:X509Certificate>
<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://www.itsltest.com/elogin/AssertionConsumerService.aspx" index="0" isDefault="true"/>
</SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">itslearning (test)</OrganizationName>
<OrganizationDisplayName xml:lang="en">itslearning (test)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.itslearning.eu</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="technical">
<EmailAddress>mailto:support@itslearning.com</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="support">
<EmailAddress>mailto:support@itslearning.com</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml b/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml
index c051c1db..063d35c2 100644
--- a/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml
+++ b/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml
@@ -95,21 +95,21 @@ f91arR1JmuNzmHFNaLikuWCqw/8qr938FM2uP4W2OTcMm998DSp5z+SDOHphuhZF
<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:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
<md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:liferay-datordrift@its.uu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>Uppsala universitet</md:Company>
<md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
<md:TelephoneNumber>+46184714400</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test.play.hv.se.xml b/swamid-2.0/test.play.hv.se.xml
index 0e3f914f..57eedf69 100644
--- a/swamid-2.0/test.play.hv.se.xml
+++ b/swamid-2.0/test.play.hv.se.xml
@@ -39,13 +39,13 @@
<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://test.play.hv.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">HV Play (Test)</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">HV Play (Test)</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://test.play.hv.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test.scalable-learning.com.xml b/swamid-2.0/test.scalable-learning.com.xml
index bfb3fa27..4f4fba2b 100644
--- a/swamid-2.0/test.scalable-learning.com.xml
+++ b/swamid-2.0/test.scalable-learning.com.xml
@@ -69,21 +69,21 @@ b4Y=
<md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://test.scalable-learning.com</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </md:Organization><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>ScalableLearning</Company>
<EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>ScalableLearning</Company>
<EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<GivenName>Security Response Team</GivenName>
<EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test0.release-check.swamid.se-shibboleth.xml b/swamid-2.0/test0.release-check.swamid.se-shibboleth.xml
index 2e580f69..6cb77618 100644
--- a/swamid-2.0/test0.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/test0.release-check.swamid.se-shibboleth.xml
@@ -118,13 +118,13 @@ rtSd5rXgy930PQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test0.release-check.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test0.release-check.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:Company>SWAMID</md:Company>
<md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/testplay.hhs.se.xml b/swamid-2.0/testplay.hhs.se.xml
index 8a36b154..68910c73 100644
--- a/swamid-2.0/testplay.hhs.se.xml
+++ b/swamid-2.0/testplay.hhs.se.xml
@@ -39,13 +39,13 @@
<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://testplay.hhs.se/user/authenticate" index="0"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">HHS (TEST)</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">HHS (TEST)</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://testplay.hhs.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:SurName>Administrator</md:SurName>
<md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml b/swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml
index 06869991..7890c96a 100644
--- a/swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml
+++ b/swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml
@@ -83,9 +83,9 @@ A4F5+e/ZMR2dTg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+<md:ContactPerson contactType="administrative">
<md:GivenName>Fredrik</md:GivenName>
<md:SurName>Pettai</md:SurName>
<md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml b/swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml
index ee18b159..1761948b 100644
--- a/swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml
@@ -206,32 +206,32 @@ qW+WsHaRP1g=
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tsidp1.test.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
</AttributeAuthorityDescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">BTH</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (MFA-TEST)</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology (MFA-TEST)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Blekinge Institute of Technology</Company>
<SurName>IT Helpdesk</SurName>
<EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Blekinge Institute of Technology</Company>
<SurName>IT Helpdesk</SurName>
<EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Blekinge Institute of Technology</Company>
<SurName>IT Helpdesk</SurName>
<EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 381500</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<GivenName>Security Response Team</GivenName>
<EmailAddress>mailto:abuse@bth.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
index facb2572..0ea909d8 100644
--- a/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
@@ -15,15 +15,15 @@
</KeyDescriptor>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-humpdac.ad.umu.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
</SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">UU</OrganizationName>
<OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>UMDAC</Company>
<GivenName>Tommy</GivenName>
<SurName>Larsson</SurName>
<EmailAddress>mailto:tommy.larsson@umdac.umu.se</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml b/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
index 03bd6f57..aeb68908 100644
--- a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
+++ b/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
@@ -52,21 +52,21 @@ xuvjUFEYjJuhY/HwYbmCghKebqIusOEkfaLO0HZmwpI=
<RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</AttributeConsumingService>
</SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">O'Reilly Media</OrganizationName>
<OrganizationDisplayName xml:lang="en">Safari Books Online</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://www.oreilly.com/</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<GivenName>Jesse Banning</GivenName>
<EmailAddress>mailto:safari-prof-serv@oreilly.com</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<GivenName>Jesse Banning</GivenName>
<EmailAddress>mailto:safari-prof-serv@oreilly.com</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<GivenName>Matt Kirk</GivenName>
<EmailAddress>mailto:security-feedback@oreilly.com</EmailAddress>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
index 34ddacf1..980c7dbd 100644
--- a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
@@ -103,15 +103,15 @@ R+DVLFswqfvJvRRyTA==
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+
+<md:ContactPerson contactType="administrative">
<md:EmailAddress>mailto:indico-datordrift@its.uu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:EmailAddress>mailto:indico-datordrift@its.uu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </md:ContactPerson><md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
<md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
<md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/vartuppdrag.se.xml b/swamid-2.0/vartuppdrag.se.xml
index 603e9c49..4c9d6abb 100644
--- a/swamid-2.0/vartuppdrag.se.xml
+++ b/swamid-2.0/vartuppdrag.se.xml
@@ -76,9 +76,9 @@
<md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vartuppdrag.se/saml2/acs" index="1"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Fredrik</md:GivenName>
<md:SurName>Croneborg</md:SurName>
<md:EmailAddress>mailto:fredrik@learnways.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/verify-l.myunidays.com-shibboleth.xml b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
index b3caf01a..1810bef5 100644
--- a/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
+++ b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
@@ -103,26 +103,26 @@ xmBjp1ntxjW8jWQiW/3pb5t/HODL79ntP17sTv4kT8EURtMRgYxttfreDdg=
<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"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+
+
+<md:ContactPerson contactType="administrative">
<md:Company>UNiDAYS</md:Company>
<md:GivenName>Andrew</md:GivenName>
<md:SurName>Bullock</md:SurName>
<md:EmailAddress>mailto:andrew.bullock@myunidays.com</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>UNiDAYS</md:Company>
<md:GivenName>Alan</md:GivenName>
<md:SurName>Buxey</md:SurName>
<md:EmailAddress>mailto:alan.buxey@myunidays.com</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>UNiDAYS</md:Company>
<md:GivenName>Alan</md:GivenName>
<md:SurName>Buxey</md:SurName>
<md:EmailAddress>mailto:alan.buxey@myunidays.com</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </md:ContactPerson><md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<md:GivenName>SAML Security Response Team</md:GivenName>
<md:EmailAddress>mailto:shibadmin@myunidays.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/verify.studentbeans.com-shibboleth.xml b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
index 5e10868e..ac79df85 100644
--- a/swamid-2.0/verify.studentbeans.com-shibboleth.xml
+++ b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
@@ -91,16 +91,16 @@ UKG+a99pFdmiJhaVmr6ppycpR94IcDJb+8Px5A==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">The Beans Group</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">The Beans Group</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="cs">The Beans Group</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.thebeansgroup.com</md:OrganizationURL>
<md:OrganizationURL xml:lang="cs">http://www.thebeansgroup.com</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:GivenName>William</md:GivenName>
<md:SurName>Harris</md:SurName>
<md:EmailAddress>mailto:william@thebeansgroup.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
index ba355ed0..8100ba24 100644
--- a/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
@@ -100,8 +100,8 @@ XOl0tx98AnNRgDTOuRoPtUa7Bg8w4puwklhK+gg+X01kZA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml b/swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml
index c69471b3..526592ec 100644
--- a/swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml
@@ -104,8 +104,8 @@ WBDYqdoEV/JWoX8elhgj/eI4j2DiKfZkfPQhZIkJBtgZamfQkW33ttzLp0Nzh/Ck
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfusyd-dev.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfusyd-dev.su.se/Shibboleth.sso/SAML2/ECP" index="9"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml b/swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml
index cce08901..2892cf7e 100644
--- a/swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml
@@ -104,8 +104,8 @@ b6XhptNS5kSIVoJCgXaUP1Vi/pyzm713Re9wwYT92JDWUgfHPsVXUnQ=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfusyd-test.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfusyd-test.su.se/Shibboleth.sso/SAML2/ECP" index="9"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:SurName>IT-avdelningen</md:SurName>
<md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/webinar.nordu.net-shibboleth.xml b/swamid-2.0/webinar.nordu.net-shibboleth.xml
index 1455c274..a0c86c11 100644
--- a/swamid-2.0/webinar.nordu.net-shibboleth.xml
+++ b/swamid-2.0/webinar.nordu.net-shibboleth.xml
@@ -81,13 +81,13 @@ euZKcqmem+nEk8ZZsFxhsTwGLzwlgA+2TEJnP3AeRTiPLzvbYTUprgL0gKt7pg==
<md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
- <md:Organization>
+
+
+<md:Organization>
<md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
+ </md:Organization><md:ContactPerson contactType="technical">
<md:Company>NORDUnet NOC</md:Company>
<md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml b/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
index ef84ee52..e54bce75 100644
--- a/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
@@ -123,48 +123,48 @@ kIE+WHmcqr7ZfEfWi17pJAil+nNWp+hZpUw566AbqjWq
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.smhi.se/idp/profile/SAML2/POST/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.smhi.se/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">SMHI</OrganizationName>
<OrganizationName xml:lang="sv">SMHI</OrganizationName>
<OrganizationDisplayName xml:lang="en">SMHI</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="sv">SMHI</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.smhi.se</OrganizationURL>
<OrganizationURL xml:lang="sv">http://www.smhi.se</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>SMHI</Company>
<SurName>Sakib Kicic</SurName>
<EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
<TelephoneNumber>+46114958033</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>SMHI</Company>
<SurName>Peter Magnusson</SurName>
<EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
<TelephoneNumber>+46114958547</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>SMHI</Company>
<SurName>Sakib Kicic</SurName>
<EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
<TelephoneNumber>+46114958033</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>SMHI</Company>
<SurName>Peter Magnusson</SurName>
<EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
<TelephoneNumber>+46114958547</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>SMHI</Company>
<SurName>Sakib Kicic</SurName>
<EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
<TelephoneNumber>+46114958033</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>SMHI</Company>
<SurName>Peter Magnusson</SurName>
<EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
<TelephoneNumber>+46114958547</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
index 75609e46..27033a37 100644
--- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -220,30 +220,30 @@ nQPiHsyW3apD4+IJzI2nGQfeL4XO6MPUPVvn+7TiduFaCe+TXJQW
<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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
<OrganizationName xml:lang="en">Uppsala University</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Uppsala universitet</Company>
<EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Uppsala universitet</Company>
<EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Uppsala universitet</Company>
<EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
<TelephoneNumber>+46184714400</TelephoneNumber>
- </ContactPerson>
- <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<GivenName>Uppsala University Computer Security Incident Response Team</GivenName>
<EmailAddress>mailto:security@uu.se</EmailAddress>
<TelephoneNumber>+46184717560</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
index 473c417f..d40260af 100644
--- a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
@@ -49,25 +49,25 @@ oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
</md:SPSSODescriptor>
- <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+
+
+
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
<OrganizationName xml:lang="en">Uppsala University</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
<OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
- </Organization>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Uppsala universitet</Company>
<EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
<Company>Uppsala universitet</Company>
<EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
<Company>Uppsala universitet</Company>
<EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
<TelephoneNumber>+46184714400</TelephoneNumber>
- </ContactPerson>
-</md:EntityDescriptor>
+ </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
index ada1905f..47d4b2fa 100644
--- a/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
+++ b/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
@@ -93,9 +93,9 @@ MViWUqDxKicGyuokDNf3hpcc9w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Pontus</md:GivenName>
<md:SurName>Larsson</md:SurName>
<md:EmailAddress>mailto:pontus.larsson@uhr.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.researchprofessional.com-shibboleth.xml b/swamid-2.0/www.researchprofessional.com-shibboleth.xml
index 03b0ba73..b437fdac 100644
--- a/swamid-2.0/www.researchprofessional.com-shibboleth.xml
+++ b/swamid-2.0/www.researchprofessional.com-shibboleth.xml
@@ -63,9 +63,9 @@ tgwZBKIPISvO0cHB2chZHzDJI9PQsgD0OmVfHqQtlwuMw32qK2EcD1NC/VZZ/w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>David</md:GivenName>
<md:SurName>Stringer</md:SurName>
<md:EmailAddress>mailto:david.stringer@researchresearch.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.student.ladok.se-student-sp.xml b/swamid-2.0/www.student.ladok.se-student-sp.xml
index 72dce986..17b9b95d 100644
--- a/swamid-2.0/www.student.ladok.se-student-sp.xml
+++ b/swamid-2.0/www.student.ladok.se-student-sp.xml
@@ -77,22 +77,22 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+
+<md:ContactPerson contactType="administrative">
<md:Company>ITS, Umeå universitet</md:Company>
<md:SurName>Fredrik Domeij</md:SurName>
<md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>46907866600</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>ITS, Umeå universitet</md:Company>
<md:SurName>Fredrik Domeij</md:SurName>
<md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>46907866600</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>ITS, Umeå universitet</md:Company>
<md:SurName>Ladok-supporten</md:SurName>
<md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>46907866600</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml b/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
index 849a184e..2d791da0 100644
--- a/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
+++ b/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
@@ -87,9 +87,9 @@ OCAgWY6O9B3McR43joEl1kbkE4ckdvrpmDrGdjZn78smL6SGV2Frl5d0ALjQSVkB
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
+
+<md:ContactPerson contactType="technical">
<md:GivenName>Anders</md:GivenName>
<md:SurName>Möllström</md:SurName>
<md:EmailAddress>mailto:Anders.mollstrom@uhr.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.ladok.se-gui-sp.xml b/swamid-2.0/www.test.ladok.se-gui-sp.xml
index 1c3b9857..e1c286a5 100644
--- a/swamid-2.0/www.test.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.test.ladok.se-gui-sp.xml
@@ -76,22 +76,22 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
- <md:ContactPerson contactType="administrative">
+
+
+
+<md:ContactPerson contactType="administrative">
<md:Company>ITS, Umeå universitet</md:Company>
<md:SurName>Fredrik Domeij</md:SurName>
<md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>46907866600</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
+ </md:ContactPerson><md:ContactPerson contactType="technical">
<md:Company>ITS, Umeå universitet</md:Company>
<md:SurName>Fredrik Domeij</md:SurName>
<md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>46907866600</md:TelephoneNumber>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
+ </md:ContactPerson><md:ContactPerson contactType="support">
<md:Company>ITS, Umeå universitet</md:Company>
<md:SurName>Ladok-supporten</md:SurName>
<md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>46907866600</md:TelephoneNumber>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </md:ContactPerson></md:EntityDescriptor>