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

1 files changed, 77 insertions, 94 deletions

diff --git a/swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml
index 922c7039..1d3608e4 100644
--- a/swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml
@@ -1,112 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.solent.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Southampton Solent University.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.solent.ac.uk/idp/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-22T14:40:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </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">solent.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEoTCCA4mgAwIBAgIQDGGDSMUu0YiL17Un9MJn6TANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMDMwNTAwMDAwMFoXDTE1MDMwNTIzNTk1OVowezELMAkGA1UE
-						BhMCR0IxEjAQBgNVBAgTCUhhbXBzaGlyZTEUMBIGA1UEBxMLU291dGhhbXB0b24x
-						JjAkBgNVBAoTHVNvdXRoYW1wdG9uIFNvbGVudCBVbml2ZXJzaXR5MRowGAYDVQQD
-						ExFpZHAxLnNvbGVudC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBALtV/gS7gNG/z6DCnu8svkKkLoARcOW8nt8diRNwCUSKOMjcrxPEZkh58NDd
-						Qz/o4CcSjO4KShdP1tZwA0ob+NkZ+c4AG8QZLDOyVFzwZ//Vjsja1ybrAPPTPRtR
-						v9iDkZ/s3cdfcNO9E3xU4QLFzGkewLIyQf8OVsfEF0Oka1ANRF33Vnn9uTIB+ZCS
-						IGYaNAzgMYC9WWxClXeErHvml06iPF+ncxcam4jviwBDeo3L9Athg2hsR3dXm8Vf
-						2XZte9ltYOb+aiQTiMcGkhjwiwdV9yzBw3AQVDmVg7m2l+AX1Sfc/fBmvmzgSw9p
-						WosgGUY9iv+M45ENmq8KvQaFavUCAwEAAaOCAWQwggFgMB8GA1UdIwQYMBaAFAy9
-						k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSHVkS2blLmtqfrDzMAuNSi5S4h
-						OzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-						BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-						MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-						LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-						LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-						b2NzcC50Y3MudGVyZW5hLm9yZzAcBgNVHREEFTATghFpZHAxLnNvbGVudC5hYy51
-						azANBgkqhkiG9w0BAQUFAAOCAQEAl35gTwLDK7nxbNwQ22JiyPPfNkhIytdPNeEq
-						Wvc4gMyFOLSheiIzmwhzYvSQ2B3wDdUq1Ltg0kaYyttJq/VOWzW5OMRTw0D4A9pt
-						H26Jmq8K7BHdpEB4Yme9181bBP1OEawKW5OaM2y424nlZk9mhXiivBeT4hgU3u2J
-						GBDEyyJpNy/TpAjEm/0wFe5vXGTN5/zpCuaft+KheJso6a5MuX1qMYolX57Miy2o
-						C+/Kh9mXmYoXQpPBlS0a99oh2NAQ3PX3qKZLKU+x0VfkCrjAthNU/GPI+q+vq8c0
-						gpk+lfVabkNTBjVa3oMxsWPX8dSp4EhQvhJBjQh/hEXu/onhgg==
+						MIIDMDCCAhigAwIBAgIVAMEcRei0mVIxnctKElMp/O387gtBMA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEWlkcDEuc29sZW50LmFjLnVrMB4XDTE1MDIxNzEwMzQx
+						NFoXDTI1MDIxNzEwMzQxNFowHDEaMBgGA1UEAxMRaWRwMS5zb2xlbnQuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCF1dDGPEUijwsKsLzmVVbu
+						W4amy2HYiaCRRM9HOs1NIn4sYjG0aj5tnH1HUvbF8x2MfEGvsGidm1NLZoxIEjv8
+						/gxR5aswHfQjZp8ju1bffeCNzEftrFRMCvUiWxf7ThxQDsrDY9WcocOlr7BHEtVn
+						4NDqlaxjBKhRxgqZUrE+S2dvZfFYsR23AzwohJ2HLR+/3bxBhCBs+A/kQrgLMNvw
+						7Z7fPiu7OiUuS2Qjqz+4HHPm6k6RtqOtayKWfToHXS/b+Yxv8DEF3xQW+if6zZA0
+						zdjYIZ0hVa2ew2882rqRIlBKZpUcl6kdIWH7XjXvbzu8xkXG0ZRdXyVaRIPaY7fb
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcDEuc29sZW50LmFjLnVrhihodHRwczov
+						L2lkcDEuc29sZW50LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSPY2tD
+						4c7/NhioEVdldj0S9Y2EADANBgkqhkiG9w0BAQUFAAOCAQEABI2dIOAflt1WkYEJ
+						YUo+pk9+3xYoh6EPU8HF0a4aruul5jBLWpyZfrXWffjZtbGj1dYb5UNj/x7zzWOm
+						fIn7Tig2UjjkWL/81TSPLIPHG5QpR+UxRB8eUpsr8NslOwqP0brIRqgIyzNNQz82
+						IRtFzpE5SdI5Ds1lhhV5gQqSBSfuDimqrrmMMD2BQ/aAZgtnt6HfzCzDTv9o9K1a
+						ruMAOxdwGzOWgas6VmibPb/m2j/tibs37OMzpBtwUldqDjB2/WYmIhu4zXHrMj+6
+						/RF0wtwrM2dWdDlIQtm+f7yQfxrP74fx4fDWA2uetDa1RkQX7U54/Sfxx9d4UpIU
+						dBTl/A==
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.solent.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://idp1.solent.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.solent.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>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.solent.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://idp1.solent.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.solent.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">solent.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEoTCCA4mgAwIBAgIQDGGDSMUu0YiL17Un9MJn6TANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMDMwNTAwMDAwMFoXDTE1MDMwNTIzNTk1OVowezELMAkGA1UE
-						BhMCR0IxEjAQBgNVBAgTCUhhbXBzaGlyZTEUMBIGA1UEBxMLU291dGhhbXB0b24x
-						JjAkBgNVBAoTHVNvdXRoYW1wdG9uIFNvbGVudCBVbml2ZXJzaXR5MRowGAYDVQQD
-						ExFpZHAxLnNvbGVudC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBALtV/gS7gNG/z6DCnu8svkKkLoARcOW8nt8diRNwCUSKOMjcrxPEZkh58NDd
-						Qz/o4CcSjO4KShdP1tZwA0ob+NkZ+c4AG8QZLDOyVFzwZ//Vjsja1ybrAPPTPRtR
-						v9iDkZ/s3cdfcNO9E3xU4QLFzGkewLIyQf8OVsfEF0Oka1ANRF33Vnn9uTIB+ZCS
-						IGYaNAzgMYC9WWxClXeErHvml06iPF+ncxcam4jviwBDeo3L9Athg2hsR3dXm8Vf
-						2XZte9ltYOb+aiQTiMcGkhjwiwdV9yzBw3AQVDmVg7m2l+AX1Sfc/fBmvmzgSw9p
-						WosgGUY9iv+M45ENmq8KvQaFavUCAwEAAaOCAWQwggFgMB8GA1UdIwQYMBaAFAy9
-						k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSHVkS2blLmtqfrDzMAuNSi5S4h
-						OzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-						BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-						MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-						LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-						LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-						b2NzcC50Y3MudGVyZW5hLm9yZzAcBgNVHREEFTATghFpZHAxLnNvbGVudC5hYy51
-						azANBgkqhkiG9w0BAQUFAAOCAQEAl35gTwLDK7nxbNwQ22JiyPPfNkhIytdPNeEq
-						Wvc4gMyFOLSheiIzmwhzYvSQ2B3wDdUq1Ltg0kaYyttJq/VOWzW5OMRTw0D4A9pt
-						H26Jmq8K7BHdpEB4Yme9181bBP1OEawKW5OaM2y424nlZk9mhXiivBeT4hgU3u2J
-						GBDEyyJpNy/TpAjEm/0wFe5vXGTN5/zpCuaft+KheJso6a5MuX1qMYolX57Miy2o
-						C+/Kh9mXmYoXQpPBlS0a99oh2NAQ3PX3qKZLKU+x0VfkCrjAthNU/GPI+q+vq8c0
-						gpk+lfVabkNTBjVa3oMxsWPX8dSp4EhQvhJBjQh/hEXu/onhgg==
+						MIIDMDCCAhigAwIBAgIVAMEcRei0mVIxnctKElMp/O387gtBMA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEWlkcDEuc29sZW50LmFjLnVrMB4XDTE1MDIxNzEwMzQx
+						NFoXDTI1MDIxNzEwMzQxNFowHDEaMBgGA1UEAxMRaWRwMS5zb2xlbnQuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCF1dDGPEUijwsKsLzmVVbu
+						W4amy2HYiaCRRM9HOs1NIn4sYjG0aj5tnH1HUvbF8x2MfEGvsGidm1NLZoxIEjv8
+						/gxR5aswHfQjZp8ju1bffeCNzEftrFRMCvUiWxf7ThxQDsrDY9WcocOlr7BHEtVn
+						4NDqlaxjBKhRxgqZUrE+S2dvZfFYsR23AzwohJ2HLR+/3bxBhCBs+A/kQrgLMNvw
+						7Z7fPiu7OiUuS2Qjqz+4HHPm6k6RtqOtayKWfToHXS/b+Yxv8DEF3xQW+if6zZA0
+						zdjYIZ0hVa2ew2882rqRIlBKZpUcl6kdIWH7XjXvbzu8xkXG0ZRdXyVaRIPaY7fb
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcDEuc29sZW50LmFjLnVrhihodHRwczov
+						L2lkcDEuc29sZW50LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSPY2tD
+						4c7/NhioEVdldj0S9Y2EADANBgkqhkiG9w0BAQUFAAOCAQEABI2dIOAflt1WkYEJ
+						YUo+pk9+3xYoh6EPU8HF0a4aruul5jBLWpyZfrXWffjZtbGj1dYb5UNj/x7zzWOm
+						fIn7Tig2UjjkWL/81TSPLIPHG5QpR+UxRB8eUpsr8NslOwqP0brIRqgIyzNNQz82
+						IRtFzpE5SdI5Ds1lhhV5gQqSBSfuDimqrrmMMD2BQ/aAZgtnt6HfzCzDTv9o9K1a
+						ruMAOxdwGzOWgas6VmibPb/m2j/tibs37OMzpBtwUldqDjB2/WYmIhu4zXHrMj+6
+						/RF0wtwrM2dWdDlIQtm+f7yQfxrP74fx4fDWA2uetDa1RkQX7U54/Sfxx9d4UpIU
+						dBTl/A==
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Southampton Solent University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Southampton Solent University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.solent.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Help Desk</GivenName>
-    <EmailAddress>mailto:federation.support@solent.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:federation.tech@solent.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.solent.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">Southampton Solent University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Southampton Solent University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.solent.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:federation.support@solent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:federation.tech@solent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>