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-02.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-02.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..90443ec0
--- /dev/null
+++ b/swamid-2.0/nya-02.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-02.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-02.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMC3o/cGztHzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE5WhcNMjAwOTE0
+MTQ0NzE5WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Se4UsAYlrJML+64RMKxcmLy+d9/ixET
+yVWHrq0EbIBOyHasqQyIpiFmVmA7rHCIDCrt97pEgOMUbDX2O7ERNlJkAeS0Mn5s
++YqBdw4TO4IfNgOZ+VDgHrlfVfwEAXsbciVWrVhCl2DxjuH97zsBP3X5L3EL76Bk
+eO52aUnoomhk0W58Aean/vYExIJNhJ5KTB/l5+yQrzb9jPhCLojoWxkFZw9YwpDD
+wY9vXiHLYV5lnxGumexLPRNS431ZdTK3lQHufNUGcsCXuzfQlc4AhOShl+gL8UVk
+NhiXzmWADuV+TEY6XxPi28S4qwixsuq4Ru8Z9jPIp6RSfJYjXGdDmwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRER/XM1kOU3OLa+Z428fpJ
+KCWDIDANBgkqhkiG9w0BAQUFAAOCAQEAYLMTbmo4PBtUZRCHy4iqqIXkoVY/9BTa
+31m7huEnpoYJPgtIrhxJAOCMQAnrG2aDg9jaVULaDYkdWX9EQkqAOIMH8J3iPe2x
+xr1P94+XDCRcJ0PqvWvtCqQTeMFFfDAA5cwaIaWtBRb+zD1L3G3gy2d2KeBm+ew4
+QmM6Ua9R5vYd7f1h/gLO6G/0Hj+Sl/AzzYtn4CUWMu+4mjxfONKGIpAkStuOZg4w
+fOkcNxjPCqUlgwqdF3sQSY8Rza/r3nqzLyba35r2HFflRW6yksSazFVf4k0xGPGr
+lAQAdUGXhsatw6HPstBeA8giygckztO/adctBws4k9IcAa8M++TXFg==
+</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-02.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMC3o/cGztHzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE5WhcNMjAwOTE0
+MTQ0NzE5WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Se4UsAYlrJML+64RMKxcmLy+d9/ixET
+yVWHrq0EbIBOyHasqQyIpiFmVmA7rHCIDCrt97pEgOMUbDX2O7ERNlJkAeS0Mn5s
++YqBdw4TO4IfNgOZ+VDgHrlfVfwEAXsbciVWrVhCl2DxjuH97zsBP3X5L3EL76Bk
+eO52aUnoomhk0W58Aean/vYExIJNhJ5KTB/l5+yQrzb9jPhCLojoWxkFZw9YwpDD
+wY9vXiHLYV5lnxGumexLPRNS431ZdTK3lQHufNUGcsCXuzfQlc4AhOShl+gL8UVk
+NhiXzmWADuV+TEY6XxPi28S4qwixsuq4Ru8Z9jPIp6RSfJYjXGdDmwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRER/XM1kOU3OLa+Z428fpJ
+KCWDIDANBgkqhkiG9w0BAQUFAAOCAQEAYLMTbmo4PBtUZRCHy4iqqIXkoVY/9BTa
+31m7huEnpoYJPgtIrhxJAOCMQAnrG2aDg9jaVULaDYkdWX9EQkqAOIMH8J3iPe2x
+xr1P94+XDCRcJ0PqvWvtCqQTeMFFfDAA5cwaIaWtBRb+zD1L3G3gy2d2KeBm+ew4
+QmM6Ua9R5vYd7f1h/gLO6G/0Hj+Sl/AzzYtn4CUWMu+4mjxfONKGIpAkStuOZg4w
+fOkcNxjPCqUlgwqdF3sQSY8Rza/r3nqzLyba35r2HFflRW6yksSazFVf4k0xGPGr
+lAQAdUGXhsatw6HPstBeA8giygckztO/adctBws4k9IcAa8M++TXFg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.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-02.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-02.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-02.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-02.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-02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>