1 files changed, 68 insertions, 71 deletions
diff --git a/swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml
index fc16db6b..c6f8fd47 100644
--- a/swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml
@@ -1,32 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.warwick.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Warwick.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-27T20:54:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Warwick</mdui:DisplayName>
-        <mdui:Logo height="26" width="90">https://idp.warwick.ac.uk/origin/static/images/idp-logo-90x26.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.warwick.ac.uk/origin/static/images/idp-logo-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>137.205.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>warwick.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:52.381991,-1.562032</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:52.286432,-1.551475</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.warwick.ac.uk/idp/shibboleth">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-27T20:54:00Z">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    </md:Extensions>
+    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:Extensions>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">University of Warwick</mdui:DisplayName>
+          <mdui:Logo height="26" width="90">https://idp.warwick.ac.uk/origin/static/images/idp-logo-90x26.png</mdui:Logo>
+          <mdui:Logo height="16" width="16">https://idp.warwick.ac.uk/origin/static/images/idp-logo-16x16.png</mdui:Logo>
+        </mdui:UIInfo>
+        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:IPHint>137.205.0.0/16</mdui:IPHint>
+          <mdui:DomainHint>warwick.ac.uk</mdui:DomainHint>
+          <mdui:GeolocationHint>geo:52.381991,-1.562032</mdui:GeolocationHint>
+          <mdui:GeolocationHint>geo:52.286432,-1.551475</mdui:GeolocationHint>
+        </mdui:DiscoHints>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAMUgGil9ReUGOng/Gws9DutReU1TMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcC53YXJ3aWNrLmFjLnVrMB4XDTE0MDcwOTE0MDk0
 						OFoXDTM0MDcwOTE0MDk0OFowHDEaMBgGA1UEAxMRaWRwLndhcndpY2suYWMudWsw
@@ -46,26 +43,26 @@
 						+YK5ljnepO58isd09Xn1XGEqM7kySM4H55OhvBKzeIMSaKmNFJY3e8CJJmMl9u+j
 						vOGPdg==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.warwick.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
-    </Extensions>
-    <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://idp.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warwick.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://idp.warwick.ac.uk/idp/profile/Shibboleth/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/POST/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.warwick.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">warwick.ac.uk</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAMUgGil9ReUGOng/Gws9DutReU1TMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcC53YXJ3aWNrLmFjLnVrMB4XDTE0MDcwOTE0MDk0
 						OFoXDTM0MDcwOTE0MDk0OFowHDEaMBgGA1UEAxMRaWRwLndhcndpY2suYWMudWsw
@@ -85,25 +82,25 @@
 						+YK5ljnepO58isd09Xn1XGEqM7kySM4H55OhvBKzeIMSaKmNFJY3e8CJJmMl9u+j
 						vOGPdg==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Warwick</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Warwick</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.warwick.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nick</GivenName>
-    <SurName>Howes</SurName>
-    <EmailAddress>mailto:n.howes@warwick.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Howes</SurName>
-    <EmailAddress>mailto:n.howes@warwick.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">University of Warwick</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">University of Warwick</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.warwick.ac.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Nick</md:GivenName>
+      <md:SurName>Howes</md:SurName>
+      <md:EmailAddress>mailto:n.howes@warwick.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Nick</md:GivenName>
+      <md:SurName>Howes</md:SurName>
+      <md:EmailAddress>mailto:n.howes@warwick.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>