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

1 files changed, 54 insertions, 54 deletions

diff --git a/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml
index 9b476ab8..bb394cd7 100644
--- a/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?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.marjon.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </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"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marjon.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">marjon.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAM3DEG1v9vAV1/UxUuMR5BwJefeEMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5tYXJqb24uYWMudWswHhcNMDkwMTI2MTUwODIy
 						WhcNMjkwMTI2MTUwODIyWjAbMRkwFwYDVQQDExBpZHAubWFyam9uLmFjLnVrMIIB
@@ -29,26 +29,26 @@
 						oF1hWv0YvVydDCsa/nN8L3stVEAIvSGzsBS5vkbUXmRE3NuUCcJwkOUzwAzDWdM6
 						DR76/+4E+wc36deoLR3NAIWq4IX54pvX1UqIRIkpekdtAG2vLW3rl3e1IbC1j++6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marjon.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.marjon.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.marjon.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.marjon.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">marjon.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <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.marjon.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.marjon.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.marjon.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.marjon.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">marjon.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAM3DEG1v9vAV1/UxUuMR5BwJefeEMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5tYXJqb24uYWMudWswHhcNMDkwMTI2MTUwODIy
 						WhcNMjkwMTI2MTUwODIyWjAbMRkwFwYDVQQDExBpZHAubWFyam9uLmFjLnVrMIIB
@@ -67,27 +67,27 @@
 						oF1hWv0YvVydDCsa/nN8L3stVEAIvSGzsBS5vkbUXmRE3NuUCcJwkOUzwAzDWdM6
 						DR76/+4E+wc36deoLR3NAIWq4IX54pvX1UqIRIkpekdtAG2vLW3rl3e1IbC1j++6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marjon.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.marjon.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 St Mark &amp; St John</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of St Mark &amp; St John</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.marjon.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Moore</md:SurName>
-      <md:EmailAddress>mailto:cmoore@marjon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>St John</md:SurName>
-      <md:EmailAddress>mailto:istjohn@marjon.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://idp.marjon.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.marjon.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 St Mark &amp; St John</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of St Mark &amp; St John</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.marjon.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Moore</md:SurName>
+    <md:EmailAddress>mailto:cmoore@marjon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>St John</md:SurName>
+    <md:EmailAddress>mailto:istjohn@marjon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>