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-19.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-19.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..0cbe8a09
--- /dev/null
+++ b/swamid-2.0/nya-19.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-19.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-19.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMWAUMzkvTL3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
+MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJyTJK4mJmZIrsWrrV1SUBIOcEQoOHus
+XZWBG2idtbYpJo/l1k0RRb8RQ+ex3p/JEPJi8P/nUA7I4hCspjD6Ms8YB3Bo2/ms
+Xzo3cRiLU1/2UwmgRxdqG/gD83ZRPUsUblwPahtyp8WrzUGmqE+9vparnnNcG0RR
+xavuyp4fPsjFPwjaFVxYTNJubOJksPGnQTxCuMJgM+LUFV11O05KUTzmSV/QZ7Km
+p1jM87iTO0HLp9GegHbGEU5OQ6LHIDzohsKqLgWTVsbJuNpv8buBg45yUe3mMPiz
+m0OGxbNLGRHvkjUiLO9xVu2nuwcDvuaenlFNJIKQjkXJ4+sCdM21rwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRJnt+aPsW742I4MZZzRsKO
+lqj0tTANBgkqhkiG9w0BAQUFAAOCAQEArvtdazgSyEnp5NSUetJw0ZqukY49OWD7
+pACxzvG3nBJXR4ZnbnzsJganSdYpOoeaYEddRfaOmLtJIhMoXjO8kmU4OjysoOit
+iNEjB1K94+6xwdG7k/UNsIgWOKfGUWvkBL2sFxIXxKrVDLrg1We5cEyfXbLuKmu7
+bfbOWpDhH8G25Eq2sGRry/VvGzRJgjJh6O3J57ZChdKahFUG/oCll4X/9gH/NfYy
+b2/XMG9zMk9vvk3xo7u8kwcojJ4lrmTH3yu8Idke5ynjDiebCk2xMJDiCpoQh1cl
+MF2VuHyKURhfDXExoxAgxbRq40OLq+ihxU9YPZucKRAylY1Mydq0bA==
+</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-19.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMWAUMzkvTL3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
+MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJyTJK4mJmZIrsWrrV1SUBIOcEQoOHus
+XZWBG2idtbYpJo/l1k0RRb8RQ+ex3p/JEPJi8P/nUA7I4hCspjD6Ms8YB3Bo2/ms
+Xzo3cRiLU1/2UwmgRxdqG/gD83ZRPUsUblwPahtyp8WrzUGmqE+9vparnnNcG0RR
+xavuyp4fPsjFPwjaFVxYTNJubOJksPGnQTxCuMJgM+LUFV11O05KUTzmSV/QZ7Km
+p1jM87iTO0HLp9GegHbGEU5OQ6LHIDzohsKqLgWTVsbJuNpv8buBg45yUe3mMPiz
+m0OGxbNLGRHvkjUiLO9xVu2nuwcDvuaenlFNJIKQjkXJ4+sCdM21rwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRJnt+aPsW742I4MZZzRsKO
+lqj0tTANBgkqhkiG9w0BAQUFAAOCAQEArvtdazgSyEnp5NSUetJw0ZqukY49OWD7
+pACxzvG3nBJXR4ZnbnzsJganSdYpOoeaYEddRfaOmLtJIhMoXjO8kmU4OjysoOit
+iNEjB1K94+6xwdG7k/UNsIgWOKfGUWvkBL2sFxIXxKrVDLrg1We5cEyfXbLuKmu7
+bfbOWpDhH8G25Eq2sGRry/VvGzRJgjJh6O3J57ZChdKahFUG/oCll4X/9gH/NfYy
+b2/XMG9zMk9vvk3xo7u8kwcojJ4lrmTH3yu8Idke5ynjDiebCk2xMJDiCpoQh1cl
+MF2VuHyKURhfDXExoxAgxbRq40OLq+ihxU9YPZucKRAylY1Mydq0bA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.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-19.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.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-19.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-19.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-19.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-19.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-19.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>