Corrected use of OrganizationName and OrganizationDisplayName, more to come.md-2024-02-16-v04

7 files changed, 23 insertions, 23 deletions

diff --git a/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml b/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
index defea70b..8f23c669 100644
--- a/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
@@ -71,12 +71,12 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.tad.hv.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">HV</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">University West</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan Väst</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hv.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.hv.se</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.hv.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.hv.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>University West</md:Company>
diff --git a/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml b/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml
index a4ceca49..4d651a8e 100644
--- a/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml
@@ -54,10 +54,10 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>University of Gothenburg</md:Company>
diff --git a/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml b/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
index 1a0a0fdc..610bbe1e 100644
--- a/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
@@ -212,10 +212,10 @@ ocfXlxiISI9q8HuuNs3FvJhJZWITD4pgq6hDioWmYyDa5Xjr7d9e2oOJD9C25Te2
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml b/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
index 3c23944b..eef67cff 100644
--- a/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
@@ -62,10 +62,10 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.it.gu.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml b/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
index 702189b6..9ab36462 100644
--- a/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
@@ -59,8 +59,8 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm (TEST)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm (TEST)</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.hhs.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
diff --git a/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml b/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
index 474c715e..22b010e7 100644
--- a/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
@@ -192,8 +192,8 @@ ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
   <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 -- TEST ONLY</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm -- ENDAST TEST</md:OrganizationDisplayName>
+    <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</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.hhs.se/sv/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml b/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
index 4f92ae6e..6cf8ffa3 100644
--- a/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
+++ b/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
@@ -80,10 +80,10 @@ KdDCYYX3nxmihSFMU9MLBACFzLYjVf3/BNPNIQ==</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>