urkund new entityID

1 files changed, 54 insertions, 57 deletions

diff --git a/swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml b/swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml
index 257d1aa9..aba87f03 100644
--- a/swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml
+++ b/swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml
@@ -1,21 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.lstonline.ac.uk/idp/pingfederate">
-  <!--
-		This is a PingFederate IdP for the London School of Theology.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-03T11:48:22Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <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://login.lstonline.ac.uk/idp/pingfederate">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-03T11:48:22Z">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    </md:Extensions>
+    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIFrTCCBJWgAwIBAgIDBoSbMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
 						MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
 						NTYgQ0EgLSBHMzAeFw0xNTA4MjUwNjUyMTlaFw0xNjA4MjcwMDQ2MzVaMIGZMRMw
@@ -48,23 +45,23 @@
 						phaCPMAtesAXAd5ck0aKucQrgU+Oyag/hPpHaUBuz8Z5vYDCF7AkSTPQyK0zt4lR
 						qG9o247BAjLhNj6N/rlcE2w=
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.lstonline.ac.uk:8443/idp/soap.ssaml1" index="0"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.lstonline.ac.uk/idp/isx.saml1"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.lstonline.ac.uk:8443/idp/soap.ssaml1" index="0"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
+      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.lstonline.ac.uk/idp/isx.saml1"/>
+    </md:IDPSSODescriptor>
+    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIFrTCCBJWgAwIBAgIDBoSbMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
 						MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
 						NTYgQ0EgLSBHMzAeFw0xNTA4MjUwNjUyMTlaFw0xNjA4MjcwMDQ2MzVaMIGZMRMw
@@ -97,25 +94,25 @@
 						phaCPMAtesAXAd5ck0aKucQrgU+Oyag/hPpHaUBuz8Z5vYDCF7AkSTPQyK0zt4lR
 						qG9o247BAjLhNj6N/rlcE2w=
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.lstonline.ac.uk:8443/idp/attrsvc.ssaml2"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.lstonline.ac.uk:8443/idp/soap.ssaml1"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">London School of Theology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London School of Theology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lst.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@lst.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@lst.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.lstonline.ac.uk:8443/idp/attrsvc.ssaml2"/>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.lstonline.ac.uk:8443/idp/soap.ssaml1"/>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">London School of Theology</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">London School of Theology</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.lst.ac.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Mike</md:GivenName>
+      <md:SurName>Taylor</md:SurName>
+      <md:EmailAddress>mailto:mike.taylor@lst.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Mike</md:GivenName>
+      <md:SurName>Taylor</md:SurName>
+      <md:EmailAddress>mailto:mike.taylor@lst.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>