Merge branch 'master' of md-master.swamid.se:swamid-metadata

2 files changed, 15 insertions, 15 deletions

diff --git a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
index 32e8c3c7..a6d5c4d5 100644
--- a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
+++ b/swamid-2.0/gihidentity01.ihs.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://gihidentity01.ihs.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">gih.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan - gammal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences - old</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identitetsutgivare för Gymnastik- och Idrottshögskolan vid Stockholms Stadion</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for The Swedish School of Sport and Health Sciences</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://gihidentity01.ihs.se/idp/Authn/UserPassword</mdui:InformationURL>
@@ -95,8 +102,8 @@ icptKTpDxrRjfCXibBT1
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">The Swedish School of sport and health sciences</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan - gammal</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences - old</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.gih.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp01.gih.se-idp-shibboleth.xml b/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
index 018dd598..45dddac6 100644
--- a/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp01.gih.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://idp01.gih.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: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">gih.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan - Ny</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences - New</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identitetsutgivare för Gymnastik- och Idrottshögskolan vid Stockholms Stadion</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for The Swedish School of Sport and Health Sciences</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.gih.se/</mdui:InformationURL>
@@ -194,8 +187,8 @@ MEsSqGHVIFzyCxPzfTl7HEhnSzXaKE07ShUemr6eig==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">The Swedish School of sport and health sciences</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan - Ny</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences - New</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.gih.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">