From 64e68708aa94f8947159264177212be299a679aa Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Fri, 10 Apr 2015 14:43:44 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../dlib-skaill.ucs.ed.ac.uk-shibboleth.xml        | 79 +++++++++++-----------
 1 file changed, 38 insertions(+), 41 deletions(-)

(limited to 'swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml
index 5ce26dc9..fe1224fc 100644
--- a/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-skaill.ucs.ed.ac.uk/shibboleth">
-  <!--
-		This is an SDSS Skaill Shibboleth 2 SP for the University of Edinburgh.
-	-->
-  <Extensions>
+<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://dlib-skaill.ucs.ed.ac.uk/shibboleth">
+  <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:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/Login"/>
-      <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://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -36,32 +33,32 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: SDSS Test SP (skaill)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: SDSS Test SP (skaill)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ukfederation.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sara</md:GivenName>
+    <md:SurName>Hopkins</md:SurName>
+    <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sara</md:GivenName>
+    <md:SurName>Hopkins</md:SurName>
+    <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3