From e35fe83edf68217b1bfb7c198bc13f98ff4d8b9f Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Wed, 7 Jun 2017 14:28:02 +0200
Subject: Moved adfs.rkh.se from testing to swamid-2.0  SWAMID-81

---
 swamid-2.0/adfs.rkh.se-adfs-services-trust.xml | 8 ++++++++
 swamid-idp-2.0.mxml                            | 1 +
 swamid-testing-idp-1.0.mxml                    | 1 -
 3 files changed, 9 insertions(+), 1 deletion(-)

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 e5b2b491..254d9506 100644
--- a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
@@ -604,6 +604,14 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.rkh.se/adfs/ls/" index="2"/>
   </SPSSODescriptor>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Röda Korsets Högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Röda Korsets Högskola</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">ADFS Röda Korsets Högskola</mdui:Description>
+        <mdui:Description xml:lang="en">ADFS Röda Korsets Högskola</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index a89cb50c..f4c2c893 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -22,4 +22,5 @@
   <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 9978cdc9..62555d9f 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -57,5 +57,4 @@
   <xi:include href="swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.test.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3