Switch Shib2 and 3 IdPs for HV

4 files changed, 17 insertions, 10 deletions

diff --git a/swamid-2.0/idp.hv.se-idp-shibboleth.xml b/swamid-2.0/idp.hv.se-idp-shibboleth.xml
index ed54accf..15f4eeb1 100644
--- a/swamid-2.0/idp.hv.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hv.se-idp-shibboleth.xml
@@ -11,8 +11,8 @@
     <Extensions>
       <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan Väst ny</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University West new</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan Väst</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University West</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.hv.se</mdui:InformationURL>
@@ -199,8 +199,8 @@ UPUl28rgefbQLT1QQewXqiTPqg==
   <Organization>
     <OrganizationName xml:lang="sv">HV</OrganizationName>
     <OrganizationName xml:lang="en">HV</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan Väst ny</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University West new</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan Väst</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University West</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
   </Organization>
diff --git a/swamid-2.0/idp2.hv.se-idp-shibboleth.xml b/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
index 6e1227d3..aee524e7 100644
--- a/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.hv.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://idp2.hv.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 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">hv.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan Väst</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University West</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan Väst gammal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University West old</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.hv.se</mdui:InformationURL>
@@ -100,8 +107,8 @@ aRQKNbVQdPN5ht6TrINjDQ==
   <Organization>
     <OrganizationName xml:lang="sv">HV</OrganizationName>
     <OrganizationName xml:lang="en">HV</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan Väst</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University West</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan Väst gammal</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University West old</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
   </Organization>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 6da488e0..c03dd7db 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -23,7 +23,7 @@
   <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/>
   <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/idp2.hv.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.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"/>
   <xi:include href="swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml"/>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index f442c82d..a89cb50c 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -20,6 +20,6 @@
   <xi:include href="swamid-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.hv.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"/>
 </md:EntitiesDescriptor>