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

1 files changed, 45 insertions, 90 deletions

diff --git a/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml
index 883b91fe..6136af7b 100644
--- a/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oa-idp22.wlv.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA Test IdP for the University of Wolverhampton.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oa-idp22.wlv.ac.uk/oala/metadata">
+  <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>
@@ -12,95 +9,53 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T16:25:35Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEvjCCA6agAwIBAgIQTX3wkFC6FsnCVhSZ46A50jANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMDIxNTAwMDAwMFoXDTE1MDIxNDIzNTk1OVowgZYxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIEw1XZXN0IE1pZGxhbmRzMRYwFAYDVQQHEw1Xb2x2ZXJo
-						YW1wdG9uMSQwIgYDVQQKExtVbml2ZXJzaXR5IG9mIFdvbHZlcmhhbXB0b24xFDAS
-						BgNVBAsTC0lUIFNlcnZpY2VzMRswGQYDVQQDExJvYS1pZHAyMi53bHYuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKNvS+ca9N9VdTqaaMWoIY
-						ccGhuEicwubOq3r76uELbyYqGtmEz+DAKI92llFQKxMt5ux+k8n1fi6f9/m2mdNK
-						iIMGI1wrhMgXAHhJKLNsg93arNrF6UWqK80gQBlnemRdQ0g4qqirGjwoanu3vSLj
-						bhTWeU8fUD3aANRRVcIOMdubNSV/15067GUzj1w5oig1ql6BG1DSjNZgG//cqSJJ
-						TaeIFRRjpyuAjfwQDfLmW0N1ONrCVqjcc6XPzdXXuH0YE3mR2EgHp3rsQKAeeeqD
-						J0J/vr1jrj9CBz9vvcch492V1K0cWe/Tv1UIEphYLmr31MI3GLc8HVYMCzZGmKK/
-						AgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-						BgNVHQ4EFgQUr4+AliR7nkv/ACdGfkbRmY8c3iQwDgYDVR0PAQH/BAQDAgWgMAwG
-						A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1Ud
-						IAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2Ny
-						bC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBf
-						MDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcw
-						HQYDVR0RBBYwFIISb2EtaWRwMjIud2x2LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IB
-						AQCufhC69WjCGj6CjwryJwWXP32Q/fQn2T6mKX3Gu0rBX+d9VOibUjG50RjYgm3g
-						Ite0W/RfOnYoxkO9zl8/kGRtbNA00NnVcs3S/UFEkimUERYAMET2WnXREJgLRb6q
-						WgbXV7dxjXBuUQ2zaZerNB3joeI7Njz+taD8SCdBwrAaBNLVWahAsomcdglLVlO4
-						48joLepbOwUz19m3NGrPiMrQG325a/6s8S5nMCjI16C3liPHBg3dc1AfRsYT7cdf
-						Xkh9QaMmKgPXB4DRJupmRLNKpus/SBXOsl3Qk8ea3dFjRrFKaZrAcrfZUPoNIHxr
-						zcXZ5/D2sDn1kzoqflH8zN8g
+						MIIDWDCCAkCgAwIBAgIICo+mehMlNtowDQYJKoZIhvcNAQEFBQAwQzEkMCIGA1UE
+						CgwbVW5pdmVyc2l0eSBvZiBXb2x2ZXJoYW1wdG9uMRswGQYDVQQDDBJvYS1pZHAy
+						Mi53bHYuYWMudWswHhcNMTUwMTIwMTI1ODE5WhcNMjUwMTIwMTI1ODE5WjBDMSQw
+						IgYDVQQKDBtVbml2ZXJzaXR5IG9mIFdvbHZlcmhhbXB0b24xGzAZBgNVBAMMEm9h
+						LWlkcDIyLndsdi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AIm+DWXZjRBVNcSwWm76ONZ4PP97SOtfI9xLxSul1B6VGbaBj9psMTA83h9Thwyi
+						hnu4qql1o58dtH7u2Du2W9bIR0K3BT3Whn5N+oTB6dakZ5TIp27cHnZfedbQ3xfX
+						Ovg+eXl0hQieICaF5NW2zSJGKacp+cckbR6USlUMjVAmu8T+Q7afw2k3do5IyNF4
+						8FnuSL/S6PtwpbLMl5+DkQKS2pNXx76jqfGwoJBiXzxR43vyzIz6Lz6foh7B+sCH
+						PFB9w9nKQOSW0RTlUTSlNIRrFKYS8jBmGg0SYCTCqAOZQd/S2wDoNdxotnUh045c
+						PlS66duNqlV/BcMhGZriVocCAwEAAaNQME4wHQYDVR0OBBYEFCCaekjMQckGDHAs
+						uGTK2YWenmVqMB8GA1UdIwQYMBaAFCCaekjMQckGDHAsuGTK2YWenmVqMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGT5NNSjh5DLoY11NupSxaqm2kXx
+						Or1pIN4QgEPl5KKBxfnBGQSzzACg+pFzzhq7PS/1D1/ctmTAowDH7RNQLRNKMcq1
+						hD9bUfVfcItmYyR6RLFFX1TTvf94W2UbfVvblMbBY1+BLkPgRO7YFxGuhcdXTh9t
+						yBnW7SQuYB8OadqOhgnBxGohFnwIAxMzsQTBi0rd4ujeKiZxoMj27dzH0lIgKC7D
+						Yfu47aQJpYnVshufazOye5broAdudUUnilRdcrQpIRWOCBRVD4FhKP2c6RfQY3dl
+						xxc2jE/LIUkl6G9Kezhlig7zn3EuOjuClGhY1kfMQY48P2Cula64ZZ5Y9Vo=
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEvjCCA6agAwIBAgIQTX3wkFC6FsnCVhSZ46A50jANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMDIxNTAwMDAwMFoXDTE1MDIxNDIzNTk1OVowgZYxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIEw1XZXN0IE1pZGxhbmRzMRYwFAYDVQQHEw1Xb2x2ZXJo
-						YW1wdG9uMSQwIgYDVQQKExtVbml2ZXJzaXR5IG9mIFdvbHZlcmhhbXB0b24xFDAS
-						BgNVBAsTC0lUIFNlcnZpY2VzMRswGQYDVQQDExJvYS1pZHAyMi53bHYuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKNvS+ca9N9VdTqaaMWoIY
-						ccGhuEicwubOq3r76uELbyYqGtmEz+DAKI92llFQKxMt5ux+k8n1fi6f9/m2mdNK
-						iIMGI1wrhMgXAHhJKLNsg93arNrF6UWqK80gQBlnemRdQ0g4qqirGjwoanu3vSLj
-						bhTWeU8fUD3aANRRVcIOMdubNSV/15067GUzj1w5oig1ql6BG1DSjNZgG//cqSJJ
-						TaeIFRRjpyuAjfwQDfLmW0N1ONrCVqjcc6XPzdXXuH0YE3mR2EgHp3rsQKAeeeqD
-						J0J/vr1jrj9CBz9vvcch492V1K0cWe/Tv1UIEphYLmr31MI3GLc8HVYMCzZGmKK/
-						AgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-						BgNVHQ4EFgQUr4+AliR7nkv/ACdGfkbRmY8c3iQwDgYDVR0PAQH/BAQDAgWgMAwG
-						A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1Ud
-						IAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2Ny
-						bC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBf
-						MDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcw
-						HQYDVR0RBBYwFIISb2EtaWRwMjIud2x2LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IB
-						AQCufhC69WjCGj6CjwryJwWXP32Q/fQn2T6mKX3Gu0rBX+d9VOibUjG50RjYgm3g
-						Ite0W/RfOnYoxkO9zl8/kGRtbNA00NnVcs3S/UFEkimUERYAMET2WnXREJgLRb6q
-						WgbXV7dxjXBuUQ2zaZerNB3joeI7Njz+taD8SCdBwrAaBNLVWahAsomcdglLVlO4
-						48joLepbOwUz19m3NGrPiMrQG325a/6s8S5nMCjI16C3liPHBg3dc1AfRsYT7cdf
-						Xkh9QaMmKgPXB4DRJupmRLNKpus/SBXOsl3Qk8ea3dFjRrFKaZrAcrfZUPoNIHxr
-						zcXZ5/D2sDn1kzoqflH8zN8g
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oa-idp22.wlv.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oa-idp22.wlv.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Wolverhampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Wolverhampton (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Henderson</SurName>
-    <EmailAddress>mailto:d.henderson@wlv.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Henderson</SurName>
-    <EmailAddress>mailto:d.henderson@wlv.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oa-idp22.wlv.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oa-idp22.wlv.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wolverhampton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wolverhampton (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Henderson</md:SurName>
+    <md:EmailAddress>mailto:d.henderson@wlv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Henderson</md:SurName>
+    <md:EmailAddress>mailto:d.henderson@wlv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>