1 files changed, 27 insertions, 30 deletions
diff --git a/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml
index c7090891..022a1470 100644
--- a/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iss-openathensla-runtime.swan.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Swansea University.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iss-openathensla-runtime.swan.ac.uk/oala/metadata">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-16T13:09:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </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>
+  </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">swan.ac.uk</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Swansea University</mdui:DisplayName>
         <mdui:Logo height="25" width="80">https://iss-openathensla-runtime.swan.ac.uk/oala/images/uk-federation-branding.png</mdui:Logo>
         <mdui:Logo height="16" width="16">https://iss-openathensla-runtime.swan.ac.uk/oala/images/swansea-university-icon.gif</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -45,23 +42,23 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://iss-openathensla-runtime.swan.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iss-openathensla-runtime.swan.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Swansea University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Swansea University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.swan.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nina</GivenName>
-    <SurName>Whitcombe</SurName>
-    <EmailAddress>mailto:N.Whitcombe@swansea.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Brown</SurName>
-    <EmailAddress>mailto:A.T.Brown@swansea.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://iss-openathensla-runtime.swan.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iss-openathensla-runtime.swan.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swansea University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swansea University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swan.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nina</md:GivenName>
+    <md:SurName>Whitcombe</md:SurName>
+    <md:EmailAddress>mailto:N.Whitcombe@swansea.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Brown</md:SurName>
+    <md:EmailAddress>mailto:A.T.Brown@swansea.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>