Swapped idp.kkh.se and idp2.kkh.se

4 files changed, 15 insertions, 15 deletions

diff --git a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
index df08212c..0c1858ff 100644
--- a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
@@ -6,13 +6,18 @@
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
       </saml:Attribute>
     </attr:EntityAttributes>
+    <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">kkh.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungl. Konsthögskolan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Royal Institute of Art</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Kungl. Konsthögskolan - Old</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Royal Institute of Art - Old</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Kungl. Konsthögskolan (KKH)</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for the Royal Institute of Art (KKH)</mdui:Description>
         <mdui:Keywords xml:lang="sv">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
@@ -99,8 +104,8 @@ qowogArC+4U1+wcq4ctUoM0Lyh5YaTMs4U31GcmYAotsLw+sY97V0WGQKffURz4f
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KKH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Royal Institute of Art</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan - Old</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Royal Institute of Art - Old</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kkh.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
index a953ce68..0b1cebfe 100644
--- a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
@@ -6,18 +6,13 @@
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
       </saml:Attribute>
     </attr:EntityAttributes>
-    <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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
       <shibmd:Scope regexp="false">kkh.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Kungl. Konsthögskolan - New</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Royal Institute of Art - New</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Kungl. Konsthögskolan</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Royal Institute of Art</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Kungl. Konsthögskolan (KKH)</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for the Royal Institute of Art (KKH)</mdui:Description>
         <mdui:Logo height="110" width="404">https://idp2.kkh.se/idp/images/kkh.png</mdui:Logo>
@@ -207,8 +202,8 @@ R/BU8rcOeQ5KU1e3ooJqSzIKBhWce80g4TaX1u1rYibKqkSUwgp1Jh2MSnKN0B8c
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KKH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan - New</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Royal Institute of Art - New</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Royal Institute of Art</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kkh.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index e306f76e..dd75bada 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -28,7 +28,7 @@
   <xi:include href="swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.idp.eduid.se-idp.xml"/>
   <xi:include href="swamid-2.0/idp3.sics.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.kkh.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp2.kkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idpv3.lu.se-idp-shibboleth.xml"/>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 4be49acc..56d9e8f9 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -16,5 +16,5 @@
   <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp2.kkh.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.kkh.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>