http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 33 insertions, 36 deletions

diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
index 0b38d21e..c439355f 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.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/agcensus">
-  <!--
-		This is a University of Edinburgh (EDINA) Service Provider for EDINA agcensus.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/agcensus">
+  <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">
-    <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">Agcensus</mdui:DisplayName>
         <mdui:Description xml:lang="en">Grid square agricultural census data for England, Scotland and Wales</mdui:Description>
         <mdui:Logo height="161" width="350">https://vsp2.edina.ac.uk/public/images/splogos/agcensus.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,29 +41,29 @@
 					</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/agcensus/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA: agcensus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/agcensus/description.html</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/agcensus/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/agcensus/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/agcensus/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/agcensus/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/agcensus/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/agcensus/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/agcensus/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/agcensus/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: agcensus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/agcensus/description.html</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>