1 files changed, 33 insertions, 37 deletions
diff --git a/swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml b/swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml
index 35694670..966ecaac 100644
--- a/swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.medicinescomplete.com/mc/shibboleth">
-  <!--
-		This is an OpenAthensSP MedicinesComplete SP for the Royal Pharmaceutical Society of Great Britain.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.medicinescomplete.com/mc/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-14T15:06:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol 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">Royal Pharmaceutical Society: MedicinesComplete</mdui:DisplayName>
         <mdui:Description xml:lang="en">MedicinesComplete provides online access to the world's leading drug and healthcare references.</mdui:Description>
         <mdui:Logo height="36" width="217">https://www.medicinescomplete.com/mc/images/mc.png</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -52,8 +49,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -89,28 +86,27 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.medicinescomplete.com/mc/shibboleth" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://service.medicinescomplete.com/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://service.medicinescomplete.com/ukfed/oa/auth/rcv/saml2/post" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Royal Pharmaceutical Society of Great Britain</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Pharmaceutical Society: MedicinesComplete</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.pharmpress.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Micah</GivenName>
-    <SurName>Edwards</SurName>
-    <EmailAddress>mailto:micah@cbcl.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Micah</GivenName>
-    <SurName>Edwards</SurName>
-    <EmailAddress>mailto:micah@cbcl.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pharmaceutical Press Ops Team</GivenName>
-    <EmailAddress>mailto:opsteam@rpharms.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://service.medicinescomplete.com/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://service.medicinescomplete.com/ukfed/oa/auth/rcv/saml2/post" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal Pharmaceutical Society of Great Britain</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Pharmaceutical Society: MedicinesComplete</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pharmpress.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Micah</md:GivenName>
+    <md:SurName>Edwards</md:SurName>
+    <md:EmailAddress>mailto:micah@cbcl.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Micah</md:GivenName>
+    <md:SurName>Edwards</md:SurName>
+    <md:EmailAddress>mailto:micah@cbcl.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pharmaceutical Press Ops Team</md:GivenName>
+    <md:EmailAddress>mailto:opsteam@rpharms.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>