diff options
| author | Fredrik Aslund <fredrik.aslund@umu.se> | 2014-12-01 14:56:45 +0100 |
|---|---|---|
| committer | Fredrik Aslund <fredrik.aslund@umu.se> | 2014-12-01 14:56:45 +0100 |
| commit | 4f20fd0a6217f400283e8fb3b7bb0c964665fe06 (patch) | |
| tree | 33426fb1fa0204eadbd4025845c91d94083a7b48 | |
| parent | 558874f6cdaeb192a752aebe489e6acfd3d92575 (diff) | |
syncup between MDUI and OrganizationDisplayName (MDUI takes precedence)
24 files changed, 37 insertions, 33 deletions
@@ -126,6 +126,10 @@ tidy: @for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc xslt/clean-entitydescriptor.xsl $$x > $$x.c && mv $$x.c $$x; done committest: test + @echo "Check for mismatch between MDUI DisplayName and OrganizationDisplayName" + @for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do for lang in `cat swamid-2.0/*.xml | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do mdui_displayname=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor//UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` organizationdisplayname=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Organization/OrganizationDisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` ; if [ -n "$$mdui_displayname" -a -n "$$organizationdisplayname" -a "$$mdui_displayname" != "$$organizationdisplayname" ] ; then echo "$$x: $$lang '$$mdui_displayname' vs $$lang '$$organizationdisplayname'" ; fi ; done ; done | grep . && exit 1 || true + @echo "Checking for uniq IdP OrganizationDisplayName" + @for lang in `cat swamid-2.0/*.xml | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Organization/OrganizationDisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | sed "s;^;$$x $$lang ;" ; done | sort -k 3 | uniq -D -f 2 ; done | grep . && exit 1 || true @echo "Checking for entity-categories in SPSSODescriptors that should be moved to EntityDescriptor/Extensions" @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath /EntityDescriptor/SPSSODescriptor/Extensions/EntityAttributes - 2>/dev/null | grep -q entity-category ; then echo " $$x" ; fi ; done | grep . && exit 1 || true @echo "Checking for entity-categories in IDPSSODescriptor that should be moved to EntityDescriptor/Extensions" diff --git a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml index 28acf0ae..3960b0ef 100644 --- a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml +++ b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml @@ -77,7 +77,7 @@ <Organization> <OrganizationName xml:lang="sv">Försvarshögskolan</OrganizationName> <OrganizationDisplayName xml:lang="sv">Försvarshögskolan</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Försvarshögskolan</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Swedish National Defence College</OrganizationDisplayName> <OrganizationURL xml:lang="sv">http://www.fhs.se/</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/dev.idp.eduid.se-idp.xml b/swamid-2.0/dev.idp.eduid.se-idp.xml index cd57be43..20f2d4b2 100644 --- a/swamid-2.0/dev.idp.eduid.se-idp.xml +++ b/swamid-2.0/dev.idp.eduid.se-idp.xml @@ -67,7 +67,7 @@ hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+ </ns0:IDPSSODescriptor> <ns0:Organization> <ns0:OrganizationName xml:lang="en">eduID TEST</ns0:OrganizationName> - <ns0:OrganizationDisplayName xml:lang="en">eduID TEST</ns0:OrganizationDisplayName> + <ns0:OrganizationDisplayName xml:lang="en">eduID TEST dev</ns0:OrganizationDisplayName> <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL> </ns0:Organization> <ns0:ContactPerson contactType="technical"> diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml index de961613..dd459074 100644 --- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml +++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml @@ -336,7 +336,7 @@ </IDPSSODescriptor> <Organization> <OrganizationName xml:lang="sv">Linköping University</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Linköpings Universitet (ADFS)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Linköpings universitet (ADFS)</OrganizationDisplayName> <OrganizationDisplayName xml:lang="en">Linköping University (ADFS)</OrganizationDisplayName> <OrganizationURL xml:lang="sv">http://www.liu.se/</OrganizationURL> </Organization> diff --git a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml index 125676f7..5cd31580 100644 --- a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml +++ b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml @@ -95,7 +95,7 @@ icptKTpDxrRjfCXibBT1 </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">The Swedish School of sport and health sciences</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Gymnastik- och Idrottshögskolan</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</OrganizationDisplayName> <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.gih.se</OrganizationURL> </Organization> diff --git a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml index d6687c6c..715d0f3f 100644 --- a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml +++ b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml @@ -86,8 +86,8 @@ X627IsSkKg== </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">NORDUnetTEST</OrganizationName> - <OrganizationDisplayName xml:lang="sv">NORDUnet (Test IdP)</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">NORDUnet (Test IdP)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">NORDUnet Test IdP</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">NORDUnet Test IdP</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL> </Organization> <ContactPerson contactType="technical"> diff --git a/swamid-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.bth.se-idp-shibboleth.xml index 73d78830..507f0e70 100644 --- a/swamid-2.0/idp.bth.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.bth.se-idp-shibboleth.xml @@ -89,8 +89,8 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI= </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">BTH</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Personnel</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml index 9c596ec6..f646dac8 100644 --- a/swamid-2.0/idp.his.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.his.se-idp-shibboleth.xml @@ -100,7 +100,7 @@ drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ <Organization> <OrganizationName xml:lang="en">HIS</OrganizationName> <OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">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 contactType="administrative"> diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml index 6bb17238..57534be4 100644 --- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml @@ -94,8 +94,8 @@ XCYbfP8E3cs4MB+K </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">IRF</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Institutet för Rymdfysik</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</OrganizationDisplayName> + <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 contactType="administrative"> diff --git a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml index 448c8625..539dabea 100644 --- a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml @@ -84,7 +84,7 @@ VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate> </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">SU</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Stockholms Universitet</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Stockholms universitet</OrganizationDisplayName> <OrganizationDisplayName xml:lang="en">Stockholm University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL> </Organization> diff --git a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml index d136e031..6664519e 100644 --- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml @@ -89,8 +89,8 @@ Qz1btpwpzorDI58f7uezMy6zg2+3aLxJ</ds:X509Certificate> </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">KMH</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Kungliga Musikhögskolan</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Royal College of Music</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.kmh.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-2.0/idp.kva.se-idp-shibboleth.xml index 652a95e0..8d10830a 100644 --- a/swamid-2.0/idp.kva.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.kva.se-idp-shibboleth.xml @@ -92,7 +92,7 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">KVA</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Kungliga vetenskapsakademien</OrganizationDisplayName> + <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> diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml index 47c1896d..5f1a0abe 100644 --- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml @@ -94,8 +94,8 @@ dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7 </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">MAH</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Malmö Högskola</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Malmö Högskola</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Malmö högskola</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Malmö University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.mah.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml index 41caee10..c038ceab 100644 --- a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml @@ -85,7 +85,7 @@ MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate> <Organization> <OrganizationName xml:lang="en">The Red Cross University College</OrganizationName> <OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">The Red Cross University College</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.rkh.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml index 46e52d33..8ba6db17 100644 --- a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml @@ -85,8 +85,8 @@ nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">STUDENTS-BTH</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Students</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml index 3f4b94d9..adae6b1a 100644 --- a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml +++ b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml @@ -43,7 +43,7 @@ <md:Organization> <md:OrganizationName xml:lang="sv">UmU</md:OrganizationName> <md:OrganizationName xml:lang="en">UmU</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="sv">Umeå Universitet</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName> <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName> <md:OrganizationURL xml:lang="sv">http://www.umu.se</md:OrganizationURL> <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL> diff --git a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml index cdf0c551..01187453 100644 --- a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml +++ b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml @@ -103,7 +103,7 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9 </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">KAU</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Karlstads Universitet</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Karlstads universitet</OrganizationDisplayName> <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL> </Organization> diff --git a/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml index cc0f44ba..b9641062 100644 --- a/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml +++ b/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml @@ -116,8 +116,8 @@ sdhdXg== </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">KTH</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska Högskolan</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska Högskolan (old)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (old)</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml index 34ffc5e1..2cdb22df 100644 --- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml +++ b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml @@ -120,8 +120,8 @@ x7JUFw==</ds:X509Certificate> </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">KTH</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska Högskolan (test)</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (test)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml index 335c9912..e142e8fd 100644 --- a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml +++ b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml @@ -87,7 +87,7 @@ Pz8R3A==</ds:X509Certificate> </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">ORU</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Örebro Universitet</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Örebro universitet</OrganizationDisplayName> <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL> </Organization> diff --git a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml index 6067ae9c..7293f8f5 100644 --- a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml +++ b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml @@ -90,8 +90,8 @@ B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA= </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">LTU</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Luleå Tekniska Universitet</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Luleå Tekniska Universitet</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Lulea University of Technology</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml index b09c823d..836e749b 100644 --- a/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml +++ b/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml @@ -95,8 +95,8 @@ ADE1bHKRi4qX9DYfBN7g </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">LU</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Lunds Universitet</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Lunds Universitet</OrganizationDisplayName> + <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 contactType="administrative"> diff --git a/swamid-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-2.0/signon.hh.se-idp-shibboleth.xml index 45eeda4a..e0c47cf9 100644 --- a/swamid-2.0/signon.hh.se-idp-shibboleth.xml +++ b/swamid-2.0/signon.hh.se-idp-shibboleth.xml @@ -98,7 +98,7 @@ CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE= <Organization> <OrganizationName xml:lang="en">HH</OrganizationName> <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Högskolan i Halmstad</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Halmstad University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml index 8bfba979..9aae47fb 100644 --- a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml +++ b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml @@ -96,7 +96,7 @@ I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ== <Organization> <OrganizationName xml:lang="en">MIUN</OrganizationName> <OrganizationDisplayName xml:lang="sv">Mittuniversitetet</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Mittuniversitetet</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Mid Sweden University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> |