From 4941e5e1f3f5302781909b95fbff4ceb8643451b Mon Sep 17 00:00:00 2001 From: Fredrik Åslund Date: Fri, 12 Apr 2013 10:48:44 +0200 Subject: entity-category research-and-education added for entityID:s: - https://bedomningshandboken.uhr.se/shibboleth - https://www.mit.ladok.se/gui-sp --- swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml | 7 +++++++ swamid-2.0/www.mit.ladok.se-gui-sp.xml | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml index 6c218369..55c613c2 100644 --- a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml +++ b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml @@ -22,6 +22,13 @@ Bedömningshandboken utgör, vid sidan om Högskoleförordning och Högskoleverkets föreskrifter, underlaget för antagning till utbildning pÃ¥ grundnivÃ¥ och avancerad nivÃ¥. Den utgör även grund för den överenskommelse som UHR har med universitet och högskolor som genomför sin antagning med stöd av det gemensamma antagningssystemet NyA. https://bedomningshandboken.uhr.se/ + + + http://www.swamid.se/category/research-and-education + + diff --git a/swamid-2.0/www.mit.ladok.se-gui-sp.xml b/swamid-2.0/www.mit.ladok.se-gui-sp.xml index 37826cf6..e1307b9f 100644 --- a/swamid-2.0/www.mit.ladok.se-gui-sp.xml +++ b/swamid-2.0/www.mit.ladok.se-gui-sp.xml @@ -1,7 +1,3 @@ - @@ -21,6 +17,13 @@ and do *NOT* provide it in real time to your partners. Ladok3-projektets Migrations-, Integrations- och Testmiljö (MIT-miljön) https://confluence.its.umu.se/confluence/pages/viewpage.action?pageId=5310677 + + + http://www.swamid.se/category/research-and-education + + -- cgit v1.2.3 From 24273f14814ed9e7d73f0c35a92be78af4e4ae15 Mon Sep 17 00:00:00 2001 From: Fredrik Åslund Date: Fri, 12 Apr 2013 11:00:27 +0200 Subject: https://samlidp.ki.se/idp/shibboleth removed SWAMIDOPS-6872 --- swamid-1.0.mxml | 1 - swamid-1.0/samlidp.ki.se.xml | 118 -------------------------- swamid-idp-2.0.mxml | 1 - swamid-interfederations-2.0.mxml | 1 - swamid-interfederations-2.0/samlidp.ki.se.xml | 112 ------------------------ swamid-ki-sll-1.0.mxml | 1 - 6 files changed, 234 deletions(-) delete mode 100644 swamid-1.0/samlidp.ki.se.xml delete mode 100644 swamid-interfederations-2.0/samlidp.ki.se.xml diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml index a60eb931..04a42616 100644 --- a/swamid-1.0.mxml +++ b/swamid-1.0.mxml @@ -43,7 +43,6 @@ - diff --git a/swamid-1.0/samlidp.ki.se.xml b/swamid-1.0/samlidp.ki.se.xml deleted file mode 100644 index 0eed632c..00000000 --- a/swamid-1.0/samlidp.ki.se.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - ki.se - - - - - - -MIIDIDCCAgigAwIBAgIVAJRIfZUHqE36X1wo3nmAK7/a0GBrMA0GCSqGSIb3DQEB -BQUAMBgxFjAUBgNVBAMTDXNhbWxpZHAua2kuc2UwHhcNMDkwNzE1MDkxNjEwWhcN -MjkwNzE1MDkxNjEwWjAYMRYwFAYDVQQDEw1zYW1saWRwLmtpLnNlMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndLAX/sAb7KLdWo9SO4Xh3+TvCNZ/IoJ -Cbzn68TtEYJ80JJI0HedJRb0b7BvpZuBGFzml7TRVbRNmiXIKNpabhiVzDUKfRoJ -wloFtyI5k3EvunGwxE9kvkTbMRutsclF1eCYAOGLxH8kyBbvAU9S3ouxJ+1BxeSi -g2OM1dtUXVHKOAesJ+OaLc76HsrBaeLEEJlquDM5BUR9vIlqVswK9rqcJGkXVoyP -vbTwj1y2GAwIuXo2JnJ5YQYiPHxBl4T/+jLasDC5bpxTd5G/z16tYuhtafy5hYr+ -elqBJUnANL+W1fYzlC9uzRtTYHqBT6VjrK0gji8toaiVr0oSeh6pxQIDAQABo2Ew -XzA+BgNVHREENzA1gg1zYW1saWRwLmtpLnNlhiRodHRwczovL3NhbWxpZHAua2ku -c2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC0rBm/3TPyAM04dzkXTF/iDFeHL -MA0GCSqGSIb3DQEBBQUAA4IBAQCVEBymTnCX9oJtcbzKBE91s84dvllXnVVYxoZe -foKBs+1z/9vNV2YC+3jS6G2Ws5NH7MNx8uhHHNcEzpoqol8fkrhtKRr1rmEjrZHj -hJ1+DLCDLV6/rvh9/Qw1OoozKGbERMczImkB65LddYJn/HqkJNbOio2nQe1yFuxD -e2uMNb5IldFcRQ2O1p2slZhmR8h25g64mB9xzLso7+Y+zLoGYuIild2zlQ6QOcAP -ZHbViHEq6MAKR86+yiVaEalpQOsUOILf21GWsZiTjT70uAMx84RzjVMS0LhgxJu5 -KgetXg7iTjcWRVve8lVZNG2foRZdbmOXow95IEKdfewtfiYR - - - - - - - - - - - urn:mace:shibboleth:1.0:nameIdentifier - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - - - - - - - - - - - - - ki.se - - - - - - -MIIDIDCCAgigAwIBAgIVAJRIfZUHqE36X1wo3nmAK7/a0GBrMA0GCSqGSIb3DQEB -BQUAMBgxFjAUBgNVBAMTDXNhbWxpZHAua2kuc2UwHhcNMDkwNzE1MDkxNjEwWhcN -MjkwNzE1MDkxNjEwWjAYMRYwFAYDVQQDEw1zYW1saWRwLmtpLnNlMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndLAX/sAb7KLdWo9SO4Xh3+TvCNZ/IoJ -Cbzn68TtEYJ80JJI0HedJRb0b7BvpZuBGFzml7TRVbRNmiXIKNpabhiVzDUKfRoJ -wloFtyI5k3EvunGwxE9kvkTbMRutsclF1eCYAOGLxH8kyBbvAU9S3ouxJ+1BxeSi -g2OM1dtUXVHKOAesJ+OaLc76HsrBaeLEEJlquDM5BUR9vIlqVswK9rqcJGkXVoyP -vbTwj1y2GAwIuXo2JnJ5YQYiPHxBl4T/+jLasDC5bpxTd5G/z16tYuhtafy5hYr+ -elqBJUnANL+W1fYzlC9uzRtTYHqBT6VjrK0gji8toaiVr0oSeh6pxQIDAQABo2Ew -XzA+BgNVHREENzA1gg1zYW1saWRwLmtpLnNlhiRodHRwczovL3NhbWxpZHAua2ku -c2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC0rBm/3TPyAM04dzkXTF/iDFeHL -MA0GCSqGSIb3DQEBBQUAA4IBAQCVEBymTnCX9oJtcbzKBE91s84dvllXnVVYxoZe -foKBs+1z/9vNV2YC+3jS6G2Ws5NH7MNx8uhHHNcEzpoqol8fkrhtKRr1rmEjrZHj -hJ1+DLCDLV6/rvh9/Qw1OoozKGbERMczImkB65LddYJn/HqkJNbOio2nQe1yFuxD -e2uMNb5IldFcRQ2O1p2slZhmR8h25g64mB9xzLso7+Y+zLoGYuIild2zlQ6QOcAP -ZHbViHEq6MAKR86+yiVaEalpQOsUOILf21GWsZiTjT70uAMx84RzjVMS0LhgxJu5 -KgetXg7iTjcWRVve8lVZNG2foRZdbmOXow95IEKdfewtfiYR - - - - - - - - - - - urn:mace:shibboleth:1.0:nameIdentifier - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - - - - KIOLD - Karolinska Institutet (TEST) - http://www.ki.se - - - Karolinska Institutet - it-support@ki.se - - - diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index 42f4910d..33cf6fcc 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -23,7 +23,6 @@ - diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml index f343b505..52fe2e64 100644 --- a/swamid-interfederations-2.0.mxml +++ b/swamid-interfederations-2.0.mxml @@ -218,7 +218,6 @@ - diff --git a/swamid-interfederations-2.0/samlidp.ki.se.xml b/swamid-interfederations-2.0/samlidp.ki.se.xml deleted file mode 100644 index 9c29a08e..00000000 --- a/swamid-interfederations-2.0/samlidp.ki.se.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - -http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf - - - - - - - ki.se - - - - - - -MIIDIDCCAgigAwIBAgIVAJRIfZUHqE36X1wo3nmAK7/a0GBrMA0GCSqGSIb3DQEB -BQUAMBgxFjAUBgNVBAMTDXNhbWxpZHAua2kuc2UwHhcNMDkwNzE1MDkxNjEwWhcN -MjkwNzE1MDkxNjEwWjAYMRYwFAYDVQQDEw1zYW1saWRwLmtpLnNlMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndLAX/sAb7KLdWo9SO4Xh3+TvCNZ/IoJ -Cbzn68TtEYJ80JJI0HedJRb0b7BvpZuBGFzml7TRVbRNmiXIKNpabhiVzDUKfRoJ -wloFtyI5k3EvunGwxE9kvkTbMRutsclF1eCYAOGLxH8kyBbvAU9S3ouxJ+1BxeSi -g2OM1dtUXVHKOAesJ+OaLc76HsrBaeLEEJlquDM5BUR9vIlqVswK9rqcJGkXVoyP -vbTwj1y2GAwIuXo2JnJ5YQYiPHxBl4T/+jLasDC5bpxTd5G/z16tYuhtafy5hYr+ -elqBJUnANL+W1fYzlC9uzRtTYHqBT6VjrK0gji8toaiVr0oSeh6pxQIDAQABo2Ew -XzA+BgNVHREENzA1gg1zYW1saWRwLmtpLnNlhiRodHRwczovL3NhbWxpZHAua2ku -c2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC0rBm/3TPyAM04dzkXTF/iDFeHL -MA0GCSqGSIb3DQEBBQUAA4IBAQCVEBymTnCX9oJtcbzKBE91s84dvllXnVVYxoZe -foKBs+1z/9vNV2YC+3jS6G2Ws5NH7MNx8uhHHNcEzpoqol8fkrhtKRr1rmEjrZHj -hJ1+DLCDLV6/rvh9/Qw1OoozKGbERMczImkB65LddYJn/HqkJNbOio2nQe1yFuxD -e2uMNb5IldFcRQ2O1p2slZhmR8h25g64mB9xzLso7+Y+zLoGYuIild2zlQ6QOcAP -ZHbViHEq6MAKR86+yiVaEalpQOsUOILf21GWsZiTjT70uAMx84RzjVMS0LhgxJu5 -KgetXg7iTjcWRVve8lVZNG2foRZdbmOXow95IEKdfewtfiYR - - - - - - - - - - - urn:mace:shibboleth:1.0:nameIdentifier - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - - - - - - - - - - - - - ki.se - - - - - - -MIIDIDCCAgigAwIBAgIVAJRIfZUHqE36X1wo3nmAK7/a0GBrMA0GCSqGSIb3DQEB -BQUAMBgxFjAUBgNVBAMTDXNhbWxpZHAua2kuc2UwHhcNMDkwNzE1MDkxNjEwWhcN -MjkwNzE1MDkxNjEwWjAYMRYwFAYDVQQDEw1zYW1saWRwLmtpLnNlMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndLAX/sAb7KLdWo9SO4Xh3+TvCNZ/IoJ -Cbzn68TtEYJ80JJI0HedJRb0b7BvpZuBGFzml7TRVbRNmiXIKNpabhiVzDUKfRoJ -wloFtyI5k3EvunGwxE9kvkTbMRutsclF1eCYAOGLxH8kyBbvAU9S3ouxJ+1BxeSi -g2OM1dtUXVHKOAesJ+OaLc76HsrBaeLEEJlquDM5BUR9vIlqVswK9rqcJGkXVoyP -vbTwj1y2GAwIuXo2JnJ5YQYiPHxBl4T/+jLasDC5bpxTd5G/z16tYuhtafy5hYr+ -elqBJUnANL+W1fYzlC9uzRtTYHqBT6VjrK0gji8toaiVr0oSeh6pxQIDAQABo2Ew -XzA+BgNVHREENzA1gg1zYW1saWRwLmtpLnNlhiRodHRwczovL3NhbWxpZHAua2ku -c2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC0rBm/3TPyAM04dzkXTF/iDFeHL -MA0GCSqGSIb3DQEBBQUAA4IBAQCVEBymTnCX9oJtcbzKBE91s84dvllXnVVYxoZe -foKBs+1z/9vNV2YC+3jS6G2Ws5NH7MNx8uhHHNcEzpoqol8fkrhtKRr1rmEjrZHj -hJ1+DLCDLV6/rvh9/Qw1OoozKGbERMczImkB65LddYJn/HqkJNbOio2nQe1yFuxD -e2uMNb5IldFcRQ2O1p2slZhmR8h25g64mB9xzLso7+Y+zLoGYuIild2zlQ6QOcAP -ZHbViHEq6MAKR86+yiVaEalpQOsUOILf21GWsZiTjT70uAMx84RzjVMS0LhgxJu5 -KgetXg7iTjcWRVve8lVZNG2foRZdbmOXow95IEKdfewtfiYR - - - - - - - - - - - urn:mace:shibboleth:1.0:nameIdentifier - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - - - - - - - KIOLD - Karolinska Institutet (TEST) - http://www.ki.se - - - Karolinska Institutet - it-support@ki.se - - diff --git a/swamid-ki-sll-1.0.mxml b/swamid-ki-sll-1.0.mxml index 3b70df0d..e920050a 100644 --- a/swamid-ki-sll-1.0.mxml +++ b/swamid-ki-sll-1.0.mxml @@ -1,6 +1,5 @@ - -- cgit v1.2.3