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-26.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-26.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..176bdb3e
--- /dev/null
+++ b/swamid-2.0/nya-26.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-26.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-26.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANPMHs+BB/iEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3
+MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDedjUfQw5R3giUe3QQtdOcPm7nPSQh0
+OmMCaLEyjBhPx48lnT5MK+2zVeUK8L82C+MKkGYTjO2JP7uk0VfIlms1LgdmkNK7
+M6Qfyd2C9JJJK+xNoejf/hreMZ0/KU47x5UlS502tFzuXSnau/07GwEzbjX6qWMc
+o1PExvlVaL12308w3RqtnOXo9Gv6vPvUmb6/GwIr6ASC1IGXE3FSBAZc32IJGHcO
+BG5EuM61UpPd5j/emZVgDN0+GaUDT8cm7NiqWYfacPyay1+ddnsNX+viYtAPeWzR
+QxwYQe662E1OEKAmyvGf2+YZF1aShseIJcyZFVx4fnQ/MAhRD5CdHwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRxs9AFvhAkl0y6Oi2rUERQ
+PE+JTjANBgkqhkiG9w0BAQUFAAOCAQEAYYKQmoM4/5D1f9jQTGBF+bvxFKLsL//F
+ZnsxU3m2QQhXE/So/i6bSo0hW6OOndllcM4QZg5ElhgS7UxUd2cUtIDq3k1AtPqM
+MC4bAHUU87jb3wJ1jUkGEGSdj0W4ZrG3N0D0TOzEXFu8oIM9cDJg43nN9DfznTHT
+7/3BYhHHxboTA/ZmXtRKnAmSTeeRmd8r6soxgGjLOCn53XqF+7P89jjgUzrrq0kB
+yzfEuj5Sg+l4mvUJ7qjUVBIHMK282Qez/xYl/svOKFZKRh6/6MYn8wCUlICIPEYB
+90YPkBD99DRXnjFWk9l30fyTCYcxuofuoOj5u8/VWIXvgoi75dmgiw==
+</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-26.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANPMHs+BB/iEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3
+MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDedjUfQw5R3giUe3QQtdOcPm7nPSQh0
+OmMCaLEyjBhPx48lnT5MK+2zVeUK8L82C+MKkGYTjO2JP7uk0VfIlms1LgdmkNK7
+M6Qfyd2C9JJJK+xNoejf/hreMZ0/KU47x5UlS502tFzuXSnau/07GwEzbjX6qWMc
+o1PExvlVaL12308w3RqtnOXo9Gv6vPvUmb6/GwIr6ASC1IGXE3FSBAZc32IJGHcO
+BG5EuM61UpPd5j/emZVgDN0+GaUDT8cm7NiqWYfacPyay1+ddnsNX+viYtAPeWzR
+QxwYQe662E1OEKAmyvGf2+YZF1aShseIJcyZFVx4fnQ/MAhRD5CdHwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRxs9AFvhAkl0y6Oi2rUERQ
+PE+JTjANBgkqhkiG9w0BAQUFAAOCAQEAYYKQmoM4/5D1f9jQTGBF+bvxFKLsL//F
+ZnsxU3m2QQhXE/So/i6bSo0hW6OOndllcM4QZg5ElhgS7UxUd2cUtIDq3k1AtPqM
+MC4bAHUU87jb3wJ1jUkGEGSdj0W4ZrG3N0D0TOzEXFu8oIM9cDJg43nN9DfznTHT
+7/3BYhHHxboTA/ZmXtRKnAmSTeeRmd8r6soxgGjLOCn53XqF+7P89jjgUzrrq0kB
+yzfEuj5Sg+l4mvUJ7qjUVBIHMK282Qez/xYl/svOKFZKRh6/6MYn8wCUlICIPEYB
+90YPkBD99DRXnjFWk9l30fyTCYcxuofuoOj5u8/VWIXvgoi75dmgiw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.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-26.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-26.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-26.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-26.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-26.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>