1 files changed, 44 insertions, 47 deletions
diff --git a/swamid-interfederations-2.0/ousu.org-shibboleth.xml b/swamid-interfederations-2.0/ousu.org-shibboleth.xml
index ecbcecc5..75ba4fee 100644
--- a/swamid-interfederations-2.0/ousu.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/ousu.org-shibboleth.xml
@@ -1,20 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ousu.org/shibboleth">
-  <!--
-		This is an "Oxford University Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-07T13:39:32Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://ousu.org/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://ousu.org/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+<?xml version="1.0"?>
+<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://ousu.org/shibboleth">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-07T13:39:32Z"/>
+    </md:Extensions>
+    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+      <md:Extensions>
+        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ousu.org/Shibboleth.sso/Login"/>
+        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ousu.org/Shibboleth.sso/Login" index="1"/>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -32,33 +29,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ousu.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ousu.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ousu.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ousu.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ousu.org/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ousu.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ousu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ousu.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ousu.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ousu.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ousu.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oxford University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ousu.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ousu.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ousu.org/Shibboleth.sso/SLO/Artifact"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ousu.org/Shibboleth.sso/SLO/POST"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ousu.org/Shibboleth.sso/SLO/Redirect"/>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ousu.org/Shibboleth.sso/SLO/SOAP"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ousu.org/Shibboleth.sso/SAML2/POST" index="0"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ousu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ousu.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ousu.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ousu.org/Shibboleth.sso/SAML/POST" index="4"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ousu.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+    </md:SPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">Oxford University Students' Union</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://ousu.org/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>MSL support</md:GivenName>
+      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>James</md:GivenName>
+      <md:SurName>Bonsall</md:SurName>
+      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>