Resolves SWAMIDOPS-8226

2 files changed, 13 insertions, 13 deletions

diff --git a/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml b/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
index 474400ce..7fb52385 100644
--- a/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
@@ -5,18 +5,15 @@
       <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 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">miun.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Mittuniversitetet PRODTEST</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Mittuniversitetet</mdui:DisplayName>
         <mdui:Description xml:lang="sv">IDP på Mittuniversitetet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Mid Sweden University PRODTEST</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Mid Sweden University</mdui:DisplayName>
         <mdui:Description xml:lang="en">IDP at Mid Sweden University</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
@@ -199,8 +196,8 @@ B9F/wgJ22q78SOeLzik0JTCya18K9vjuod/q7n5tM1zDi/pDyT2Fy/s+pw==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">MIUN</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Mittuniversitetet PRODTEST</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Mid Sweden University PRODTEST</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Mittuniversitetet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Mid Sweden University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
index 1a5ab5b5..f1d4aa91 100644
--- a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/vmidgw3.miun.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://vmidgw3.miun.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 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">miun.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Mittuniversitetet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Mid Sweden University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Mittuniversitetet OLD</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Mid Sweden University OLD</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter hos Mittuniversitetet</mdui:Description>
         <mdui:Description xml:lang="en">Mid Sweden University Identity Provider, used by employees and students at Mid Sweden University</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
@@ -102,8 +105,8 @@ I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">MIUN</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Mittuniversitetet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Mid Sweden University</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Mittuniversitetet OLD</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Mid Sweden University OLD</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">