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-21.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-21.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..46eed8b6
--- /dev/null
+++ b/swamid-2.0/nya-21.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-21.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-21.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALFcf2KAIUufMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMwWhcNMjEwMjI3
+MTYyODMwWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw1osBQ5UOG8GjJ+t9831MgbYGz50akhQ
+LMAJp7vWbeUiCyjRUq7zvoiKoDUoyspldEVbpXzOq7v3sxXwa9voL6lB4qivDj9+
+szpGYxfwrgtAoBvGW+GUdaIii8yAZmQ2F9/va2gtrR7h9p4Y3yRm/bSw8QYL3C68
+8fWtvXyRLM7eu8qySyjTPhMadB6kXaT7mP/d6dx3IWtIauNonvRDrSSL6hhCmLBq
+6CnAdO0MpEcgZVJ2MFMfkNFtgQDyyHUqPllxuj/E8+KEQnn91BGdI2CJFbcDkXwz
+ueJwXe4mWDbecm3Bn9D8WVRSDlyKLrV4Jp9ksLxm2u+6tjJBFJA41wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpdJrKn8Uzwlzhd5UrE2tQ
+PlJp1jANBgkqhkiG9w0BAQUFAAOCAQEAl3F8McTRgjdUs6GqXbFYZK/D0TTbqR0w
+qyWlZe+YjVp6nK0R97faNsjOwPGmOTYKiHDx43L8Um+zkQQfa9F60/l+JuNICNOO
+bgn7WtME9DLBbHLilHXGjPOZKPPPZSkFv6mFp5s6Na5qHjXRrR09N9LnvnF99XTQ
+WZgjiEhbYNDfbcP4eKmTqWh28XuMfSPL+j3XoKq2NQIW+UOiJevOKsGFSXGDHxJZ
+NpaHOS6Ks2FyvKSUELdMOCkYkNovZPVMXSHUVpNLxeDFCSAe3bqESli2M0XwdV00
+ihiaKSIEE2QJcpX6Jyo0EJShwzvOq7rB4Q1cZyF3/+JDl8vMQAtMrg==
+</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-21.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALFcf2KAIUufMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMwWhcNMjEwMjI3
+MTYyODMwWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw1osBQ5UOG8GjJ+t9831MgbYGz50akhQ
+LMAJp7vWbeUiCyjRUq7zvoiKoDUoyspldEVbpXzOq7v3sxXwa9voL6lB4qivDj9+
+szpGYxfwrgtAoBvGW+GUdaIii8yAZmQ2F9/va2gtrR7h9p4Y3yRm/bSw8QYL3C68
+8fWtvXyRLM7eu8qySyjTPhMadB6kXaT7mP/d6dx3IWtIauNonvRDrSSL6hhCmLBq
+6CnAdO0MpEcgZVJ2MFMfkNFtgQDyyHUqPllxuj/E8+KEQnn91BGdI2CJFbcDkXwz
+ueJwXe4mWDbecm3Bn9D8WVRSDlyKLrV4Jp9ksLxm2u+6tjJBFJA41wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpdJrKn8Uzwlzhd5UrE2tQ
+PlJp1jANBgkqhkiG9w0BAQUFAAOCAQEAl3F8McTRgjdUs6GqXbFYZK/D0TTbqR0w
+qyWlZe+YjVp6nK0R97faNsjOwPGmOTYKiHDx43L8Um+zkQQfa9F60/l+JuNICNOO
+bgn7WtME9DLBbHLilHXGjPOZKPPPZSkFv6mFp5s6Na5qHjXRrR09N9LnvnF99XTQ
+WZgjiEhbYNDfbcP4eKmTqWh28XuMfSPL+j3XoKq2NQIW+UOiJevOKsGFSXGDHxJZ
+NpaHOS6Ks2FyvKSUELdMOCkYkNovZPVMXSHUVpNLxeDFCSAe3bqESli2M0XwdV00
+ihiaKSIEE2QJcpX6Jyo0EJShwzvOq7rB4Q1cZyF3/+JDl8vMQAtMrg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.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-21.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.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-21.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-21.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-21.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-21.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-21.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>