--- ACOnet/https%3A%2F%2Fsp.ukp.informatik.tu-darmstadt.de%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Fsp.ukp.informatik.tu-darmstadt.de%2Fshibboleth.xml
@@ -1,33 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.ukp.informatik.tu-darmstadt.de/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2020-10-27T22:17:55Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
+      </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://refeds.org/category/research-and-scholarship</AttributeValue>
+      </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>
       </Attribute>
-      <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:profiles:subject-id:req" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <AttributeValue>none</AttributeValue>
-      </Attribute>
     </EntityAttributes>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
+      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="en">INCEpTION - Community Server</DisplayName>
+        <Description xml:lang="en">A semantic annotation platform offering intelligent annotation assistance and knowledge management.</Description>
+        <DisplayName xml:lang="de">INCEpTION - Community Server</DisplayName>
+        <Description xml:lang="de">Eine semantische Annotationsplattform mit intelligenter Annotationshilfe und Wissensmanagement.</Description>
+        <InformationURL xml:lang="en">https://inception-project.github.io/</InformationURL>
+        <Logo height="239" width="239">https://inception-project.github.io//assets/img/logo.png</Logo>
+        <Keywords xml:lang="en">INCEpTION annotation</Keywords>
+        <PrivacyStatementURL xml:lang="en">https://sp.ukp.informatik.tu-darmstadt.de/privacy/privacy_statement.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://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/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://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/Login" index="1"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">INCEpTION - Community Server</DisplayName>
-        <DisplayName xml:lang="en">INCEpTION - Community Server</DisplayName>
-        <Description xml:lang="de">Eine semantische Annotationsplattform mit intelligenter Annotationshilfe und Wissensmanagement.</Description>
-        <Description xml:lang="en">A semantic annotation platform offering intelligent annotation assistance and knowledge management.</Description>
-        <InformationURL xml:lang="en">https://inception-project.github.io/</InformationURL>
-        <Logo height="239" width="239">https://inception-project.github.io//assets/img/logo.png</Logo>
-        <PrivacyStatementURL xml:lang="en">https://sp.ukp.informatik.tu-darmstadt.de/privacy/privacy_statement.html</PrivacyStatementURL>
-      </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -37,37 +52,49 @@
           <X509Certificate>MIIEKjCCApKgAwIBAgIJAN8spGrtAZIaMA0GCSqGSIb3DQEBCwUAMCwxKjAoBgNV BAMTIXNwLnVrcC5pbmZvcm1hdGlrLnR1LWRhcm1zdGFkdC5kZTAeFw0yMDA1MjYw ODM3MDlaFw0zMDA1MjQwODM3MDlaMCwxKjAoBgNVBAMTIXNwLnVrcC5pbmZvcm1h dGlrLnR1LWRhcm1zdGFkdC5kZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC ggGBANrArt2hxKqw7qBFtPcV5aeyJJ+JFLBkAjW1QVrAgzd5w9NaAKmkHYF1J4DI pvtrBqlFb61fY5z7R9qgGCZ37kFL4J+0l4tH/X96+3wFMOlN1doJ8NHHpKxIe8Kp 52x4CUZJYIVShtdIQa62+iNdh52xTnPEPt+/iVJ6nOJgiJ+y1bbe0UjuziOEXb5o RwSmtvdmcKkb4fy0skfKSq/YQLl8rMwUvWZOAuAsrwAz5qU7w8w32jcns+Z/2N6d tU5ixYIMd0wDrX7MRzILis4QbJeXVIB+giTpSrw+c75KYjAqWD4Oiv8HVJDJhq02 qaP8dfNOCbr6/digaXnCvK1EMogd0GxtZyIx11qAykcTcULm3eXJOTSGUV6NwUtZ pxwndTC/pVlt8phtv5KHxkORCIMIwxqUBZI/n76dTIFw3y8XiJYo/K8guPHLA+95 6uu1cIaFcD+GFl40wym+Z+UJFVxFZIayYLffkyYuELNnwH1vvcCqVnr176Zvx6tQ 92f38wIDAQABo08wTTAsBgNVHREEJTAjgiFzcC51a3AuaW5mb3JtYXRpay50dS1k YXJtc3RhZHQuZGUwHQYDVR0OBBYEFK5oY/E5oeyx1knXu5y422d54MqFMA0GCSqG SIb3DQEBCwUAA4IBgQAWx8qbmjcJEn2b763M1SdgSG66zBeHxNh2cKuwT4Vumc89 sxBRdTKiv5x3M8rHYQhNHypm1NXUD4bcsxCXd2V+0+uclnKur5Dny//N9kda0+eu QuV22TjZTkFDAicq2c0BowMhMXclZ/knELrAcRor56dAXkICbCvoB6W4iVy2wv3c aTVsKv23OkXGkRy1WYj2Dq4h9Gpg//iORWiSJa4aztYRBcizPMd0VO3N8ExFfY6s IpxVDmXP1gUHeItQyM54uXeEKB1rhm+nxosjE5zCtVLNZMk58BW51itsu9xSFGWc HC04Tmehtu3V0Tl3HfN+mFlrDJk5vZmtIxOETZE5nhIDcrtLfCNK6uwr0MYuk6aF JOM536OX2phY0uAQ8AeKpRj69sk3pVFmATR7NjmctG5xVjaAgfPkkPFkr+8mGm1z b8eNceLGZcokji+oFAtS/ylUdlVs6EClsE8p4wbDwMjCscW4LZVxVjjk63Ni6L7N hbgoAkKNoGInonEEw2Y=</X509Certificate>
         </X509Data>
       </KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-sp.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-sp.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-sp.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-sp.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://resource_a.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://resource_a.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://resource_a.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://resource_a.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web_app_b.clarin.eu/Shibboleth.sso/SAML2/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://web_app_b.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web_app_b.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://web_app_b.clarin.eu/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-sp.clarin.eu/Shibboleth.sso/SAML2/POST" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-sp.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-sp.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="11"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-sp.clarin.eu/Shibboleth.sso/SAML2/ECP" index="12"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SAML2/POST" index="13"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SAML2/Artifact" index="15"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.ukp.informatik.tu-darmstadt.de/Shibboleth.sso/SAML2/ECP" index="16"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">INCEpTION - Community Server</ServiceName>
       <ServiceName xml:lang="en">INCEpTION - Community Server</ServiceName>
-      <ServiceDescription xml:lang="de">Eine semantische Annotationsplattform mit intelligenter Annotationshilfe und Wissensmanagement.</ServiceDescription>
-      <ServiceDescription xml:lang="en">A semantic annotation platform offering intelligent annotation assistance and knowledge management.</ServiceDescription>
+      <ServiceDescription xml:lang="en">INCEpTION provides a semantic annotation platform offering intelligent annotation assistance and knowledge management.</ServiceDescription>
+      <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="true"/>
-      <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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="de">e459</OrganizationName>
-    <OrganizationName xml:lang="en">e459</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://clarin.eu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://clarin.eu</OrganizationURL>
+    <OrganizationName xml:lang="en">TU Darmstadt UKP</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UKP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.informatik.tu-darmstadt.de/ukp/ukp_home/index.en.jsp</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <GivenName>Jan-Christoph</GivenName>