From 33e83c2a70697bbeb89f1642038973ec8ecb75d9 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 9 Jul 2015 00:29:09 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../sp.edina.ac.uk-shibboleth-mediahub.xml         | 121 ++++++++++-----------
 1 file changed, 59 insertions(+), 62 deletions(-)

(limited to 'swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml')

diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
index 66955fb4..dbae1c48 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/mediahub">
-  <!--
-		This is an "EDINA Mediahub" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/mediahub">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
+  </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>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">JISC MediaHub</mdui:DisplayName>
         <mdui:Description xml:lang="en">The definitive academic video, image &amp; audio resource</mdui:Description>
         <mdui:Logo height="84" width="350">https://vsp2.edina.ac.uk/public/images/splogos/mediahub.png</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -44,8 +41,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -75,53 +72,53 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="29"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: EDINA Mediahub</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>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="29"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: EDINA Mediahub</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>
-- 
cgit v1.2.3