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, 74 insertions, 0 deletions

diff --git a/swamid-2.0/nya-24.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-24.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..e1bee9b6
--- /dev/null
+++ b/swamid-2.0/nya-24.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-24.ladok.umu.se/ecs-sp">
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-24.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK713ALYAB9MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQwWhcNMjEwMjI3
+MTYyODQwWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1FTy3dn7iCtDAEWmjJJxVdRs//aYtBqL
+Qe0eyeh8s6ZTqy00anqcG2d+IBsMVp3YHYf2m5iBdxPOUBskXTa5nMOBGZHq1ETR
+4WgbwnA/BXiBOvO0U13bFe/+Ki7/8UC7hnKJa4+DEK7Ix/5qcsbm8ycQNn0KcIse
+ZvCQ0BUFf91poUPzBj6VHoEygm1wCwgk1KTK0ydk7iq77UQlSLiguYS6xeRsGguK
+OCYaIYPRyHHenqzTuj0hwOeRfJsJigpLcMCgLSuGYbA7yNLCFqAKVDCMApNqdKpJ
+ttSwusQvXCcWzWOikasEteIqnaQvFaLloxZfYmiOpJI0Gr/WU9+HxwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjQubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRYG+yDfHlrXlfaaLEdiNQo
+altoJDANBgkqhkiG9w0BAQUFAAOCAQEAZIZlCdR5Y7+cWQIOSy9UIYImLhduZhO5
+PRSF2pTIkOc5GVU8XiQfvXE4cIz81eHTuQzD17Mj0vpJZ+Kff3UzlC2UdGvLZFJq
+GbNw/X0iNlTDGFqmV1gUoaDYdjscXDfUMvyxDPgqqC9Br51Hx3lUE0Rz0vc5Pvad
+k6+YrXv6JqVBG2CxPn+6S4RRexRpwl+ZcVYnSQd4hGc8EpERBsoaoOTVoPlPCSd/
+2/tUFqk0+1ohnogsUBgF/XoxTjO3JGpSrTRpGi5Kodlwn15BMFfH01PBZTQUE22N
+jzzpRcNDl02XzRamPoUJOUcLjCYUzRXNG52ydZh32L6QIazU3Qpt4w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-24.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK713ALYAB9MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQwWhcNMjEwMjI3
+MTYyODQwWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1FTy3dn7iCtDAEWmjJJxVdRs//aYtBqL
+Qe0eyeh8s6ZTqy00anqcG2d+IBsMVp3YHYf2m5iBdxPOUBskXTa5nMOBGZHq1ETR
+4WgbwnA/BXiBOvO0U13bFe/+Ki7/8UC7hnKJa4+DEK7Ix/5qcsbm8ycQNn0KcIse
+ZvCQ0BUFf91poUPzBj6VHoEygm1wCwgk1KTK0ydk7iq77UQlSLiguYS6xeRsGguK
+OCYaIYPRyHHenqzTuj0hwOeRfJsJigpLcMCgLSuGYbA7yNLCFqAKVDCMApNqdKpJ
+ttSwusQvXCcWzWOikasEteIqnaQvFaLloxZfYmiOpJI0Gr/WU9+HxwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjQubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRYG+yDfHlrXlfaaLEdiNQo
+altoJDANBgkqhkiG9w0BAQUFAAOCAQEAZIZlCdR5Y7+cWQIOSy9UIYImLhduZhO5
+PRSF2pTIkOc5GVU8XiQfvXE4cIz81eHTuQzD17Mj0vpJZ+Kff3UzlC2UdGvLZFJq
+GbNw/X0iNlTDGFqmV1gUoaDYdjscXDfUMvyxDPgqqC9Br51Hx3lUE0Rz0vc5Pvad
+k6+YrXv6JqVBG2CxPn+6S4RRexRpwl+ZcVYnSQd4hGc8EpERBsoaoOTVoPlPCSd/
+2/tUFqk0+1ohnogsUBgF/XoxTjO3JGpSrTRpGi5Kodlwn15BMFfH01PBZTQUE22N
+jzzpRcNDl02XzRamPoUJOUcLjCYUzRXNG52ydZh32L6QIazU3Qpt4w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>