urkund new entityID

1 files changed, 43 insertions, 46 deletions

diff --git a/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml b/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml
index 8db2b9e6..301bcb98 100644
--- a/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml
+++ b/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml
@@ -1,18 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://researchmonitor.euromonitor.com/web/oa/metadata">
-  <!--
-		This is a "Research Monitor (Live)" SP for Euromonitor International plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-29T12:09:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://researchmonitor.euromonitor.com/web/oa/metadata">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-29T12:09:13Z">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    </md:Extensions>
+    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIID0DCCArigAwIBAgIJAKS7WQdSWYPPMA0GCSqGSIb3DQEBBQUAME4xIjAgBgNV
 						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxKDAmBgNVBAMTH3Jlc2VhcmNo
 						bW9uaXRvci5ldXJvbW9uaXRvci5jb20wHhcNMTMxMTA3MDYxNTUyWhcNMjMxMTA1
@@ -35,13 +32,13 @@
 						welIK72JvRFuIH4129ibwKQ+aWdpAJjJJW1tFigKhbBkRW8TECZAvZoR93ipd4Un
 						rYW3RbTRG7qxLXlaiUzJzGuejm0=
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIID0DCCArigAwIBAgIJAKS7WQdSWYPPMA0GCSqGSIb3DQEBBQUAME4xIjAgBgNV
 						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxKDAmBgNVBAMTH3Jlc2VhcmNo
 						bW9uaXRvci5ldXJvbW9uaXRvci5jb20wHhcNMTMxMTA3MDYxNTUyWhcNMjMxMTA1
@@ -64,27 +61,27 @@
 						welIK72JvRFuIH4129ibwKQ+aWdpAJjJJW1tFigKhbBkRW8TECZAvZoR93ipd4Un
 						rYW3RbTRG7qxLXlaiUzJzGuejm0=
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Euromonitor International plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research Monitor (Live) - Euromonitor International</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jürgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jürgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/art" index="2"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/post" index="3"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/art" index="4"/>
+    </md:SPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">Euromonitor International plc</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">Research Monitor (Live) - Euromonitor International</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Jürgen</md:GivenName>
+      <md:SurName>Wiehan</md:SurName>
+      <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Jürgen</md:GivenName>
+      <md:SurName>Wiehan</md:SurName>
+      <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>