1 files changed, 54 insertions, 54 deletions
diff --git a/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml
index 2483e40e..6295effb 100644
--- a/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.york.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-10-15T11:05:25.614639Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-10-15T11:05:25.614639Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+DCCAuCgAwIBAgIJAJhO6a6qGOfvMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
 						BAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNVBAcTBFlvcmsxGzAZBgNV
 						BAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxMLSVQgU2VydmljZXMxGDAW
@@ -36,26 +36,26 @@
 						WhdbSNckji6+UTBB/qSf6hsmJnVa4CQmg0XVqy0ceBkrkYHgEuVxesT64stH5nMJ
 						qc/emtVSHd3jgeSW
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.york.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.york.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.york.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.york.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.york.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.york.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.york.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.york.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.york.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.york.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.york.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.york.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+DCCAuCgAwIBAgIJAJhO6a6qGOfvMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
 						BAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNVBAcTBFlvcmsxGzAZBgNV
 						BAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxMLSVQgU2VydmljZXMxGDAW
@@ -79,25 +79,25 @@
 						WhdbSNckji6+UTBB/qSf6hsmJnVa4CQmg0XVqy0ceBkrkYHgEuVxesT64stH5nMJ
 						qc/emtVSHd3jgeSW
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.york.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.york.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of York</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of York</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.york.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>User Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.york.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.york.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of York</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of York</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.york.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>User Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>