From d6700360af226677d673de2d837c60ff39dad1d1 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 4 Jan 2017 08:45:23 +0100
Subject: IdP switch for LTU. SWAMIDOPS-8430

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

diff --git a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
index 2fe7be7b..5271ecf2 100644
--- a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
@@ -5,17 +5,14 @@
       <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
       </saml: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">ltu.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet ny</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lulea University of Technology new</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lulea University of Technology</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
@@ -194,8 +191,8 @@ ZdLXjuEF1cFQB3AAK9PIEmkLc69IXjPQ
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">LTU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet ny</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Lulea University of Technology new</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Lulea University of Technology</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
index 813f3965..abdcb4ca 100644
--- a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
@@ -1,18 +1,21 @@
 <?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://shibbo.ltu.se/idp/shibboleth">
   <Extensions>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
       </saml: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">ltu.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lulea University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet gammal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lulea University of Technology old</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
@@ -97,8 +100,8 @@ B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">LTU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Lulea University of Technology</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet gammal</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Lulea University of Technology old</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 6b8a2356..62cc8e2d 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -11,7 +11,6 @@
   <xi:include href="swamid-2.0/idp.mah.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.liu.se-idp-shibboleth.xml"/>  
-  <xi:include href="swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hkr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.it.su.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
@@ -49,4 +48,5 @@
   <xi:include href="swamid-2.0/login.fhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hj.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.ltu.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 808432af..2707d5cf 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -17,5 +17,5 @@
   <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.ltu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3