From 90b9b01efd5ad628d5d986461caad0a7380a8fe8 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 2 Feb 2016 16:41:04 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../geoshibb.edina.ac.uk-shibboleth.xml            | 73 +++++++++++-----------
 1 file changed, 35 insertions(+), 38 deletions(-)

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

diff --git a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
index a5722f1e..6311a49a 100644
--- a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://geoshibb.edina.ac.uk/shibboleth">
-  <!--
-		This is an "EDINA: Digimap (live)" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://geoshibb.edina.ac.uk/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-04-24T16:39:26Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Digimap Collections</mdui:DisplayName>
         <mdui:Description xml:lang="en">Online maps and spatial data of Great Britain</mdui:Description>
         <mdui:Logo height="90" width="350">https://vsp2.edina.ac.uk/public/images/splogos/digimap.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>
@@ -46,31 +43,31 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </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/digimap/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2a.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2a.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA: Digimap (live)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/about/</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: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/digimap/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/digimap/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/digimap/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/digimap/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/digimap/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/digimap/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/digimap/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/digimap/Shibboleth.sso/SAML/Artifact" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2a.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2a.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="12"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA: Digimap (live)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</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