swamid-1.0* removed

nya-1.0* removed
non-used metadata moved to swamid-2.0-obsolete
swamid-1.0/* moved to swamid-2.0/
nya-1.0/* moved to swamid-2.0/
mxml cleaned from swamid-1.0 data
Makefile cleaned from nya-1.0 and swamid-1.0 data

1 files changed, 50 insertions, 0 deletions

diff --git a/swamid-2.0/nya-19.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-19.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..b3ae0124
--- /dev/null
+++ b/swamid-2.0/nya-19.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-19.ladok.umu.se/aws-sp-en">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-19.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAL+66TyFwTytMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDUzWhcNMjExMjEz
+MTQxNDUzWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Jpp6y7+IX46QINFv1yM3XpY6Q0NGIh4
+PImfGX96kX8pVaAtnztN3J6/8hK+gkMQ7/wpQbzEE9OkmDSKk7mFaGEYCiRyXMBw
++3f8OmJRUGDemIg2uxoArrQcwfFSXdwBDViPQisI3mqTuyXRSGB6YTwQ3GSvggI4
+hydbhjWELgwy/whG3W9UyTaVCv0bzw6dQK/oxFa5anfniaWYcFHvTZ+PNq+hQYdJ
+CxP49b/DU+1m9WFQnHeuj+FjfhmozvfoI4SgvbkbPDD6+7/DIiMH/fGuNf68tkZs
+mjqM/UMbvdmh2aED/BJKiGgZW34ygPWhACi31bvRhMtp9C5u8Dij/wIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTkubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTZjzKQmCndYt1ty75V
+viGkn28MKjANBgkqhkiG9w0BAQUFAAOCAQEAhzEoD72gUG5T44P8XMO1ofBvcmnX
+eh8S2fK6v01UR2DcdnPNHamG9ln1wPqYKEX4FNpzBlrYamXgYcyoDDOiy1D0j14k
+aiymQ3N0QdpgIu5qM6J/ClkiSRgRnjNgdNkiasMXcG+brrAN166IeK+jT43NqhiV
+vZE9YvwNZPhZC8F9us/n96cMz7lW7cvwYgFQVEwlEP7zdnkk0HeopMxVUILL7nl0
+xT357BkGKeaFoFJIqXRGubefLB5rQw//6ijvOkT+qU05LfIn/DEv8aI6QClSUNpA
+76yifJ9yA+mlhfxPNSwX7CTQ+NgJdI8PndjhTbcxKjx3huoVcD54cp4SHw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>