From ee43e95506d0222198ce29d8c700cb47a5421777 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Fri, 17 Mar 2017 09:15:52 +0100
Subject: Switchover HiS to V3 IdP

---
 swamid-2.0/idp.his.se-idp-shibboleth.xml  | 15 +++++++++++----
 swamid-2.0/idp2.his.se-idp-shibboleth.xml | 15 ++++-----------
 swamid-edugain-idp-1.0.mxml               |  2 +-
 swamid-idp-2.0.mxml                       |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/swamid-2.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml
index ed12731a..a8c29d40 100644
--- a/swamid-2.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.his.se-idp-shibboleth.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.his.se/idp/shibboleth">
+  <Extensions>
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns="" 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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">his.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Skövde</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde (gammal)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Skövde (old)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Skövde</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for University of Skövde</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.his.se</mdui:InformationURL>
@@ -99,8 +106,8 @@ drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HIS</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Skövde</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Skövde (gammal)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Skövde (old)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.his.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp2.his.se-idp-shibboleth.xml b/swamid-2.0/idp2.his.se-idp-shibboleth.xml
index 0d537a21..64d7f5c8 100644
--- a/swamid-2.0/idp2.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.his.se-idp-shibboleth.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp2.his.se/idp/shibboleth">
-  <Extensions>
-    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns="" 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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
       <shibmd:Scope regexp="false">his.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde (ny)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Skövde (new)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Skövde</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Skövde</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for University of Skövde</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.his.se</mdui:InformationURL>
@@ -200,8 +193,8 @@ lydgJ83mLCTu9Bueh30Fp3aQ64DAHbCABkgW
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HIS</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Skövde (ny)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Skövde (new)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">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-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index ecc3b93d..b6919833 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -25,7 +25,6 @@
   <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/swamid2.shh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.his.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fs.liu.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/weblogin.uu.se-idp-shibboleth.xml"/>
@@ -50,4 +49,5 @@
   <xi:include href="swamid-2.0/idp.ltu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp01.gih.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 8e917c29..23ca493b 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -20,5 +20,5 @@
   <xi:include href="swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.his.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3