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

1 files changed, 31 insertions, 34 deletions

diff --git a/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml b/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml
index 2ebdfb1a..ee04dcbc 100644
--- a/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml
+++ b/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.bufvc.ac.uk/saml/metadata">
-  <!--
-		This is an OpenAthens SP for the British Universities Film & Video Council.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.bufvc.ac.uk/saml/metadata">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-03T17:15:17Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -41,29 +38,29 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.bufvc.ac.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.bufvc.ac.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bufvc.ac.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/shib/post" index="5" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/shib/art" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/saml2/post" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">British Universities Film &amp; Video Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">British Universities Film &amp; Video Council</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://bufvc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lotfallah</GivenName>
-    <SurName>Bekhradi</SurName>
-    <EmailAddress>mailto:federation@bufvc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lotfallah</GivenName>
-    <SurName>Bekhradi</SurName>
-    <EmailAddress>mailto:federation@bufvc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.bufvc.ac.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.bufvc.ac.uk/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bufvc.ac.uk/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/shib/post" index="5" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/shib/art" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/saml2/post" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="8"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">British Universities Film &amp; Video Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">British Universities Film &amp; Video Council</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://bufvc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lotfallah</md:GivenName>
+    <md:SurName>Bekhradi</md:SurName>
+    <md:EmailAddress>mailto:federation@bufvc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lotfallah</md:GivenName>
+    <md:SurName>Bekhradi</md:SurName>
+    <md:EmailAddress>mailto:federation@bufvc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>