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

1 files changed, 42 insertions, 39 deletions

diff --git a/swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.xml b/swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.xml
index 46592ced..f1c4e017 100644
--- a/swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.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://shakespeare.acropolis.org.uk/shibboleth">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shakespeare.acropolis.org.uk/shibboleth">
+  <!--
+		This is a "BBC Shakespeare Archive Resource" simpleSAMLphp SP for BBC Worldwide Limited.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-04T16:37:05Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <SPSSODescriptor 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">BBC Shakespeare Archive Resource</mdui:DisplayName>
         <mdui:Description xml:lang="en">Hundreds of TV &amp; radio programmes and thousands of photos from the BBC's Shakespeare collection</mdui:Description>
         <mdui:Logo height="170" width="350">https://shakespeare.acropolis.org.uk/assets/shakespeare-350x170.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>
@@ -43,8 +46,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>
@@ -74,33 +77,33 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">BBC Shakespeare Archive Resource</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Hundreds of TV &amp; radio programmes and thousands of photos from the BBC's Shakespeare collection</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">BBC Worldwide Limited</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">BBC Shakespeare Archive Resource</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cy">BBC Shakespeare Ffeil Adnoddau</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://shakespeare.ch.bbc.co.uk/index.en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cy">http://shakespeare.ch.bbc.co.uk/index.cy</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>BBC Shakespeare Archive Resource Access Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:shakespeareaccess@bbc.co.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>BBC Archive Development Operations</md:GivenName>
-    <md:EmailAddress>mailto:adops@bbc.co.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">BBC Shakespeare Archive Resource</ServiceName>
+      <ServiceDescription xml:lang="en">Hundreds of TV &amp; radio programmes and thousands of photos from the BBC's Shakespeare collection</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">BBC Worldwide Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">BBC Shakespeare Archive Resource</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cy">BBC Shakespeare Ffeil Adnoddau</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://shakespeare.ch.bbc.co.uk/index.en</OrganizationURL>
+    <OrganizationURL xml:lang="cy">http://shakespeare.ch.bbc.co.uk/index.cy</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>BBC Shakespeare Archive Resource Access Helpdesk</GivenName>
+    <EmailAddress>mailto:shakespeareaccess@bbc.co.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>BBC Archive Development Operations</GivenName>
+    <EmailAddress>mailto:adops@bbc.co.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>