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-17.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-17.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..90fd8073
--- /dev/null
+++ b/swamid-2.0/nya-17.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-17.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-17.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJLzeYJMjySuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA3WhcNMjEwMjA4
+MDYzMDA3WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweFKMrpruuM+TvzERHub4fpt/w8UqRjJ
+YY3/qg4f9e2ihEMLVwSauY4eQHUmbdPbdIgDcpNjT1VSmHqE7vTBQH03nc3id4MX
+0dIMuwQywc0+SJ9Qm42qBbbdONnXHKzUc8F3eNwAuVf/3L8xNQ/dgsZQg23B1RgH
+bei51bCvTBxRqsxhOJQ20bBKXsSCQML6J4YJA3RhaGyqRwEKuiAVeiU4EQMIIHvZ
+yc2oGzHwLfxGucacqHKCJBWhau9quBNJ94vUpD0kVZAXWE8ws/m73Nquw0SF2kPO
+DPI+WELyKoDVsc8uHB2PG56vlsM8V6guWArI6ETaovlQ/qLLljAa+wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQ8DNey5wUHYFRCfmP0y6WT
+ZTZsnTANBgkqhkiG9w0BAQUFAAOCAQEAPcHu1bVVi5yTB4Xc41MDWalKuCTY95/R
+ZLfh6Y4nTifITdI/rdXaPXVwKsXatHe18zCDnqmRXBPMdsUN/XBrzkitBqOAT/S+
+Ca93pZ2oDcsHLHaUpaBGazXEmw5Y1wJCPWaoUbGoyCWwYtpWNwbiAGtwTJaR01Bb
+x0YPR/ttJNGmhODgNKEhcjdaPKfP7ZeyGNfYu29uOzSJRuzOFy0YSUSAvXjoWWxH
+gGEItPYEhiXzhBKyxov5uv84rrCaHdhLnK2oekNkD4Sj9hxZQfrdAaiu+8W8gRTb
+ECwLl7pAoHdX5PKqhXh4PpbWDXmh+1Dh1hr3AFLaFFpqn75qMew+TA==
+</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-17.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJLzeYJMjySuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA3WhcNMjEwMjA4
+MDYzMDA3WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweFKMrpruuM+TvzERHub4fpt/w8UqRjJ
+YY3/qg4f9e2ihEMLVwSauY4eQHUmbdPbdIgDcpNjT1VSmHqE7vTBQH03nc3id4MX
+0dIMuwQywc0+SJ9Qm42qBbbdONnXHKzUc8F3eNwAuVf/3L8xNQ/dgsZQg23B1RgH
+bei51bCvTBxRqsxhOJQ20bBKXsSCQML6J4YJA3RhaGyqRwEKuiAVeiU4EQMIIHvZ
+yc2oGzHwLfxGucacqHKCJBWhau9quBNJ94vUpD0kVZAXWE8ws/m73Nquw0SF2kPO
+DPI+WELyKoDVsc8uHB2PG56vlsM8V6guWArI6ETaovlQ/qLLljAa+wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQ8DNey5wUHYFRCfmP0y6WT
+ZTZsnTANBgkqhkiG9w0BAQUFAAOCAQEAPcHu1bVVi5yTB4Xc41MDWalKuCTY95/R
+ZLfh6Y4nTifITdI/rdXaPXVwKsXatHe18zCDnqmRXBPMdsUN/XBrzkitBqOAT/S+
+Ca93pZ2oDcsHLHaUpaBGazXEmw5Y1wJCPWaoUbGoyCWwYtpWNwbiAGtwTJaR01Bb
+x0YPR/ttJNGmhODgNKEhcjdaPKfP7ZeyGNfYu29uOzSJRuzOFy0YSUSAvXjoWWxH
+gGEItPYEhiXzhBKyxov5uv84rrCaHdhLnK2oekNkD4Sj9hxZQfrdAaiu+8W8gRTb
+ECwLl7pAoHdX5PKqhXh4PpbWDXmh+1Dh1hr3AFLaFFpqn75qMew+TA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.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-17.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-17.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-17.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-17.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-17.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>