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

1 files changed, 37 insertions, 34 deletions

diff --git a/swamid-interfederations-2.0/support.roaming.dev.ja.net-saml.xml b/swamid-interfederations-2.0/support.roaming.dev.ja.net-saml.xml
index 5ee005ab..bf70ebb8 100644
--- a/swamid-interfederations-2.0/support.roaming.dev.ja.net-saml.xml
+++ b/swamid-interfederations-2.0/support.roaming.dev.ja.net-saml.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://support.roaming.dev.ja.net/saml">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://support.roaming.dev.ja.net/saml">
+  <!--
+		This is an SP for Jisc Services Limited.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-24T13:56:27Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="1" WantAssertionsSigned="1" errorURL="https://support.roaming.dev.ja.net/saml/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="1" WantAssertionsSigned="1" errorURL="https://support.roaming.dev.ja.net/saml/error" 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">eduroam UK management portal</mdui:DisplayName>
         <mdui:Description xml:lang="en">Web based interface for managing the interactions between
 					eduroam member institutions' radius servers (ORPS) and the national proxies (NRPS)</mdui:Description>
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -55,30 +58,30 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://support.roaming.dev.ja.net/saml/slo-soap"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://support.roaming.dev.ja.net/saml/sls-redirect-response"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://support.roaming.dev.ja.net/saml/consumer-post" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://support.roaming.dev.ja.net/saml/consumer-artifact" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">eduroam UK management portal</md:ServiceName>
-      <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:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">eduroam UK management portal</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://eduroam.uk</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Mitev</md:GivenName>
-    <md:SurName>Nik</md:SurName>
-    <md:EmailAddress>mailto:nik.mitev@jisc.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mitev</md:GivenName>
-    <md:SurName>Nik</md:SurName>
-    <md:EmailAddress>mailto:nik.mitev@jisc.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://support.roaming.dev.ja.net/saml/slo-soap"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://support.roaming.dev.ja.net/saml/sls-redirect-response"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://support.roaming.dev.ja.net/saml/consumer-post" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://support.roaming.dev.ja.net/saml/consumer-artifact" index="2" isDefault="false"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="en">eduroam UK management portal</ServiceName>
+      <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"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Jisc Services Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">eduroam UK management portal</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://eduroam.uk</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Mitev</GivenName>
+    <SurName>Nik</SurName>
+    <EmailAddress>mailto:nik.mitev@jisc.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Mitev</GivenName>
+    <SurName>Nik</SurName>
+    <EmailAddress>mailto:nik.mitev@jisc.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>