urkund new entityID

1 files changed, 71 insertions, 71 deletions

diff --git a/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
index dbdc8ead..70fb6f49 100644
--- a/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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://rir.dariah.eu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:20:49Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</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:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rir.dariah.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">RiR Suchportal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">RiR Search Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Relationen im Raum Suchportal</mdui:Description>
-        <mdui:Description xml:lang="en">Relationen im Raum Search Portal</mdui:Description>
-        <mdui:Logo height="48" width="48">https://dev2.dariah.eu/wiki/download/attachments/11468980/RIRPUB</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:20:49Z">
+        <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        </saml:Attribute>
+      </mdattr:EntityAttributes>
     </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>rir.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=rir.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIHFzfR3+HryTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+    <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://rir.dariah.eu/Shibboleth.sso/Login" index="1"/>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="de">RiR Suchportal</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="en">RiR Search Portal</mdui:DisplayName>
+          <mdui:Description xml:lang="de">Relationen im Raum Suchportal</mdui:Description>
+          <mdui:Description xml:lang="en">Relationen im Raum Search Portal</mdui:Description>
+          <mdui:Logo height="48" width="48">https://dev2.dariah.eu/wiki/download/attachments/11468980/RIRPUB</mdui:Logo>
+          <mdui:InformationURL xml:lang="de">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
+          <mdui:InformationURL xml:lang="en">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
+          <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+        </mdui:UIInfo>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>rir.dariah.eu</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=rir.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIHFzfR3+HryTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
 ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
 bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
@@ -64,43 +64,43 @@ oLD9C/n5AhDtBEBlw31Od3Lb624xDXOg4xLVn/I+egQWN0bu7ZbXLN3LFzFdNLMK
 TuWnKD0bEWbEYRR2MCx7Md1fKW7MlgMC6jFqpHlZAfb4GVWHdIW6DU/TaxM0KJ7V
 V88S++4/7Dd9Tp/NAtNfdv/hkVRV5yNyM5mIA3eYyrnr6RualuszsdzI
 </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">RiR Suchportal</md:ServiceName>
-      <md:ServiceName xml:lang="en">RiR Search Portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Relationen im Raum Suchportal</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Relationen im Raum Search Portal</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tamim</md:GivenName>
-    <md:SurName>Ziai</md:SurName>
-    <md:EmailAddress>mailto:tamim.ziai@daasi.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Dariah</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/POST"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <md:AttributeConsumingService index="1">
+        <md:ServiceName xml:lang="de">RiR Suchportal</md:ServiceName>
+        <md:ServiceName xml:lang="en">RiR Search Portal</md:ServiceName>
+        <md:ServiceDescription xml:lang="de">Relationen im Raum Suchportal</md:ServiceDescription>
+        <md:ServiceDescription xml:lang="en">Relationen im Raum Search Portal</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:AttributeConsumingService>
+    </md:SPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
+      <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
+      <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Tamim</md:GivenName>
+      <md:SurName>Ziai</md:SurName>
+      <md:EmailAddress>mailto:tamim.ziai@daasi.de</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Dariah</md:GivenName>
+      <md:SurName>Support</md:SurName>
+      <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>