From cb1cfc791660d27a369c7c21435792231c0b9a53 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 15 Feb 2016 13:18:50 +0100
Subject: http://metadata.ukfederation.org.uk/ukfederation-export.xml into
 swamid-interfederations-2.0

---
 .../sp.edina.ac.uk-shibboleth-vsm.xml              | 65 +++++++++++-----------
 1 file changed, 34 insertions(+), 31 deletions(-)

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

diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml
index d63995d7..332e8f31 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/vsm">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/vsm">
+  <!--
+		This is a University of Edinburgh Service Provider for EDINA VSM Portal.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:KeyDescriptor use="signing">
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -34,29 +37,29 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EDINA VSM Portal</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/projects/vsmportal/</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>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="10"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">EDINA VSM Portal</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://edina.ac.uk/projects/vsmportal/</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>
-- 
cgit v1.2.3