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

1 files changed, 51 insertions, 48 deletions

diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
index 601f2b73..6d00cd78 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/m2m">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/m2m">
+  <!--
+		This is an "EDINA M2M Authentication" Shibboleth SP for the University of Edinburgh.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-28T13:09:20Z">
       <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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/DS" index="1"/>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/DS"/>
+      <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://authdev.edina.ac.uk/m2m/Shibboleth.sso/DS" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">EDINA M2M Authentication</mdui:DisplayName>
         <mdui:Description xml:lang="en">EDINA M2M Authentication</mdui:Description>
         <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -45,42 +48,42 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML/POST" index="13"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST" index="16"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML/POST" index="19"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/Artifact" index="20"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/ECP" index="21"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST" index="22"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EDINA M2M Authentication</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>EDINA Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ben</md:GivenName>
-    <md:SurName>Soares</md:SurName>
-    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/Artifact"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/SOAP"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML/POST" index="13"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST" index="16"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML/POST" index="19"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/Artifact" index="20"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST" index="22"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">EDINA M2M Authentication</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://edina.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>EDINA Helpdesk</GivenName>
+    <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ben</GivenName>
+    <SurName>Soares</SurName>
+    <EmailAddress>mailto:ben.soares@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>