http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-interfederations-2.0

1 files changed, 32 insertions, 29 deletions

diff --git a/swamid-interfederations-2.0/test.rpharms.com-entity.xml b/swamid-interfederations-2.0/test.rpharms.com-entity.xml
index 152a1622..87f2041b 100644
--- a/swamid-interfederations-2.0/test.rpharms.com-entity.xml
+++ b/swamid-interfederations-2.0/test.rpharms.com-entity.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.rpharms.com/entity">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.rpharms.com/entity">
+  <!--
+		This is a "CBCL Test Site" OpenAthens SP for the Royal Pharmaceutical Society of Great Britain.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-04T12:21:55Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </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>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">CBCL Test Site</mdui:DisplayName>
         <mdui:Description xml:lang="en">Development site for CBCL</mdui:Description>
         <mdui:Logo height="64" width="139">https://staging.cbcl.co.uk/ukfed/cbcl_logo.png</mdui:Logo>
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    </Extensions>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -39,8 +42,8 @@
 		</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -66,23 +69,23 @@
 		</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.cbcl.co.uk/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://staging.cbcl.co.uk/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">CBCL Test Site</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cbcl.co.uk/</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:EntityDescriptor>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.cbcl.co.uk/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.cbcl.co.uk/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">CBCL Test Site</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cbcl.co.uk/</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>
+</EntityDescriptor>