1 files changed, 40 insertions, 37 deletions
diff --git a/swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml
index 2827c214..acff96c2 100644
--- a/swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://access.procureweb.ac.uk/shibboleth-sp">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://access.procureweb.ac.uk/shibboleth-sp">
+  <!--
+		This is a "JISC Procureweb" Shibboleth SP for the JISC Services Management Company Ltd.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://access.procureweb.ac.uk/Shibboleth.sso/Login"/>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://access.procureweb.ac.uk/Shibboleth.sso/Login"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">JISC Services Management Company Ltd: JISC Procureweb</mdui:DisplayName>
         <mdui:Description xml:lang="en">JISC Procureweb, a procurement support service for the UK Higher and Further Education sectors</mdui:Description>
         <mdui:Logo height="128" width="233">https://www.procureweb.ac.uk/images/Procureweb_Logo2.jpg</mdui:Logo>
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -36,32 +39,32 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.procureweb.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">JISC Services Management Company Ltd</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">JISC Services Management Company Ltd: JISC Procureweb</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.procureweb.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Nathan</md:GivenName>
-    <md:SurName>Skidmore</md:SurName>
-    <md:EmailAddress>mailto:nathan@procureweb.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Joe</md:GivenName>
-    <md:SurName>Wells</md:SurName>
-    <md:EmailAddress>mailto:joe@procureweb.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.procureweb.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">JISC Services Management Company Ltd</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">JISC Services Management Company Ltd: JISC Procureweb</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.procureweb.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Nathan</GivenName>
+    <SurName>Skidmore</SurName>
+    <EmailAddress>mailto:nathan@procureweb.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Joe</GivenName>
+    <SurName>Wells</SurName>
+    <EmailAddress>mailto:joe@procureweb.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>