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/monitoring.bbc.co.uk-entity.xml b/swamid-interfederations-2.0/monitoring.bbc.co.uk-entity.xml
index c190c8ce..b2e585ef 100644
--- a/swamid-interfederations-2.0/monitoring.bbc.co.uk-entity.xml
+++ b/swamid-interfederations-2.0/monitoring.bbc.co.uk-entity.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitoring.bbc.co.uk/entity">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitoring.bbc.co.uk/entity">
+  <!--
+	This a "BBC Monitoring" OpenSAML SP for British Broadcasting Corporation
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-10-19T15:19:53Z">
       <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:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="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 Monitoring</mdui:DisplayName>
         <mdui:Description xml:lang="en">BBC Monitoring</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://monitoring.bbc.co.uk</mdui:InformationURL>
         <mdui:Logo height="30" width="260">https://monitoring.files.bbci.co.uk/bbcm-user-portal/2555/assets/images/logo-shibboleth.png</mdui:Logo>
       </mdui:UIInfo>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://monitoring.bbc.co.uk/api/login/sso" index="0"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://monitoring.bbc.co.uk/api/login/sso" index="0"/>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -43,34 +46,34 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitoring.bbc.co.uk/api/login/sso" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">BBC Monitoring</md:ServiceName>
-      <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:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">British Broadcasting Corporation</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">BBC Monitoring</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://monitoring.bbc.co.uk</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>BBCM Service Desk</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@mon.bbc.co.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Joe</md:GivenName>
-    <md:SurName>Edwards</md:SurName>
-    <md:EmailAddress>mailto:Joe.Edwards@softwire.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Vicky</md:GivenName>
-    <md:SurName>Keys</md:SurName>
-    <md:EmailAddress>mailto:Vicky.Keys@bbc.co.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitoring.bbc.co.uk/api/login/sso" index="0" isDefault="true"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="en">BBC Monitoring</ServiceName>
+      <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"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">British Broadcasting Corporation</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">BBC Monitoring</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://monitoring.bbc.co.uk</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>BBCM Service Desk</GivenName>
+    <EmailAddress>mailto:servicedesk@mon.bbc.co.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Joe</GivenName>
+    <SurName>Edwards</SurName>
+    <EmailAddress>mailto:Joe.Edwards@softwire.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Vicky</GivenName>
+    <SurName>Keys</SurName>
+    <EmailAddress>mailto:Vicky.Keys@bbc.co.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>