replace with swamid master metadata registry

git-svn-id: svn+ssh://svn.it.su.se/svn/swamid-metadata/trunk@39 0878fbc5-a6f2-46f6-b174-cb7b08c221d1

1 files changed, 5 insertions, 5 deletions

diff --git a/swamid-1.0/idp.test.umu.se.xml b/swamid-1.0/idp.test.umu.se.xml
index f67a98d4..66f5f897 100644
--- a/swamid-1.0/idp.test.umu.se.xml
+++ b/swamid-1.0/idp.test.umu.se.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.test.umu.se/identity">
-  <AttributeAuthorityDescriptor ID="role-61" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <Extensions>
       <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">umu.se</shibmeta:Scope>
     </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIEXDCCA0SgAwIBAgICAaQwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wNzAzMTQxMjI4MTFaFw0wODAzMTMxMjI4MTFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggHbMIIB1zAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUtYn8hRBOx2BIGPfGr6FNI3apmTkwfwYDVR0jBHgwdoAUdpABx++trgCx92nZ/hUorOYyzkChW6RZMFcxCzAJBgNVBAYTAlNFMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkxEzARBgNVBAsTClN3VVBLSS1QQ0ExGTAXBgNVBAMTEFN3VVBLSSBQb2xpY3kgQ0GCAREwKgYDVR0SBCMwIYEJY2FAdW11LnNlhhRodHRwOi8vd3d3LmNhLnVtdS5zZTAwBgNVHR8EKTAnMCWgI6Ahhh9odHRwOi8vd3d3LmNhLnVtdS5zZS9jcmxfdjIuY3JsMBEGCWCGSAGG+EIBAQQEAwIGQDAsBglghkgBhvhCAQ0EHxYdV1dXLVNlcnZlciBvZiBVbWVhIFVuaXZlcnNpdHkwfgYDVR0gBHcwdTBzBggqhXArAgEBATBnMCQGCCsGAQUFBwIBFhhodHRwOi8vd3d3LmNhLnVtdS5zZS9DUFMwPwYIKwYBBQUHAgIwMxoxTGltaXRlZCBMaWFiaWxpdHksIHNlZSBodHRwOi8vd3d3LnN3dXBraS5zdS5zZS9DUDANBgkqhkiG9w0BAQUFAAOCAQEAjPbzGnpeXpzXuQGQeZA5aZqfxi/2R6osH94vLj0rDuSJk5mynCD5t+hgcqWOuD43VT++vBMGnDe060c9M3TyQA9ZsIxVivZArAfnb6bqgca9xB7DLOITBHhZeKgOjT/TUsfNBdZEILDbNmyOfhTgS97scfitAvCowIMwvsCmVTfFZwG5u1rJp4SpJwwZb/ekpkU6wLYRaLzkoZW8f5ivKKHJWud+iddkg71yMnMFigWQIRfNdaK+wz9oZwc+AyPwqz4u7BJlg4Z2SgKutjIwyMqLkm1g5Od5y1sF+Wpq5/mzK9FuS6oLzDSTmb3Q5IRbFzlTghqsLEsb3pRHXCrk/A==</ds:X509Certificate>
