From 9e0f445366a4bf7e37c3837ca8c94554cb6e94ec Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Mon, 11 Feb 2019 09:43:47 +0000
Subject: Resolves SWAMIDOPS-1863

---
 .../adfs.test.umu.se-adfs-services-trust.xml       | 32 +++++++---------------
 swamid-2.0/adfs.umu.se-adfs-services-trust.xml     | 12 ++++----
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
index 48fe0929..3276498b 100644
--- a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
@@ -7,14 +7,10 @@
         <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Umeå universitet</mdui:Description>
         <mdui:Description xml:lang="en">Umeå University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">
-			https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/ 
-			</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">
-			https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/ 
-			</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://www.umu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.umu.se/english</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="encryption">
@@ -46,22 +42,14 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Umeå universitet (TEST)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Umeå University (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">
-				Identitsutgivare för anställda och studenter vid Umeå universitet (TEST).
-				</mdui:Description>
-        <mdui:Description xml:lang="en">
-				Identity Provider for employees and students at Umeå University (TEST).
-				</mdui:Description>
+        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Umeå universitet (TEST).</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Umeå University (TEST).</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">
-				umu umeå+universitet umea+universitet umea+university umeå+university umeå umea
-				</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">
-				umu umeå+universitet umea+universitet umea+university umeå+university umeå umea
-				</mdui:Keywords>
+        <mdui:Logo xml:lang="sv" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-se-te.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-en-te.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>umu.se</mdui:DomainHint>
diff --git a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
index cadd2208..99b8a027 100644
--- a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
@@ -16,10 +16,10 @@
         <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Umeå universitet.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for employees and students at Umea University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://www.umu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.umu.se/en</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-se-te.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-en-te.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
         <mdui:Keywords xml:lang="en">umu umea+universitet umea+universitet umea+university umea+university umea umea</mdui:Keywords>
       </mdui:UIInfo>
@@ -57,8 +57,8 @@
     <OrganizationName xml:lang="en">Umea University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Umeå universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.umu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.umu.se/english/</OrganizationURL>
+    <OrganizationURL xml:lang="sv">https://www.umu.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://www.umu.se/en</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <Company>Umeå University</Company>
-- 
cgit v1.2.3