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

1 files changed, 66 insertions, 66 deletions

diff --git a/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml
index 548afa35..e3abfa99 100644
--- a/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml
@@ -1,25 +1,25 @@
-<?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://idp.edina.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-24T17:03:00Z">
+      <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="2009-06-24T17:03:00Z">
-        <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">edina.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EDINA (staff and trials)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EDINA-internal IdP</mdui:Description>
+        <mdui:Logo height="57" width="113">https://dlib-idp.edina.ac.uk/img/edina.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://dlib-idp.edina.ac.uk/img/edina-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </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">edina.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EDINA (staff and trials)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">EDINA-internal IdP</mdui:Description>
-          <mdui:Logo height="57" width="113">https://dlib-idp.edina.ac.uk/img/edina.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://dlib-idp.edina.ac.uk/img/edina-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </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>
 						MIIDOzCCAiOgAwIBAgIUZ8boiTD4RixSt29es15v8YO8F34wDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAwwUZGxpYi1pZHAuZWRpbmEuYWMudWswHhcNMTUwNDE1MTQz
 						MjQ0WhcNMzUwNDE1MTQzMjQ0WjAfMR0wGwYDVQQDDBRkbGliLWlkcC5lZGluYS5h
@@ -39,27 +39,27 @@
 						bFwFjyGIOmTeUTfN4ekLZ596U7/IHoJRqIzWRtgKhIq9UgQpRNijkIjyEXxnIU4b
 						TJoGlwD1bfDo3vnukwHI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-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://dlib-idp.edina.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-idp.edina.ac.uk/shibboleth-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">edina.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.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://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-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://dlib-idp.edina.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-idp.edina.ac.uk/shibboleth-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">edina.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUZ8boiTD4RixSt29es15v8YO8F34wDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAwwUZGxpYi1pZHAuZWRpbmEuYWMudWswHhcNMTUwNDE1MTQz
 						MjQ0WhcNMzUwNDE1MTQzMjQ0WjAfMR0wGwYDVQQDDBRkbGliLWlkcC5lZGluYS5h
@@ -79,29 +79,29 @@
 						bFwFjyGIOmTeUTfN4ekLZ596U7/IHoJRqIzWRtgKhIq9UgQpRNijkIjyEXxnIU4b
 						TJoGlwD1bfDo3vnukwHI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-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 Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA (staff and trials)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</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>EDINA Infrastructure</md:GivenName>
-      <md:EmailAddress>mailto:edina.infrastructure@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UK federation infrastructure</md:GivenName>
-      <md:EmailAddress>mailto:ukfed.infrastructure@ed.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://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-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 Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA (staff and trials)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</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>EDINA Infrastructure</md:GivenName>
+    <md:EmailAddress>mailto:edina.infrastructure@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UK federation infrastructure</md:GivenName>
+    <md:EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>