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

2 files changed, 17 insertions, 17 deletions

diff --git a/swamid-2.0/idp.lu.se-idp-shibboleth.xml b/swamid-2.0/idp.lu.se-idp-shibboleth.xml
index af8f038c..add64300 100644
--- a/swamid-2.0/idp.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.lu.se-idp-shibboleth.xml
@@ -10,16 +10,19 @@
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
+      <samlb:Attribute xmlns:samlb="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samlb:AttributeValue>http://refeds.org/category/hide-from-discovery</samlb:AttributeValue>
+      </samlb: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">lu.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lund University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitetstjänst för anställda och studenter vid Lunds universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Lund University</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Lunds universitet (Gammal)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lund University (Old)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Gammal IDP - Använd inte!</mdui:Description>
+        <mdui:Description xml:lang="en">Old IDP - do not use!</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
         <mdui:Logo xml:lang="sv" height="78" width="450">http://www2.ldc.lu.se/images/LU_swe_logo_450px.jpg</mdui:Logo>
@@ -107,8 +110,8 @@ u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">LU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Lunds universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Lunds universitet (Gammal)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Lund University (Old)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.lu.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml b/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
index 8a650f05..9ccf55aa 100644
--- a/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
@@ -10,23 +10,20 @@
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
-      <samlb:Attribute xmlns:samlb="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samlb:AttributeValue>http://refeds.org/category/hide-from-discovery</samlb:AttributeValue>
-      </samlb: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">lu.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Lunds universitet (IdP v3)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lund University (IdP v3)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Under produktionssättning - Använd inte!</mdui:Description>
-        <mdui:Description xml:lang="en">Installation in progress - do not use!</mdui:Description>
-        <mdui:Keywords xml:lang="sv">lu lth </mdui:Keywords>
-        <mdui:Keywords xml:lang="en">lu lth </mdui:Keywords>
+        <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lund University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identitetstjänst för anställda och studenter vid Lunds universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Lund University</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">lu lth </mdui:Keywords>
+        <mdui:Keywords xml:lang="en">lu lth </mdui:Keywords>
         <mdui:Logo height="78" width="450" xml:lang="sv">http://www2.ldc.lu.se/images/LU_swe_logo_450px.jpg</mdui:Logo>
         <mdui:Logo height="78" width="382" xml:lang="en">http://www2.ldc.lu.se/images/LU_eng_logo_382px.jpg</mdui:Logo>
       </mdui:UIInfo>
@@ -124,8 +121,8 @@ KE7aiSxYsHeCrgDI13bWgb/5xaYBMwJLDYj/KTIrtThku/WU8kDgEZtjcfCWCMiJ
   </IDPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">LU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Lunds universitet (IdP v3)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Lund University (IdP v3)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Lunds universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.lu.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">