From 34f4372f9ebc27117567e9e25c7b1028b8f31fdd Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Mon, 13 Jun 2016 09:08:45 +0200
Subject: SWAMIDOPS-8221 Swap to new IdP

---
 swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml | 17 ++++++++++++-----
 swamid-2.0/login.fhs.se-adfs-services-trust.xml  | 17 +++++------------
 swamid-edugain-idp-1.0.mxml                      |  2 +-
 swamid-idp-2.0.mxml                              |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

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 0b72f4c0..cb1130e4 100644
--- a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs01.fhs.se/adfs/services/trust">
+  <Extensions>
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </attr:EntityAttributes>
+  </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">fhs.se</shibmd:Scope>
       <shibmd:Scope regexp="false">student.fhs.se</shibmd:Scope>
       <shibmd:Scope regexp="false">op.fhs.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Försvarshögskolan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish National Defence College</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Försvarshögskolan (gammal)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish National Defence College (old)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Försvarshögskolan</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Swedish National Defence College</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.fhs.se</mdui:InformationURL>
@@ -75,9 +82,9 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="sv">Försvarshögskolan</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Försvarshögskolan</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish National Defence College</OrganizationDisplayName>
+    <OrganizationName xml:lang="sv">Försvarshögskolan (gammal)</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Försvarshögskolan (gammal)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Swedish National Defence College (old)</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.fhs.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/login.fhs.se-adfs-services-trust.xml b/swamid-2.0/login.fhs.se-adfs-services-trust.xml
index 001c41bc..17c25ad8 100644
--- a/swamid-2.0/login.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login.fhs.se-adfs-services-trust.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://login.fhs.se/adfs/services/trust">
-  <Extensions>
-    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </attr:EntityAttributes>
-  </Extensions>
   <RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="Försvarshögskolan">
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -616,8 +609,8 @@
       <shibmd:Scope regexp="false">student.fhs.se</shibmd:Scope>
       <shibmd:Scope regexp="false">op.fhs.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Försvarshögskolan (ny)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish National Defence College (new)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Försvarshögskolan</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish National Defence College</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Försvarshögskolan</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Swedish National Defence College</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.fhs.se</mdui:InformationURL>
@@ -717,9 +710,9 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="sv">Försvarshögskolan (ny)</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Försvarshögskolan (ny)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish National Defence College (new)</OrganizationDisplayName>
+    <OrganizationName xml:lang="sv">Försvarshögskolan</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">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="support">
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index a8ab77ca..a6e9459f 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -24,7 +24,6 @@
   <xi:include href="swamid-2.0/idp.student.bth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/identity.mdh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.it.gu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kmh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kva.se-idp-shibboleth.xml"/>
@@ -51,4 +50,5 @@
   <xi:include href="swamid-2.0/idp.ths.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/swamid.vr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin.kau.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/login.fhs.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 96958313..2099b349 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -14,7 +14,7 @@
   <xi:include href="swamid-2.0/miunidp.miun.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/login.fhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp.mdh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.kau.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3