+          <ds:X509Certificate>MIIEOjCCAyKgAwIBAgICAd4wDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wODAzMTIxNDEwNDFaFw0wODExMDcxNDEwNDFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggG5MIIBtTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFLWJ/IUQTsdgSBj3xq+hTSN2qZk5MH8GA1UdIwR4MHaAFHaQAcfvra4Asfdp2f4VKKzmMs5AoVukWTBXMQswCQYDVQQGEwJTRTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRMwEQYDVQQLEwpTd1VQS0ktUENBMRkwFwYDVQQDExBTd1VQS0kgUG9saWN5IENBggERMCoGA1UdEgQjMCGBCWNhQHVtdS5zZYYUaHR0cDovL3d3dy5jYS51bXUuc2UwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL3d3dy5jYS51bXUuc2UvY3JsX3YyLmNybDB+BgNVHSAEdzB1MHMGCCqFcCsCAQEBMGcwJAYIKwYBBQUHAgEWGGh0dHA6Ly93d3cuY2EudW11LnNlL0NQUzA/BggrBgEFBQcCAjAzGjFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly93d3cuc3d1cGtpLnN1LnNlL0NQMA0GCSqGSIb3DQEBBQUAA4IBAQBjHF+0/RXKijMD2t6taOHp61TSP47fa/s9gD2H7mjlXKxwf2VHaN2mQ5Cy71atSzWpgfArCbND6lYLIaguDqkj+TtJAse3VBFe/nlaY5ewKxfaCLnnNGGNnoFaoVjTiZYrSYvSsqHjMmwIsgeAhVtAagkmB71B6QRL7nXwAJffNa1LVpVVI4e5T1tKa9BB5Z7LwqZSnC/MnBkNEU9h/Lw3gzIZyijNbnkOAVBnRf9gJwC8dHNafWhHyGj4urC2/GZIR+Mt+5HgQ2DKufHBjMv4a6edLS/gZFb4KfxmjgZDrb0ZC75Y9lcqiz8QZDXbu/4/ptMx7dNkEPfwJyuOD0TP</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.umu.se:9443/shibboleth-idp/AA"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
   </AttributeAuthorityDescriptor>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-62" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
       <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">umu.se</shibmeta:Scope>
     </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIEXDCCA0SgAwIBAgICAaQwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wNzAzMTQxMjI4MTFaFw0wODAzMTMxMjI4MTFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggHbMIIB1zAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUtYn8hRBOx2BIGPfGr6FNI3apmTkwfwYDVR0jBHgwdoAUdpABx++trgCx92nZ/hUorOYyzkChW6RZMFcxCzAJBgNVBAYTAlNFMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkxEzARBgNVBAsTClN3VVBLSS1QQ0ExGTAXBgNVBAMTEFN3VVBLSSBQb2xpY3kgQ0GCAREwKgYDVR0SBCMwIYEJY2FAdW11LnNlhhRodHRwOi8vd3d3LmNhLnVtdS5zZTAwBgNVHR8EKTAnMCWgI6Ahhh9odHRwOi8vd3d3LmNhLnVtdS5zZS9jcmxfdjIuY3JsMBEGCWCGSAGG+EIBAQQEAwIGQDAsBglghkgBhvhCAQ0EHxYdV1dXLVNlcnZlciBvZiBVbWVhIFVuaXZlcnNpdHkwfgYDVR0gBHcwdTBzBggqhXArAgEBATBnMCQGCCsGAQUFBwIBFhhodHRwOi8vd3d3LmNhLnVtdS5zZS9DUFMwPwYIKwYBBQUHAgIwMxoxTGltaXRlZCBMaWFiaWxpdHksIHNlZSBodHRwOi8vd3d3LnN3dXBraS5zdS5zZS9DUDANBgkqhkiG9w0BAQUFAAOCAQEAjPbzGnpeXpzXuQGQeZA5aZqfxi/2R6osH94vLj0rDuSJk5mynCD5t+hgcqWOuD43VT++vBMGnDe060c9M3TyQA9ZsIxVivZArAfnb6bqgca9xB7DLOITBHhZeKgOjT/TUsfNBdZEILDbNmyOfhTgS97scfitAvCowIMwvsCmVTfFZwG5u1rJp4SpJwwZb/ekpkU6wLYRaLzkoZW8f5ivKKHJWud+iddkg71yMnMFigWQIRfNdaK+wz9oZwc+AyPwqz4u7BJlg4Z2SgKutjIwyMqLkm1g5Od5y1sF+Wpq5/mzK9FuS6oLzDSTmb3Q5IRbFzlTghqsLEsb3pRHXCrk/A==</ds:X509Certificate>
+          <ds:X509Certificate>MIIEOjCCAyKgAwIBAgICAd4wDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wODAzMTIxNDEwNDFaFw0wODExMDcxNDEwNDFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggG5MIIBtTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFLWJ/IUQTsdgSBj3xq+hTSN2qZk5MH8GA1UdIwR4MHaAFHaQAcfvra4Asfdp2f4VKKzmMs5AoVukWTBXMQswCQYDVQQGEwJTRTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRMwEQYDVQQLEwpTd1VQS0ktUENBMRkwFwYDVQQDExBTd1VQS0kgUG9saWN5IENBggERMCoGA1UdEgQjMCGBCWNhQHVtdS5zZYYUaHR0cDovL3d3dy5jYS51bXUuc2UwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL3d3dy5jYS51bXUuc2UvY3JsX3YyLmNybDB+BgNVHSAEdzB1MHMGCCqFcCsCAQEBMGcwJAYIKwYBBQUHAgEWGGh0dHA6Ly93d3cuY2EudW11LnNlL0NQUzA/BggrBgEFBQcCAjAzGjFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly93d3cuc3d1cGtpLnN1LnNlL0NQMA0GCSqGSIb3DQEBBQUAA4IBAQBjHF+0/RXKijMD2t6taOHp61TSP47fa/s9gD2H7mjlXKxwf2VHaN2mQ5Cy71atSzWpgfArCbND6lYLIaguDqkj+TtJAse3VBFe/nlaY5ewKxfaCLnnNGGNnoFaoVjTiZYrSYvSsqHjMmwIsgeAhVtAagkmB71B6QRL7nXwAJffNa1LVpVVI4e5T1tKa9BB5Z7LwqZSnC/MnBkNEU9h/Lw3gzIZyijNbnkOAVBnRf9gJwC8dHNafWhHyGj4urC2/GZIR+Mt+5HgQ2DKufHBjMv4a6edLS/gZFb4KfxmjgZDrb0ZC75Y9lcqiz8QZDXbu/4/ptMx7dNkEPfwJyuOD0TP</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -31,7 +31,7 @@
   </IDPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">UU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Ume? University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">