urkund new entityID

1 files changed, 61 insertions, 64 deletions

diff --git a/swamid-interfederations-2.0/fsso.springer.com.xml b/swamid-interfederations-2.0/fsso.springer.com.xml
index 9f10c959..0df30c3c 100644
--- a/swamid-interfederations-2.0/fsso.springer.com.xml
+++ b/swamid-interfederations-2.0/fsso.springer.com.xml
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fsso.springer.com">
-  <!--
-		This is an OpenAM SP for Springer-Verlag London Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T13:02:11Z"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SpringerLink and Springer for R&amp;D</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SpringerLink and Springer for R&amp;D offer researchers access to millions of scientific documents.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <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://fsso.springer.com">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T13:02:11Z"/>
+    </md:Extensions>
+    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:Extensions>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">SpringerLink and Springer for R&amp;D</mdui:DisplayName>
+          <mdui:Description xml:lang="en">SpringerLink and Springer for R&amp;D offer researchers access to millions of scientific documents.</mdui:Description>
+        </mdui:UIInfo>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIEzjCCA7agAwIBAgIQSTO10tc2CKePQdrj2ZokxTANBgkqhkiG9w0BAQsFADB+
 						MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAd
 						BgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxLzAtBgNVBAMTJlN5bWFudGVj
@@ -44,13 +41,13 @@
 						AJuPmZRf2W2QL2kucvpSlxn1zIAfFDQinyURkCtXd8yZ9d0LhN8umWK8fOxRW+YT
 						1ZrkxbhipuVE/md7awxhE4WdLxWJPMBuudS4k/7/VajXkQ==
 					</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>
 						MIIEzjCCA7agAwIBAgIQSTO10tc2CKePQdrj2ZokxTANBgkqhkiG9w0BAQsFADB+
 						MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAd
 						BgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxLzAtBgNVBAMTJlN5bWFudGVj
@@ -78,41 +75,41 @@
 						AJuPmZRf2W2QL2kucvpSlxn1zIAfFDQinyURkCtXd8yZ9d0LhN8umWK8fOxRW+YT
 						1ZrkxbhipuVE/md7awxhE4WdLxWJPMBuudS4k/7/VajXkQ==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
-      </EncryptionMethod>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso.springer.com/federation/SPSloSoap/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fsso.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fsso.springer.com/federation/Consumer/ECP/metaAlias/SpringerServiceProvider" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Springer-Verlag London Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SpringerLink and Springer for R&amp;D (live)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://link.springer.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Springer Support</GivenName>
-    <EmailAddress>mailto:onlineservice@springer.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Platform Support</GivenName>
-    <EmailAddress>mailto:platformsupport@macmillan.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
+          <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        </md:EncryptionMethod>
+      </md:KeyDescriptor>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso.springer.com/federation/SPSloSoap/metaAlias/SpringerServiceProvider"/>
+      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider"/>
+      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider"/>
+      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider"/>
+      <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:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</md:NameIDFormat>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</md:NameIDFormat>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
+      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="0" isDefault="true"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fsso.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="1"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fsso.springer.com/federation/Consumer/ECP/metaAlias/SpringerServiceProvider" index="2"/>
+    </md:SPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">Springer-Verlag London Limited</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">SpringerLink and Springer for R&amp;D (live)</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://link.springer.com/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Springer Support</md:GivenName>
+      <md:EmailAddress>mailto:onlineservice@springer.com</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Platform Support</md:GivenName>
+      <md:EmailAddress>mailto:platformsupport@macmillan.com</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>