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-18.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-18.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..23727b2e
--- /dev/null
+++ b/swamid-2.0/nya-18.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-18.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-18.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPaOYe2VSoQUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4
+MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxA0jnM15oF28eH75fJWmca5MLEVle3qN
+YXbcCFrOcagIkC2BuXeCXlPZFHl9PrtutR3OAsAWR930YDxiAmKZVY+HI0uDPw6/
+hFjZo/Q+i8BosKp872qtlpM34TH+8c1FRWpj7ag8lcNKQXHmbgdQbgtCL8u6mWg5
+QK8SuFqI7EHoO3gy5hUm/bB/LBSxF7Llqrlb7of62zM48fsFvuZR+hQYoEPFanu1
+qCXlVfISZy4sH/C4b0joC2vjWgwEOlrDnzCumbNaXKuB6esu/NkP86ZYyzQiDaG4
+M2dkbttjtbx1L/WCpTWTPdyLnmCyibBWwAUEBB5TBsYjxpI+99pfhQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSfAMLMkgvvpzKT1zBRW8p1
+UaJ1QjANBgkqhkiG9w0BAQUFAAOCAQEATazLdy5mdxOtpjgN66QK/0sHyBQ1Lxk/
+FbwOxMZv2LY4OMHrwLe/VYizg+b+wP5FMe8SP8+mzLI0Y9F4+8b6DRJaUbRilubo
+464T5PNK2ciL1ROSlCmMlFe+V/bdi/AYbS3IRCH2d7JV/Let2zB4cA4sCVlTpwLk
+KPzxCZ4lcmm373gKa4RgCYSDMgMDDcETRy9iCrjhqtd4iVBwq0db/CLj15tN9meF
+kdgJQJhkP9Tjqlm/GDkSAaOtqtWb694v25xOoZ09KhmH4BjNmEgQ0+KayC9TxaqL
+hqoEJrT/VOpdDv4cepDFT+DtuJzyx7UyZTrVc/mHu6UCMuozleXcyw==
+</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-18.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPaOYe2VSoQUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4
+MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxA0jnM15oF28eH75fJWmca5MLEVle3qN
+YXbcCFrOcagIkC2BuXeCXlPZFHl9PrtutR3OAsAWR930YDxiAmKZVY+HI0uDPw6/
+hFjZo/Q+i8BosKp872qtlpM34TH+8c1FRWpj7ag8lcNKQXHmbgdQbgtCL8u6mWg5
+QK8SuFqI7EHoO3gy5hUm/bB/LBSxF7Llqrlb7of62zM48fsFvuZR+hQYoEPFanu1
+qCXlVfISZy4sH/C4b0joC2vjWgwEOlrDnzCumbNaXKuB6esu/NkP86ZYyzQiDaG4
+M2dkbttjtbx1L/WCpTWTPdyLnmCyibBWwAUEBB5TBsYjxpI+99pfhQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSfAMLMkgvvpzKT1zBRW8p1
+UaJ1QjANBgkqhkiG9w0BAQUFAAOCAQEATazLdy5mdxOtpjgN66QK/0sHyBQ1Lxk/
+FbwOxMZv2LY4OMHrwLe/VYizg+b+wP5FMe8SP8+mzLI0Y9F4+8b6DRJaUbRilubo
+464T5PNK2ciL1ROSlCmMlFe+V/bdi/AYbS3IRCH2d7JV/Let2zB4cA4sCVlTpwLk
+KPzxCZ4lcmm373gKa4RgCYSDMgMDDcETRy9iCrjhqtd4iVBwq0db/CLj15tN9meF
+kdgJQJhkP9Tjqlm/GDkSAaOtqtWb694v25xOoZ09KhmH4BjNmEgQ0+KayC9TxaqL
+hqoEJrT/VOpdDv4cepDFT+DtuJzyx7UyZTrVc/mHu6UCMuozleXcyw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.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-18.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-18.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-18.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-18.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-18.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>