https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-2.0

1 files changed, 35 insertions, 61 deletions

diff --git a/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml b/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
index ba376973..690cd0ec 100644
--- a/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
+++ b/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
@@ -1,39 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sp.vs1.corpora.uni-hamburg.de">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-05-15T09:48:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sp.vs1.corpora.uni-hamburg.de">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Hamburger Zentrum für Sprachkorpora</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hamburg Centre for Language Corpora</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Das Hamburger Zentrum für Sprachkorpora bietet einen Zugang zum HZSK Repository, in dem hauptsächlich Sprachkorpora vorgehalten werden</mdui:Description>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Hampurin Kielivarakeskus (Hamburger Zentrum für Sprachkorpora)</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Hampurin Kielivarakeskus (HZSK) tarjoaa pääsyä HZSK-arkistoon. (Arkisto sisältää ennimäkseen puhutun kielen korpuksia.)</mdui:Description>
         <mdui:Description xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</mdui:Description>
-        <mdui:Logo height="23" width="153">https://corpora.uni-hamburg.de/drupal/sites/default/files/hzsk-logo-mittel.png</mdui:Logo>
         <mdui:Logo height="68" width="453">https://corpora.uni-hamburg.de/drupal/sites/default/files/hzsk-logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://corpora.uni-hamburg.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://corpora.uni-hamburg.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://corpora.uni-hamburg.de/drupal/en/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://corpora.uni-hamburg.de/drupal/en/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="fi">https://corpora.uni-hamburg.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://corpora.uni-hamburg.de/drupal/en/privacy-policy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vs1.corpora.uni-hamburg.de</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=vs1.corpora.uni-hamburg.de</ds:X509SubjectName>
           <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJANuIbKBKwh2kMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 BAMTGnZzMS5jb3Jwb3JhLnVuaS1oYW1idXJnLmRlMB4XDTE0MDUwNzEwMTUxMFoX
 DTI0MDUwNDEwMTUxMFowJTEjMCEGA1UEAxMadnMxLmNvcnBvcmEudW5pLWhhbWJ1
@@ -51,56 +37,44 @@ bZcS2wvGCENGebMueDwISTvvyGW3hUoA94K28T5WCr/WNPwDty3yBFvn/wboztZ0
 gQcIJWAcCh//HW4fi7LPZ9DG8OjiK00DinEqm901uznyK0e/NziN/5ExP1d3onxi
 k1oLIeAl0snOKGd1Cw2MfQYh7QaJdXpM2W3aG6UVLNbzjAvInTjMT6rVJIxxGSdE
 00Ev3tKPZ6iDZDjawwChLxAlfAby3JLylUJ4Lg/bh8/fY0SUFHAYpS8+ZPvdO6iR
-LPhJPdKT3mM=
-</ds:X509Certificate>
+LPhJPdKT3mM=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <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://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Hamburger Zentrum für Sprachkorpora</md:ServiceName>
-      <md:ServiceName xml:lang="en">Hamburg Centre for Language Corpora</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Das Hamburger Zentrum für Sprachkorpora bietet einen Zugang zum HZSK Repository, in dem hauptsächlich Sprachkorpora vorgehalten werden</md:ServiceDescription>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Hampurin Kielivarakeskus (Hamburger Zentrum für Sprachkorpora)</md:ServiceName>
+      <md:ServiceName xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Hampurin Kielivarakeskus (HZSK) tarjoaa paasya HZSK-arkistoon. (Arkisto sisaltaa ennimakseen puhutun kielen korpuksia.)</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</md:ServiceDescription>
-      <md: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"/>
-      <md: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="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md: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"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute 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" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Timm</md:GivenName>
     <md:SurName>Lehmberg</md:SurName>
     <md:EmailAddress>mailto:timm.lehmberg@uni-hamburg.de</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Hanna</md:GivenName>
-    <md:SurName>Hedeland</md:SurName>
-    <md:EmailAddress>mailto:hanna.hedeland@uni-hamburg.de</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>HZSK</md:GivenName>
-    <md:SurName>Support</md:SurName>
+    <md:GivenName>Timm</md:GivenName>
+    <md:SurName>Lehmberg</md:SurName>
     <md:EmailAddress>mailto:corpora@uni-hamburg.de</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>