urkund new entityID

1 files changed, 101 insertions, 81 deletions

diff --git a/swamid-interfederations-2.0/sp.clarin.si-.xml b/swamid-interfederations-2.0/sp.clarin.si-.xml
index f5e8a199..f56642ad 100644
--- a/swamid-interfederations-2.0/sp.clarin.si-.xml
+++ b/swamid-interfederations-2.0/sp.clarin.si-.xml
@@ -1,83 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="https://sp.clarin.si/">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<?xml version="1.0"?>
+<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="https://sp.clarin.si/">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.clarin.si/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">CLARIN.SI Repository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CLARIN.SI Repository</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Digitaalinen arkisto ja CLARIN kielentutkimuspalveluja Jozef Stefan instituutissa</mdui:Description>
-        <mdui:Description xml:lang="en">CLARIN.SI: Digital repository and services of the CLARIN language research infrastructure, hosted at Jozef Stefan Institute</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.clarin.si/clarin_si_icon.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Slovenian Slovene digital repository language research corpora tools</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">http://www.clarin.si/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://www.clarin.si/privacy_policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.clarin.si/privacy_policy.html</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>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-15T16:24:11Z">
+        <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://clarin.eu/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:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAMF/Tdr8i9CuMA0GCSqGSIb3DQEBBQUAMA8xDTALBgN
-VBAMTBGZpZG8wHhcNMTQwNDI0MTAyODAyWhcNMjQwNDIxMTAyODAyWjAPMQ0wCw
-YDVQQDEwRmaWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAru0HR
-u+tqyjRI6Y07bMruUz39rZbESeIekqt7LFe3RuowbYwYuwZEC0wHwFSheDgV70Q
-/sDsyAKt7OSCH5seVHFE9bmWY2cXIATnsP90+ijPkdA/zXFoOvibeTqNwbIQ5qZ
-1cQ2edFL2tL2PVC9W0BFS/QYK79sdIHSS+7zwCWU5kMsrCKlJ2+3ZfQRTAaYBp5
-yYcm+BwzHW5euFN9nvAruagvSnEDI42PzpjeT+S4yPKxTEkj+w68kMnm6KFzW8K
-9aHt1N0SKKRrZYKwqPF3yDbLIhEDZPHwV23fXax6qfW//shIkhYzfs6xuaBOFI8
-6IgR11oM024XBCKg+gCAcQIDAQABozIwMDAPBgNVHREECDAGggRmaWRvMB0GA1U
-dDgQWBBSFK2aqnNGBq9YIqrRYWcx+P16fPDANBgkqhkiG9w0BAQUFAAOCAQEAPW
-auwmt3vKhbEMPdWMSltr7QzCnbwqrDDbI7e+oRJXlh/rfyYSshEWyF+9in+14In
-vK5Me9nL9jr4OIkjuceC5EbYhthkzoaFneYOJ9CFX5clvLKqSK7lWLl94YxJcvK
-7pcWPu3bb4thZ7LENHPrlaHEYWI7Gz0RiFi2Mk21S8S2aH0Av6yP0giylAK3RFQ
-klZD/WejQh5xGnEAEQtr4mtLzJO8yC8mQrT89tUNW7Uj6D84YO9q57BbdugNew7
-Zb90z359GqjMDZp4E2ZJZF5NWCFiPdJTBoNtMPngEHxcgYsDQefnJAk3YTKzkWX
-T/sqx8cRPLJXpYk+Xb2ywjVWg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.clarin.si/Shibboleth.sso/SLO/Redirect"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <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://www.clarin.si/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">CLARIN.SI Repository</md:ServiceName>
-      <md:ServiceName xml:lang="en">CLARIN.SI Repository</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Digitaalinen arkisto ja CLARIN kielentutkimuspalveluja Jozef Stefan instituutissa</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Digital repository and services of the CLARIN language research infrastructure, hosted at Jozef Stefan Institute</md:ServiceDescription>
-      <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:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
-      <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:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <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:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <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="administrative">
-    <md:GivenName>Tomaz Jona</md:GivenName>
-    <md:SurName>Erjavec</md:SurName>
-    <md:EmailAddress>mailto:repo-admin@clarin.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan Jona</md:GivenName>
-    <md:SurName>Javorsek</md:SurName>
-    <md:EmailAddress>mailto:repo-technical@clarin.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol 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://www.clarin.si/Shibboleth.sso/Login" index="1"/>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="de">CLARIN.SI Dienste</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="en">CLARIN.SI Repository</mdui:DisplayName>
+          <mdui:Description xml:lang="de">CLARIN.SI: digitale Langzeitarchiv und Dienste auf die Sprache konzentriert Forschungsinfrastruktur und CLARIN</mdui:Description>
+          <mdui:Description xml:lang="en">CLARIN.SI: Digital repository and services of the CLARIN language research infrastructure, hosted at Jožef Stefan Institute, Ljubljana, Slovenia</mdui:Description>
+          <mdui:Logo height="64" width="64">https://www.clarin.si/clarin_si_icon.png</mdui:Logo>
+          <mdui:InformationURL xml:lang="en">http://www.clarin.si/</mdui:InformationURL>
+          <mdui:PrivacyStatementURL xml:lang="en">https://www.clarin.si/privacy_policy.html</mdui:PrivacyStatementURL>
+        </mdui:UIInfo>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>fido</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=fido</ds:X509SubjectName>
+            <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAMF/Tdr8i9CuMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+BAMTBGZpZG8wHhcNMTQwNDI0MTAyODAyWhcNMjQwNDIxMTAyODAyWjAPMQ0wCwYD
+VQQDEwRmaWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAru0HRu+t
+qyjRI6Y07bMruUz39rZbESeIekqt7LFe3RuowbYwYuwZEC0wHwFSheDgV70Q/sDs
+yAKt7OSCH5seVHFE9bmWY2cXIATnsP90+ijPkdA/zXFoOvibeTqNwbIQ5qZ1cQ2e
+dFL2tL2PVC9W0BFS/QYK79sdIHSS+7zwCWU5kMsrCKlJ2+3ZfQRTAaYBp5yYcm+B
+wzHW5euFN9nvAruagvSnEDI42PzpjeT+S4yPKxTEkj+w68kMnm6KFzW8K9aHt1N0
+SKKRrZYKwqPF3yDbLIhEDZPHwV23fXax6qfW//shIkhYzfs6xuaBOFI86IgR11oM
+024XBCKg+gCAcQIDAQABozIwMDAPBgNVHREECDAGggRmaWRvMB0GA1UdDgQWBBSF
+K2aqnNGBq9YIqrRYWcx+P16fPDANBgkqhkiG9w0BAQUFAAOCAQEAPWauwmt3vKhb
+EMPdWMSltr7QzCnbwqrDDbI7e+oRJXlh/rfyYSshEWyF+9in+14InvK5Me9nL9jr
+4OIkjuceC5EbYhthkzoaFneYOJ9CFX5clvLKqSK7lWLl94YxJcvK7pcWPu3bb4th
+Z7LENHPrlaHEYWI7Gz0RiFi2Mk21S8S2aH0Av6yP0giylAK3RFQklZD/WejQh5xG
+nEAEQtr4mtLzJO8yC8mQrT89tUNW7Uj6D84YO9q57BbdugNew7Zb90z359GqjMDZ
+p4E2ZJZF5NWCFiPdJTBoNtMPngEHxcgYsDQefnJAk3YTKzkWXT/sqx8cRPLJXpYk
++Xb2ywjVWg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.clarin.si/Shibboleth.sso/SLO/SOAP"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.clarin.si/Shibboleth.sso/SLO/Redirect"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clarin.si/Shibboleth.sso/SLO/POST"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clarin.si/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: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://www.clarin.si/Shibboleth.sso/SAML2/POST" index="1"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.clarin.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clarin.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.clarin.si/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.clarin.si/Shibboleth.sso/SAML/POST" index="5"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.clarin.si/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <md:AttributeConsumingService index="1">
+        <md:ServiceName xml:lang="de">CLARIN.SI Dienste</md:ServiceName>
+        <md:ServiceName xml:lang="en">CLARIN.SI Repository</md:ServiceName>
+        <md:ServiceDescription xml:lang="de">CLARIN.SI: digitale Langzeitarchiv und Dienste auf die Sprache konzentriert Forschungsinfrastruktur und CLARIN</md:ServiceDescription>
+        <md:ServiceDescription xml:lang="en">CLARIN.SI: Digital repository and services of the CLARIN language research infrastructure, hosted at Jožef Stefan Institute, Ljubljana, Slovenia</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="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"/>
+        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      </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:Organization>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Jan Jona</md:GivenName>
+      <md:SurName>Javoršek</md:SurName>
+      <md:EmailAddress>mailto:repo-technical@clarin.si</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Jan Jona</md:GivenName>
+      <md:SurName>Javoršek</md:SurName>
+      <md:EmailAddress>mailto:repo-help@clarin.si</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="administrative">
+      <md:GivenName>Tomaž Jona</md:GivenName>
+      <md:SurName>Erjavec</md:SurName>
+      <md:EmailAddress>mailto:repo-admin@clarin.si</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>