SWAMID-732 and SWAMID-733

1 files changed, 17 insertions, 11 deletions

diff --git a/swamid-2.0/adfs.ju.se-adfs-services-trust.xml b/swamid-2.0/adfs.ju.se-adfs-services-trust.xml
index d8abd5ae..1c882b36 100644
--- a/swamid-2.0/adfs.ju.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.ju.se-adfs-services-trust.xml
@@ -7,13 +7,16 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/hide-from-discovery</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
       </samla:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <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>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
@@ -21,8 +24,8 @@
       <mdui:UIInfo>
         <mdui:Description xml:lang="en">This service is used for login to services at Jönköping University.</mdui:Description>
         <mdui:Description xml:lang="sv">Denna applikation används för inloggning till tjänster hos Jönköping University.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Jönköping University - Login service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Jönköping University - Gemensam inloggningstjänst</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Jönköping University</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">http://ju.se/en/it-helpdesk.html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://ju.se/it-helpdesk.html</mdui:InformationURL>
         <mdui:Logo xml:lang="en" height="88" width="197">https://account.win.hj.se/JU_A_sv_Swamid.png</mdui:Logo>
@@ -52,7 +55,6 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.ju.se/adfs/ls/" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.ju.se/adfs/ls/" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.ju.se/adfs/ls/" index="2"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Jönköping University - Login service</md:ServiceName>
       <md:ServiceName xml:lang="sv">Jönköping University - Gemensam inloggningstjänst</md:ServiceName>
@@ -66,18 +68,22 @@
       <mdui:UIInfo>
         <mdui:Description xml:lang="en">The Jönköping University Identity Provider is used by employees and students at the university.</mdui:Description>
         <mdui:Description xml:lang="sv">Inloggningstjänst för anställda och studenter vid Jönköping University.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Jönköping University - ADFS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Jönköping University - ADFS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Jönköping University</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">http://ju.se/en.html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://ju.se</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="140" width="315">https://idp.hj.se/idp/images/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="140" width="315">https://idp.hj.se/idp/images/logo.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://ju.se/en/it-helpdesk/faq---manuals/my-user-account/other/joint-web-login-service.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://hj.se/it-helpdesk/faq---manualer/mitt-anvandarkonto/ovrigt/gemensam-inloggningstjanst.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://ju.se/it-helpdesk/faq---manualer/mitt-anvandarkonto/ovrigt/gemensam-inloggningstjanst.html</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="en" height="88" width="197">https://account.win.hj.se/JU_A_sv_Swamid.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="88" width="197">https://account.win.hj.se/JU_A_sv_Swamid.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">ju hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="sv">ju hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints>
+        <mdui:GeolocationHint>geo:57.7783,14.1633</mdui:GeolocationHint>
+        <mdui:DomainHint>hj.se</mdui:DomainHint>
+      </mdui:DiscoHints>
+      <mdui:DiscoHints>
         <mdui:DomainHint>hj.se</mdui:DomainHint>
         <mdui:GeolocationHint>geo:57.7783,14.1633</mdui:GeolocationHint>
       </mdui:DiscoHints>