From 09b67e014168a2b74314ede953914eea03c836f2 Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Tue, 3 Sep 2013 14:30:35 +0200
Subject: nu är det inlagt! SWAMIDOPS-6937
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 swamid-2.0/idp.kva.se-idp-shibboleth.xml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
index cc83ca2c..71a0aca7 100644
--- a/swamid-2.0/idp.kva.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
@@ -4,11 +4,16 @@
     <Extensions>
       <shibmd:Scope regexp="false">kva.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Vetenskapsakademin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Kungliga Vetenskapsakademien</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">The Royal Swedish Academy of Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungliga Vetenskapsakademin</mdui:Description>
+        <mdui:Description xml:lang="sv">Identity Provider för Kungliga Vetenskapsakademien</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for the Royal Swedish Academy of Sciences</mdui:Description>
+        <mdui:Logo height="78" width="179">https://idp.kva.se/idp/images/headerLogo.gif</mdui:Logo>
       </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kva.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:59.36542,18.05204</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
@@ -41,6 +46,7 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kva.se/idp/profile/Shibboleth/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kva.se/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kva.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -81,17 +87,16 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="sv">KVA</OrganizationName>
     <OrganizationName xml:lang="en">KVA</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga Vetenskapsakademin</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Kungliga vetenskapsakademien</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">The Royal Swedish Academy of Sciences</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.kva.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.kva.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <GivenName>Peter Jacobsson</GivenName>
+    <Company>kva.se</Company>
     <EmailAddress>peter.jacobsson@kva.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
-- 
cgit v1.2.3