SWAMID-1348: Updated www.diva-portal.org

1 files changed, 109 insertions, 3 deletions

diff --git a/swamid-2.0/www.diva-portal.org-shibboleth.xml b/swamid-2.0/www.diva-portal.org-shibboleth.xml
index c88a096b..77a5f2a8 100644
--- a/swamid-2.0/www.diva-portal.org-shibboleth.xml
+++ b/swamid-2.0/www.diva-portal.org-shibboleth.xml
@@ -7,13 +7,91 @@
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor>
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">DiVA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">DiVA is a digital publishing system that enables universities, university colleges, research authorities and institutes to collect and make publications available.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://info.diva-portal.org/?languageId=1</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">DiVA</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://info.diva-portal.org/?languageId=3</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">DiVA är ett digitalt publiceringssystem som gör det möjligt för universitet, högskolor, forskande myndigheter och institut att samla och tillgängliggöra publikationer för omvärlden.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.uu.se/en/about-uu/data-protection-policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.uu.se/om-uu/dataskyddspolicy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFMzCCAxugAwIBAgIUKosJ7B0h/Fm02kMuPO4A6xav3TEwDQYJKoZIhvcNAQEL
+BQAwHjEcMBoGA1UEAxMTd3d3LmRpdmEtcG9ydGFsLm9yZzAeFw0yMjA5MjAxMzAx
+NDJaFw0zMjA5MTcxMzAxNDJaMB4xHDAaBgNVBAMTE3d3dy5kaXZhLXBvcnRhbC5v
+cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9XqrlCg03ZthKzxKP
+iXSnU7xrip/ApOz+/slC6hsfT5z3jYBmao32XrbBIdIXYCgp10PuDeWnduI31zXS
+npxieZnYyRbP1CDBUQtJ3CYvxusxwkZVh2sXaKzvUGSSTpC8HYffvIDqBWmymnUi
+P+CF5KmmsExKTJev7qL/EGuJUCGoNlwRRep34TDrbFXfbSHQN4tfaQiXwS4r+geg
+rxKUQFKxROYS4m5JAVe/Nan76AZ5x2+X7hXXn2tUWNPrAif61WwSlauR9TZzQlI9
+P1lcVOoCKSDQZjYGkqNCYkdt4tKzImBygyfRFUqtr8liA9Rz7LuezdAi2/aMEptm
+0aqnTzMmZvw6S/VGN5s5yevz/J+muke1PFgU2MJdvpVGP1Qv1RCcQDs9sdvFKPXq
+GM7pf3LO+WtjIiwONbNl/U8QK/fG3eCAb2yGasV5ccWgmN9Hg353VVEbwOsZaLG0
+z0+0/hho3syegAJocvLQqPSIc21UUmHzk36j4IK/QWttuWo1p8qB3T7anduh6nl0
+4AX8mm0mxD8wKPG7C3fiFkjv4Qxmv+h0RM1ce9ZkvxhZIbYkioKp1kFGW/H8VzIt
+Hcq3CkVpAyCSCTSTQ5SNylbp9hcBHbTBIm/IUeaohbOQMcOJTpntzsQNtO2QWxJy
+RebAiCmJ7Hv3jJgiomAGuvFBxQIDAQABo2kwZzBGBgNVHREEPzA9ghN3d3cuZGl2
+YS1wb3J0YWwub3JnhiZodHRwczovL3d3dy5kaXZhLXBvcnRhbC5vcmcvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUZa38EoQqZLjgsDZ1Bv9EilMzbrAwDQYJKoZIhvcNAQEL
+BQADggIBALfqkEskmqajr5aocOyPWcjfExtBtRQafWFB9+CpR0/cZ1BL/0l/dR73
+gQhGA12nwFB8p9X6S0Wx5H/nOXQqto+iim0Hij9quWiBdGmzx2lMi1+bIF1l1KVg
+qqtlF3Kpp+Nazt9AKenbvLju8YnGFkyxremZc+h4cXHV1H2zsGgvqWwyKYAuEQiN
+mm53adPrisJzrtcptqwv2G7s4Z3U6R8b4GAwjQH1grFhWtdRPLJtZoH9jd29W22N
+bui5oxypEq6nKRZ1FGSF0LHd9eNX4gUoFu9QwiL3+8xbxmJPqq4YB/KVqSprasSV
+LN8QBSDhSvpnYiJcpAzMkoTVbn7K/Yt7tAIY1ko2KkX/g11KwGpLBmKi0fSbc85s
+jVySrGmg8OMowIyjizKmAa7XDMN4xr6kUPeLTajIDV9Gd/HSA+kLapeZYK7wAge3
+YWrnWAKqGgPy8ZXAf4Q0Nia3z2kRMyq6EZEp7DcMouNJ0EENLwpnTqp1WEwCw8sP
+wo28L58V0VKEilJrd4iPg6E8p02k0Urme4ZbO1l2syU7gspW6dJ/CiZLwZ4rJm3B
+zeo+6Ilq+VwuNquhadcLXwxqsUoEcnBsKwVnOhBPhuC1BfV4e98I+pKGKiByKSCg
+g1mJ191gMpUo/vm0J69cayD35SPubPlhgaHWNJKK8w2ni/8bQayH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFMzCCAxugAwIBAgIUUHdYtBUuDD5JjsYVSKoaE9oVDakwDQYJKoZIhvcNAQEL
+BQAwHjEcMBoGA1UEAxMTd3d3LmRpdmEtcG9ydGFsLm9yZzAeFw0yMjA5MjAxMzAx
+NTNaFw0zMjA5MTcxMzAxNTNaMB4xHDAaBgNVBAMTE3d3dy5kaXZhLXBvcnRhbC5v
+cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDVg2pZag2+FIS4O1MY
+bXyTtTRnD8aSsbSU5iyPVJa4XCYYe7nULT7UHw4OyGbm0apIuTYsBPcpAE82cLZe
+UKEWP4+gOEjUkpOwYPZIkVaGZPOALFdPDmDX7Rq185T0aMiOQAhE6pSxJsu4eflY
+nIeuGLA8WhmKr4cAu94KXCiC76nHgeW1/FpVkZhul4nnmWDF0bfKbkFev7RX4f7F
+9cyGQLZICUQUTxewW47IJBFNLp7uTEzlo536Hw5q3BbmlSef3sFix2qDGPkNjefs
+e1CmrjGSptSiPbLFszPdF6Ur/0DrtNupvxeJYQaRnVzVb7SvfX0BJGjaDfpRK5yh
+R4uRjws8YQG7CfxGrJqfuDe8qJsenFOgWPxx4zNZT5FLHW3wb09mOtSOwppROIkD
+BNLvevU1ux4L99NwYnm6hkmI5CO3QFUNnXT6IXKOS1/ilCWt9uolZ1BhBGuub8ZX
++Qfsd+D5prNSUUogLhPDZfat2P73Zcx3yYllY9Ieds2YOKYj6FhNjAetCZ0bp5+0
+fFVL9BOagQiul/XT8sQUhELKk3Fc1FquLb+V6RBzBdH0xOHBjQW7OrQu3b+UlIq0
+REoyaBWD/FuW/9oL+T99+xRIGQ89lKjx+77+kfMUgdVgySaFK5wFy5Vq2thLKrRm
+JdSJAmKTMhiQfwknfTMwNWBbfwIDAQABo2kwZzBGBgNVHREEPzA9ghN3d3cuZGl2
+YS1wb3J0YWwub3JnhiZodHRwczovL3d3dy5kaXZhLXBvcnRhbC5vcmcvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQU4GLbiRvlRdMpGi5eCiN5ywdRR4wwDQYJKoZIhvcNAQEL
+BQADggIBAEjby93ab2xMsChRoPwHgplYXBIEnJRjqKnjdr8FzWW8oj1XCUdZrJBy
+fh5guLCTYO7QqmJavVmqibV6vFvZxXZa3gq4Uuc0PeZp63vvVuUHONSyb4+J4IME
+RdCr27P3NYC03Qewdnmy7vxEhWv3zS4eeXPS+8mCOQxll/XE3mcfF3TrDClgvGT8
+LR7xIL2Co9tyBXCkDKReZQX5r2Z3RShZaqlLaXnXG3wK9ra1ZCVBSVvr7VjhTYim
+5TArTC5o8u50j+GyePJZF/BLSlYavJYCanrF5PopFq3k3S520fu9k+9D1VFCXnUK
+M4LK8wOfJhaLT6alLyKTiYQJTjRNrT+7NA0s+2wNau2VUO9sk+8NhCP97jeWdzts
++vMR/RUVXs9MRCTPgSMNRCJIEQOlfW6ZFMtGOfuccYRHF0/jpV5D1AJWH0gg7xtK
+aCZ8Q69WHrtNeANP1q9vytZ7FRhqz0p1ctl+AdSmQskfTbPcaPt/MbA/Av4SjMkX
+GPGHr5NqVNXVUk9iLNS2AdnWedj2KNu29oyyLHb2OXN0a2T3J8bv+nSLWGeUfYK3
+0E4T8OeEUwaD+ZSJKhXQxOWFqs7BY2FTr2rkWr0nX8Z7yu9tTW0+Ogd27xt9sq6N
+yj0HUlH7EakBBU7CWa6jN7NP5c6LFp6KUVbkGapusrzZqP6jLNDW</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:KeyName>www.diva-portal.org</ds:KeyName>
         <ds:X509Data>
@@ -54,7 +132,9 @@ yIS81g==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.diva-portal.org/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">DiVA</md:ServiceName>
+      <md:ServiceName xml:lang="sv">DiVA</md:ServiceName>
       <md:ServiceDescription xml:lang="en">DiVA – Academic Archive Online - is a system for electronic publishing and for registering publications produced by researchers, teachers and students. Uppsala University Library develops and maintains DiVA.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">DiVA – Digitala Vetenskapliga Arkivet - är ett system för elektronisk publicering och för registrering av publikationer producerad av forskare, lärare och studenter. Uppsala Universitetsbibliotek utvecklar och underhåller DiVA.</md:ServiceDescription>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
@@ -63,4 +143,30 @@ yIS81g==
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Uppsala Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.uu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.uu.se/en/?languageId=1</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Palle</md:GivenName>
+    <md:SurName>Raabjerg</md:SurName>
+    <md:EmailAddress>mailto:palle.raabjerg@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:diva-support@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eva</md:GivenName>
+    <md:SurName>Agius</md:SurName>
+    <md:EmailAddress>mailto:eva.agius@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Palle</md:GivenName>
+    <md:SurName>Raabjerg</md:SurName>
+    <md:EmailAddress>mailto:palle.raabjerg@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>