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-03.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-03.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..e40a6b86
--- /dev/null
+++ b/swamid-2.0/nya-03.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-03.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-03.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALK7u4Fz/80MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTIwMDcyNDM0WhcNMjAwNTE3
+MDcyNDM0WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA05Rt5nZbYGkPTb5bGXNj0/U6BmjziVoP
+sNuoB/XDOz5xK6gTu4RHcfjXMPI1mnC4u1h2yAr9tCVhXs2inBo3rJ+y8/ElwIF1
+mue6aIkggPkmtHv6WHzgzkUvqe4id82sokpuG/bBmN2C0OF4sghI/jEYT6A7HkkO
+4F2LiXvwFOHGbUiZSPhlylE8qaooOaAXI+GK6YgXBAsNp6nXPmjHgVqaYNvLxV10
+owAXVaCrKCSeM00kkpWtlwlxkSOBqDUBBucyPhqN3IBhv9JAdCJ/DB58PFYJ2Xqo
+mh6LzzFSpznQYWp/q1fvWDgkXnXKZ3vjWTS5GSglSZDOSaQl80ir+QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR2l5jsL4fbPNHBeJLEhJ8S
+eAUpHTANBgkqhkiG9w0BAQUFAAOCAQEAtfR4vZI1bbKzNrm8TwPwkVcHYOpVMoIA
+O9Zx2nj+vSZG/YuIa66TN54021JaPABbdoMcJTd9j+xFhEZTCVWr7UrhLwk+e9dO
+9MQKifI3clrlg8QPEqHqTao+EbzA4qS3V66McFN0sBIbDBw1ytm3phLXuvNKoQBT
+9NbMBZFEgWPT6Z4dCBx9BjCnLQEgwdqwd60g8z6ksvHUF2Kk8BdiNyoAcqbpb7tF
+83xkbNErea0Bu50mYdewcpxxaVEyfWnC5ZE2o/W09zznziFJ5XRj92fgomfFVysc
+u/U+ZV/5RHCzIBPq4uHnfyhOcbpZqzJIuM4Khz1hc01qrTR+1p+8dw==
+</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-03.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALK7u4Fz/80MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTIwMDcyNDM0WhcNMjAwNTE3
+MDcyNDM0WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA05Rt5nZbYGkPTb5bGXNj0/U6BmjziVoP
+sNuoB/XDOz5xK6gTu4RHcfjXMPI1mnC4u1h2yAr9tCVhXs2inBo3rJ+y8/ElwIF1
+mue6aIkggPkmtHv6WHzgzkUvqe4id82sokpuG/bBmN2C0OF4sghI/jEYT6A7HkkO
+4F2LiXvwFOHGbUiZSPhlylE8qaooOaAXI+GK6YgXBAsNp6nXPmjHgVqaYNvLxV10
+owAXVaCrKCSeM00kkpWtlwlxkSOBqDUBBucyPhqN3IBhv9JAdCJ/DB58PFYJ2Xqo
+mh6LzzFSpznQYWp/q1fvWDgkXnXKZ3vjWTS5GSglSZDOSaQl80ir+QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR2l5jsL4fbPNHBeJLEhJ8S
+eAUpHTANBgkqhkiG9w0BAQUFAAOCAQEAtfR4vZI1bbKzNrm8TwPwkVcHYOpVMoIA
+O9Zx2nj+vSZG/YuIa66TN54021JaPABbdoMcJTd9j+xFhEZTCVWr7UrhLwk+e9dO
+9MQKifI3clrlg8QPEqHqTao+EbzA4qS3V66McFN0sBIbDBw1ytm3phLXuvNKoQBT
+9NbMBZFEgWPT6Z4dCBx9BjCnLQEgwdqwd60g8z6ksvHUF2Kk8BdiNyoAcqbpb7tF
+83xkbNErea0Bu50mYdewcpxxaVEyfWnC5ZE2o/W09zznziFJ5XRj92fgomfFVysc
+u/U+ZV/5RHCzIBPq4uHnfyhOcbpZqzJIuM4Khz1hc01qrTR+1p+8dw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.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-03.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-03.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-03.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-03.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-03.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>