urkund new entityID

1 files changed, 33 insertions, 36 deletions

diff --git a/swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml
index 45a80ff3..5b4b486d 100644
--- a/swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml
@@ -1,19 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.west-lothian.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for West Lothian College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">west-lothian.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://idp.west-lothian.ac.uk/shibboleth">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    </md:Extensions>
+    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">west-lothian.ac.uk</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -36,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/west-lothian.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/west-lothian.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">West Lothian College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.west-lothian.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/west-lothian.ac.uk/c/ukfed"/>
+      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/west-lothian.ac.uk/c/ukfed"/>
+    </md:IDPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">West Lothian College</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.west-lothian.ac.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Athens Helpdesk</md:GivenName>
+      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Athens Helpdesk</md:GivenName>
+      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>