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-14.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-14.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..3bd694d1
--- /dev/null
+++ b/swamid-2.0/nya-14.ladok.umu.se-aws-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-14.ladok.umu.se/aws-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-14.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-14.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-14.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPybaQo1q31gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUyWhcNMjAxMTIx
+MTIxODUyWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+dRPBZga+AS+u9HSrTHA5iYr/KkPeFS9
+8nwzFLG4vnUklfcYfIlmFNjfJFGG5ApmxGbolaooXd4ltJP5tTipBfF9mPBdj8Pb
+JX0CFgg34o4SeM4tdig0SUwumdOS61vPH9Bx3MYjqSz5wkd2Y1XDB0GYx8Dc5qRT
+PQicd+B4Va7H0cA8JVKvGt+scgHdp52qyRH3AYijxD5ZimGZ6aNL+0vyOIMSl2Y2
+5blZV5/MQ3SvAzG6pZclrjxX8D87h9uek5IpDDOrsFZDtvKB2neSwobQYndiy1hr
+kjwCTDmvyVoewiGP1l14wiETfd+uNSEZPniITYbjy8OXhpZhcijdgwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTQubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSe9n7Mlu7vGc/mVMs3UDpy
+krWPVzANBgkqhkiG9w0BAQUFAAOCAQEAmz7Ue6S2LBzWJD1Yze3hIF41EIu5E3Eb
+qggEkT3qAmiHLiD9uI44wH7PuJR6ixyPmVcaOtDqrBCym6ysfh3cEvghKWAn2/FR
+iOMb8g4zw/UueqvCYmvJK5Pw5y0ZPX/wBj/zUN7z5TXpIxACx64eV0zln0yiCaPy
+/N24IISXkumXVp2L8nSveqWH1crjxqy5nzlA08lo1E4O0v66zCZkLNJHizG61K82
+8b8QJqeX155IKEm4ebd4CgzUvr8/eFQR00BH/ofSw5eGpvghOtXDFtFoX5TF8/wJ
+Nv4iQyOXosX6n4U5VL/OwTA+TIM2I07U3eJfoqIr6eLvYVcEHiPMzQ==
+</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-14.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-14.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-14.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPybaQo1q31gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUyWhcNMjAxMTIx
+MTIxODUyWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+dRPBZga+AS+u9HSrTHA5iYr/KkPeFS9
+8nwzFLG4vnUklfcYfIlmFNjfJFGG5ApmxGbolaooXd4ltJP5tTipBfF9mPBdj8Pb
+JX0CFgg34o4SeM4tdig0SUwumdOS61vPH9Bx3MYjqSz5wkd2Y1XDB0GYx8Dc5qRT
+PQicd+B4Va7H0cA8JVKvGt+scgHdp52qyRH3AYijxD5ZimGZ6aNL+0vyOIMSl2Y2
+5blZV5/MQ3SvAzG6pZclrjxX8D87h9uek5IpDDOrsFZDtvKB2neSwobQYndiy1hr
+kjwCTDmvyVoewiGP1l14wiETfd+uNSEZPniITYbjy8OXhpZhcijdgwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTQubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSe9n7Mlu7vGc/mVMs3UDpy
+krWPVzANBgkqhkiG9w0BAQUFAAOCAQEAmz7Ue6S2LBzWJD1Yze3hIF41EIu5E3Eb
+qggEkT3qAmiHLiD9uI44wH7PuJR6ixyPmVcaOtDqrBCym6ysfh3cEvghKWAn2/FR
+iOMb8g4zw/UueqvCYmvJK5Pw5y0ZPX/wBj/zUN7z5TXpIxACx64eV0zln0yiCaPy
+/N24IISXkumXVp2L8nSveqWH1crjxqy5nzlA08lo1E4O0v66zCZkLNJHizG61K82
+8b8QJqeX155IKEm4ebd4CgzUvr8/eFQR00BH/ofSw5eGpvghOtXDFtFoX5TF8/wJ
+Nv4iQyOXosX6n4U5VL/OwTA+TIM2I07U3eJfoqIr6eLvYVcEHiPMzQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>