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

1 files changed, 97 insertions, 95 deletions

diff --git a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml
index ef926099..ae0e4af1 100644
--- a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.shib.manchester.ac.uk/shibboleth">
-  <!--
-		This is a "beta" Shibboleth IdP for The University of Manchester.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.shib.manchester.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-06T16:24:24Z">
       <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">manchester.ac.uk</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">The University of Manchester (Beta)</mdui:DisplayName>
@@ -37,103 +39,103 @@
         <mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEgTCCA2mgAwIBAgIQODuhTy09Kmsw2IJOGwc+7DANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDIxOTAwMDAwMFoXDTE2MDIxOTIzNTk1OVowSDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpiZXRhLnNoaWIu
-						bWFuY2hlc3Rlci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AMa+jhEPLHaYtVI2iX/NONYYshBjccXs1+aZ9ciOvFd3QFRbSr84QprqBdyai7MI
-						boYQZBaEs7bxbAiozZf14L2XAG5sOz1Ra9fJaM/8NbDnVBOou6hHAd1Wqh+/z25p
-						WYA1Sw1H9V5C9VSMtSW6C2vC79WDfyVrPL8mvKG+d5hD/PlFZerIDQVuljOs8wQ5
-						htI7/70dxBZI2ls9xBb1dfyVj/dGp6g6DgIzVcKplq0EwjrrOGwi7S5xevAnPOQl
-						8hm7oMj9TqtqaQLOzKJCtliG3tt9x9lZblSWDAzw21xdl2SXyKVE1rGIAqvTwmDt
-						EwFMHh0pFbGbaqmZFQaY4CkCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTkbYr6vMAy5gunSZ2FH1wilnPKNTAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaYmV0YS5zaGli
-						Lm1hbmNoZXN0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAIQIFKVQYtqBrghB
-						6NjTsCIyyDl4NQ6+3xKPDcdBTAZGwLATb6SSd233q8hIwP6z6bibFFwrIBOLbFyY
-						x+7Q6Sy3E+NMd9jI9mREAP8JtnTZfDS9Howj8pZHfwZK2MP2CuSEkyckJfsawgMu
-						UQDWiDFsxNM47l1iZsMGDLcrHXFn9nj2owQ5QGwh1rOyoxJnDciy6Yu/JdpTURYJ
-						U+NheJHahcplg8zBqGUsrrERVQ40BjSi81Y2yPohJqje8AM5tCSD8XW5RcWoNoet
-						vWH3fKPnKXnFm+4A6glqcmRMsNebh/gX5tugbOgVt4SFmC+CFpmUQWqVisGrp8iK
-						0EI2geY=
+						MIIEgjCCA2qgAwIBAgIRAO3e2IFUJk3Dd0HJQF3ZKBUwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xNDA0MjQwMDAwMDBaFw0xNzA0MjMyMzU5NTlaMEgxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEjMCEGA1UEAxMaYmV0YS5zaGli
+						Lm1hbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC7j0ZmPbM3J6dknUGo1FQF1QZP10Bitu67DJPczwy8WYSqXBhTQ3F7HIVNLAVH
+						geMs/ZfGi7ct3d5HBPyg84rcPRHXjfgWOFnokwUxcI7ZEIooUc7wtNk1LZ/89mzR
+						A4icZm+w7XCatdkYTSFQR6SN6n9mWDGMY//H7KDBwLxbqA0UfFIrmGwhW1kjnoaL
+						J3PTl2I8dXYNKXnvsZxtJM1n9XwGSlU7YipLhyjlyQ35JAXs1qeAtXYRNFTjV2Gx
+						EXjhejs9XrXNb0w8Gvv3iKwxzK8WWVFXh0udsKoeb/r84o98jDiDoSap9Lo5qDsJ
+						kIJd5dYCaP40h3qQHpFJiL7FAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUZIEkV81JvNOr4jmDXZhTgfg+MFQw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCUGA1UdEQQeMByCGmJldGEuc2hp
+						Yi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQC7+XD/MdO9ubLu
+						VRzKDAiKfSGwMwAxOEyijhv2UzOxD3ISxji1UsCHPWXs30woYDgdKBC5WIVD8qYV
+						DszYqyLcRu2mwUtL/He30t8XqFZj4Y9R9faP+0321G1vn61SiUXe+c81reveIy5y
+						p8sry9f/ENJJpXNEEllrmi15TW32kSNAjoyV7OFiI1QAdfypeX2oAkyeL504UvZe
+						CYUUMyN2JAp7PTGI7WkP72AZFSMxzUZCj9UteUkKYMEXfOiKvqp6MEPSTNLVrXHn
+						HETktGDZoR6CEfyI6TGfxD6muKXhDZvFEm1t3z/Lc3mtZT0MSRwzcmQf/I27UnlD
+						rjZU5UPE
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-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://beta.shib.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://beta.shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.shib.manchester.ac.uk/shibboleth-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://beta.shib.manchester.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://beta.shib.manchester.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://beta.shib.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://beta.shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.shib.manchester.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">manchester.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEgTCCA2mgAwIBAgIQODuhTy09Kmsw2IJOGwc+7DANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDIxOTAwMDAwMFoXDTE2MDIxOTIzNTk1OVowSDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpiZXRhLnNoaWIu
-						bWFuY2hlc3Rlci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AMa+jhEPLHaYtVI2iX/NONYYshBjccXs1+aZ9ciOvFd3QFRbSr84QprqBdyai7MI
-						boYQZBaEs7bxbAiozZf14L2XAG5sOz1Ra9fJaM/8NbDnVBOou6hHAd1Wqh+/z25p
-						WYA1Sw1H9V5C9VSMtSW6C2vC79WDfyVrPL8mvKG+d5hD/PlFZerIDQVuljOs8wQ5
-						htI7/70dxBZI2ls9xBb1dfyVj/dGp6g6DgIzVcKplq0EwjrrOGwi7S5xevAnPOQl
-						8hm7oMj9TqtqaQLOzKJCtliG3tt9x9lZblSWDAzw21xdl2SXyKVE1rGIAqvTwmDt
-						EwFMHh0pFbGbaqmZFQaY4CkCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTkbYr6vMAy5gunSZ2FH1wilnPKNTAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaYmV0YS5zaGli
-						Lm1hbmNoZXN0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAIQIFKVQYtqBrghB
-						6NjTsCIyyDl4NQ6+3xKPDcdBTAZGwLATb6SSd233q8hIwP6z6bibFFwrIBOLbFyY
-						x+7Q6Sy3E+NMd9jI9mREAP8JtnTZfDS9Howj8pZHfwZK2MP2CuSEkyckJfsawgMu
-						UQDWiDFsxNM47l1iZsMGDLcrHXFn9nj2owQ5QGwh1rOyoxJnDciy6Yu/JdpTURYJ
-						U+NheJHahcplg8zBqGUsrrERVQ40BjSi81Y2yPohJqje8AM5tCSD8XW5RcWoNoet
-						vWH3fKPnKXnFm+4A6glqcmRMsNebh/gX5tugbOgVt4SFmC+CFpmUQWqVisGrp8iK
-						0EI2geY=
+						MIIEgjCCA2qgAwIBAgIRAO3e2IFUJk3Dd0HJQF3ZKBUwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xNDA0MjQwMDAwMDBaFw0xNzA0MjMyMzU5NTlaMEgxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEjMCEGA1UEAxMaYmV0YS5zaGli
+						Lm1hbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC7j0ZmPbM3J6dknUGo1FQF1QZP10Bitu67DJPczwy8WYSqXBhTQ3F7HIVNLAVH
+						geMs/ZfGi7ct3d5HBPyg84rcPRHXjfgWOFnokwUxcI7ZEIooUc7wtNk1LZ/89mzR
+						A4icZm+w7XCatdkYTSFQR6SN6n9mWDGMY//H7KDBwLxbqA0UfFIrmGwhW1kjnoaL
+						J3PTl2I8dXYNKXnvsZxtJM1n9XwGSlU7YipLhyjlyQ35JAXs1qeAtXYRNFTjV2Gx
+						EXjhejs9XrXNb0w8Gvv3iKwxzK8WWVFXh0udsKoeb/r84o98jDiDoSap9Lo5qDsJ
+						kIJd5dYCaP40h3qQHpFJiL7FAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUZIEkV81JvNOr4jmDXZhTgfg+MFQw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCUGA1UdEQQeMByCGmJldGEuc2hp
+						Yi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQC7+XD/MdO9ubLu
+						VRzKDAiKfSGwMwAxOEyijhv2UzOxD3ISxji1UsCHPWXs30woYDgdKBC5WIVD8qYV
+						DszYqyLcRu2mwUtL/He30t8XqFZj4Y9R9faP+0321G1vn61SiUXe+c81reveIy5y
+						p8sry9f/ENJJpXNEEllrmi15TW32kSNAjoyV7OFiI1QAdfypeX2oAkyeL504UvZe
+						CYUUMyN2JAp7PTGI7WkP72AZFSMxzUZCj9UteUkKYMEXfOiKvqp6MEPSTNLVrXHn
+						HETktGDZoR6CEfyI6TGfxD6muKXhDZvFEm1t3z/Lc3mtZT0MSRwzcmQf/I27UnlD
+						rjZU5UPE
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-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">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The University of Manchester (Beta)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:sam.jones@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.shib.manchester.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">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The University of Manchester (Beta)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Jones</md:SurName>
+    <md:EmailAddress>mailto:sam.jones@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>