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-04.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-04.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..962ba540
--- /dev/null
+++ b/swamid-2.0/nya-04.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-04.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-04.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKnzf9+A7wiPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI0WhcNMjAwOTE0
+MTQ0NzI0WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDRE1oUA3oIqPJd964ZrhbYgSuU3WnIh
+QaH7Me0Cr3PyFZKETJAWoTm5me28S/xCfgebEb2yoU/BC+6Su4cbvxLJx61+pYKf
+HOp5bmNEFhHZ+Im01+yCXQ0+/Er6MUN/y4SpNLo7kg7KlQhIjGvoR6Vb0ySLP04w
+fs3qHuUXLPwMZLlTVwKqUorJ+gV1T4BAiytnLVpXj2+ComfkKDwk9Z10BZHwDuvX
+RU/Pa8sCatx1JKKjtYReZzsgDcKgd11o/e7AM4tQYOcQBbb8m7dy2zySrl/iGAJz
+2quSjcxS7PRYOdgdu2SiOrK53HCysgp84KpsMjeSQn5kfy2ytgUuNwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT3iSLcrVBHW5d89yksIzgr
+HrlRRjANBgkqhkiG9w0BAQUFAAOCAQEAbg65zMQxHBXIWCmme2DLkBSmlZ9iJIyM
+rJpOD9jk7mnLRx8S0tq85pk1VTF9bDQMqG5spKdHToP2HmuXFbruO1jj9C0Tp61c
+QNnvJwtCwWeiDS/ZGFXBhse89/EyoZoPzn6XL0H1+YP/MHMy12jkcaIfXd4mY6QQ
+zmZQXsRIhXqAdXkC2OFo054vID/8EwcCLhrm2tESYVdQJsH0B8fDlxM/u08qgr5r
+OAQMren3/2/FCgt6Roup3cosI2Vpg7PNZDlaD+he8Ug0JsAZSebcQKA/PcvhNVNt
+IcYzJNIyLMdCa5pivjvbucso/OzksxRVVYzVGSocVnD8kAOKTpy1Pw==
+</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-04.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKnzf9+A7wiPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI0WhcNMjAwOTE0
+MTQ0NzI0WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDRE1oUA3oIqPJd964ZrhbYgSuU3WnIh
+QaH7Me0Cr3PyFZKETJAWoTm5me28S/xCfgebEb2yoU/BC+6Su4cbvxLJx61+pYKf
+HOp5bmNEFhHZ+Im01+yCXQ0+/Er6MUN/y4SpNLo7kg7KlQhIjGvoR6Vb0ySLP04w
+fs3qHuUXLPwMZLlTVwKqUorJ+gV1T4BAiytnLVpXj2+ComfkKDwk9Z10BZHwDuvX
+RU/Pa8sCatx1JKKjtYReZzsgDcKgd11o/e7AM4tQYOcQBbb8m7dy2zySrl/iGAJz
+2quSjcxS7PRYOdgdu2SiOrK53HCysgp84KpsMjeSQn5kfy2ytgUuNwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT3iSLcrVBHW5d89yksIzgr
+HrlRRjANBgkqhkiG9w0BAQUFAAOCAQEAbg65zMQxHBXIWCmme2DLkBSmlZ9iJIyM
+rJpOD9jk7mnLRx8S0tq85pk1VTF9bDQMqG5spKdHToP2HmuXFbruO1jj9C0Tp61c
+QNnvJwtCwWeiDS/ZGFXBhse89/EyoZoPzn6XL0H1+YP/MHMy12jkcaIfXd4mY6QQ
+zmZQXsRIhXqAdXkC2OFo054vID/8EwcCLhrm2tESYVdQJsH0B8fDlxM/u08qgr5r
+OAQMren3/2/FCgt6Roup3cosI2Vpg7PNZDlaD+he8Ug0JsAZSebcQKA/PcvhNVNt
+IcYzJNIyLMdCa5pivjvbucso/OzksxRVVYzVGSocVnD8kAOKTpy1Pw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.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-04.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-04.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-04.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-04.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-04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>