--- SURFconext/https%3A%2F%2Ftekstlab.uio.no%2Fglossa2%2Fsaml%2Fmetadata.xml
+++ CLARIN IdP/https%3A%2F%2Ftekstlab.uio.no%2Fglossa2%2Fsaml%2Fmetadata.xml
@@ -1,54 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" cacheDuration="PT86400S" entityID="https://tekstlab.uio.no/glossa2/saml/metadata" validUntil="2025-04-16T00:10:02.222006Z">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tekstlab.uio.no/glossa2/saml/metadata">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de">
-      <RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/fileadmin/documents/mrps_dfn-aai_1.0.pdf</RegistrationPolicy>
-    </RegistrationInfo>
+    <EntityAttributes xmlns="urn:oasis:names:tc:SAML:metadata:attribute">
+      <Attribute xmlns="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">
+        <AttributeValue>http://clarin.eu/category/clarin-member</AttributeValue>
+        <AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
+        <AttributeValue>http://refeds.org/category/research-and-scholarship</AttributeValue>
+      </Attribute>
+    </EntityAttributes>
   </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
         <DisplayName xml:lang="en">The Glossa corpus search system</DisplayName>
-        <DisplayName xml:lang="nl">The Glossa corpus search system</DisplayName>
+        <DisplayName xml:lang="de">Das Glossa-Korpus-Suchsystem</DisplayName>
+        <DisplayName xml:lang="fi">Glossa corpus -hakujärjestelmä</DisplayName>
         <Description xml:lang="en">Glossa is a tool for researchers who want to search linguistically annotated corpora</Description>
-        <Description xml:lang="nl">Glossa is a tool for researchers who want to search linguistically annotated corpora</Description>
-        <Logo height="160" width="200" xml:lang="en">https://static.surfconext.nl/media/sp/clarino_duo-180.png</Logo>
+        <Description xml:lang="de">Glossa ist ein Werkzeug für Forscher, die linguistisch kommentierte Corpora suchen wollen</Description>
+        <Description xml:lang="fi">Glossa on työkalu tutkijoille, jotka haluavat etsiä kielellisesti merkityt korpukset</Description>
+        <Logo height="83" width="300">https://repo.clarino.uib.no/xmlui/themes/CLARINO/images/lindat/clarino-logo.png</Logo>
+        <InformationURL xml:lang="en">http://www.hf.uio.no/iln/english/about/organization/text-laboratory/news-events/2013/glossa/index.html</InformationURL>
         <PrivacyStatementURL xml:lang="en">http://www.tekstlab.uio.no/clarino/privacy-policy.html</PrivacyStatementURL>
       </UIInfo>
+      <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://tekstlab.uio.no/glossa2/saml/login"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tekstlab.uio.no/glossa2/saml/login" index="1"/>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>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</X509Certificate>
+          <X509Certificate>MIID/zCCAmegAwIBAgIUN2aPzI61PzGB/qtNXn9ZlgjBan0wDQYJKoZIhvcNAQEL BQAwGjEYMBYGA1UEAxMPdGVrc3RsYWIudWlvLm5vMB4XDTIyMDMwMTEyMzkzNloX DTI3MDMyNTEyMzkzNlowGjEYMBYGA1UEAxMPdGVrc3RsYWIudWlvLm5vMIIBojAN BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAuwLtLYuH4VqY4Bcw5C4MERrEoprA wRT6j+Kc/L5ur1lAKHHRXmTF1fd1FtaBq2RNBgPy5OBf1i7gHVPsf4LCzafAcdPU vQzwCD+LqPbvFBocng//7xTpIOlQ2tkFoLBQv02OAjWZe1oJYp+o3SeiKfXBciIu NPzdkgCoZnttHN73aUt3PMKdVv9T/jPBvVHga4vGjv77jTTV/P+MaFaRCK788l2t MX1NpN5atlTUpPmzlBGZVTEEgQK9PNGESho4HwIA3ikIkTfYQ9FsgP+H3tnSYMj1 6KRrqsy3L02oOLV/HODCh6P787WQ0LZTW6XsiOGyy1+6RF4cRtv0k+4f48V+Q6dt jmg8Dn9P00jU1M4e2+MkYk+BGHBfPpPRYv5Eh5xjoNtKqiKcWWg0KO6zybBQhqu5 9sjvuEXVIvsfdd7hz+r0ZqNrAvBSHQA0dckBgRStx4r0JcEbzvmLbQ4nx2a/0KcA meB5C92f3n1WJX1SRUXB31Czfp/lVHBGQMaFAgMBAAGjPTA7MBoGA1UdEQQTMBGC D3Rla3N0bGFiLnVpby5ubzAdBgNVHQ4EFgQU2Ve7mvFEvcg6nUiE7C4xk3CPQNEw DQYJKoZIhvcNAQELBQADggGBAJDL8geNJcMbnh9O3V0QLhumrY0eeH0HHYy+2gGr esSoJsu82pFzTepZ92EjcLMsBE+Kn7rrkevy8OS4gTXq5lqK++iIaFhIq7hyok4O 4ch8L2NKSwwc2L/M5vbyb6Z49RftAOMuI89imMu6Ah8R03D9Cj8WeX7QN08JwrE9 /CUtYH3XHKPb4pyZBhNhCAZDIHC1oWuxzgrVSEpcSBu4zcXOakkBS8IWJboyDhF9 Cm1OupqQjZv4lOCgTyD9Bw8rZeRQK6evmIGAzzVWRYCpQwy6WeqsJqfvsmBi4+Id KqgJ8pGthM49v5weFFo5Yv/yv7Ny579u/QBQWxdtZjLxoEwZXV4OS8RAISZTYW7u Yuf6C4J9kgMI6Bg4yPw3pV8XpkjK5IchvtdFxs4z992iTepx8Vk17gZ3QKXsKyd5 L+H3EzjANf70aCLjlSubdtPaTlpd+97NcAZWnOnEEGGhkF8a23edE+9HBoLTX9Q/ BOrnH5xWGXYhKg9/e+cv5nMTpw==</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>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</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tekstlab.uio.no/glossa2/saml/logout"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tekstlab.uio.no/glossa2/saml/auth" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">The Glossa corpus search system</ServiceName>
-      <ServiceName xml:lang="nl">The Glossa corpus search system</ServiceName>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Glossa, the corpus search and results handling system at the University of Oslo</ServiceName>
       <ServiceDescription xml:lang="en">Glossa is a tool for researchers who want to search linguistically annotated corpora</ServiceDescription>
-      <ServiceDescription xml:lang="nl">Glossa is a tool for researchers who want to search linguistically annotated corpora</ServiceDescription>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:displayName"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonTargetedID"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:mail"/>
+      <RequestedAttribute FriendlyName="edupersontargetedid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="edupersonprincipalname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="displayname" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">University of Oslo</OrganizationName>
-    <OrganizationName xml:lang="nl">University of Oslo</OrganizationName>
     <OrganizationDisplayName xml:lang="en">University of Oslo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="nl">University of Oslo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://clarin.eu</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uio.no/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <GivenName>Anders</GivenName>
@@ -65,5 +63,4 @@
     <SurName>Hagen</SurName>
     <EmailAddress>mailto:kristin.hagen@iln.uio.no</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical"/>
 </EntityDescriptor>