Update 2 for SWAMIDOPS-8283

4 files changed, 10 insertions, 10 deletions

diff --git a/swamid-2.0/idp.hj.se-idp-shibboleth.xml b/swamid-2.0/idp.hj.se-idp-shibboleth.xml
index 16df7112..78cca542 100644
--- a/swamid-2.0/idp.hj.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hj.se-idp-shibboleth.xml
@@ -5,9 +5,6 @@
       <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">
diff --git a/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml b/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
index 0d381477..8bcd5f99 100644
--- a/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibb1.hj.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://shibb1.hj.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">hj.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Jönköping</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Jönköping - Old</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Jönköping University - Old</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Jönköping.</mdui:Description>
         <mdui:Description xml:lang="en">The Jönköping University Identity Provider is used by employees and students at the university.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://hj.se</mdui:InformationURL>
@@ -101,8 +104,8 @@ nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HJ</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Jönköping University</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping - Old</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Jönköping University - Old</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hj.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 5d6bc682..2e0340d9 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -16,7 +16,6 @@
   <xi:include href="swamid-2.0/idp.it.su.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-2.0/shibb1.hj.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kb.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index c8481af0..33679491 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -18,4 +18,5 @@
   <xi:include href="swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/shibb1.hj.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>