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-26.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-26.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..a672c28d
--- /dev/null
+++ b/swamid-2.0/nya-26.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-26.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-26.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJMRJTWdT+jWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ1WhcNMjEwMjI3
+MTYyODQ1WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqrut6VJJxu/wcH5cSjEE3/IgejRNbDTf
+NM9UKz3bnQ25n6TCP9NWD4VrlSArf/tvJU8FrvFE0DWg3pXy+HZriUwGVWOspLhF
+in97AiIw0rElvpCf1O5p4PBRBAXwe/Ron8K4NX64mynVI5UA8jT+LozeprLHuDOA
+R5Mqen22fYsqxxDa30s9qdmU70eexM8BnwLbebDfJ+8tkjxdyYwp6JvZXJW9h9ht
+O9rXUJcXDjNBAW0Kj3iRE0KddC34mukFU0utGc8aNbxAEC1V/mAr0UbQemnI1IRE
+/4Oa8p09lbbPDeU16JzasJwHqzmqEhh+H6aekj7n//QObE7MaDJo/wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSqPLWo77i+bj3oT8WfSidc
+6B4G4DANBgkqhkiG9w0BAQUFAAOCAQEAkxnvzAFJbs1U1INVh+eA44P4S7vFsyW7
+nCsUsRQHNW7AtmrDNURRVgnbni+tCzpDfKJP+V8x8tAKSwA4x12NMCUiW7blAeNO
+aJa8AXHmX8hOlLl/UGwlXqersvJaSb9WkaVyhdeRCHugmH+f8Qz5m8pBDm5zMRgc
+TOUzUhrC3aYqfm3nuCcReB3yn1LpyKe5oGzUBvrDAtME7XM87mc4w3tJRCnp8HX7
+IEaSCtshej7lX+OeaisnalaocNYgiCOKQg3GSmP6R3pfchjZd/bJaCfHGXSI/gMd
+9hnnNk0rP0HZsyJNtCXezQxMoznT2V9XmkuNr1rKfgSNaSTQ6MW/wQ==
+</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-26.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJMRJTWdT+jWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ1WhcNMjEwMjI3
+MTYyODQ1WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqrut6VJJxu/wcH5cSjEE3/IgejRNbDTf
+NM9UKz3bnQ25n6TCP9NWD4VrlSArf/tvJU8FrvFE0DWg3pXy+HZriUwGVWOspLhF
+in97AiIw0rElvpCf1O5p4PBRBAXwe/Ron8K4NX64mynVI5UA8jT+LozeprLHuDOA
+R5Mqen22fYsqxxDa30s9qdmU70eexM8BnwLbebDfJ+8tkjxdyYwp6JvZXJW9h9ht
+O9rXUJcXDjNBAW0Kj3iRE0KddC34mukFU0utGc8aNbxAEC1V/mAr0UbQemnI1IRE
+/4Oa8p09lbbPDeU16JzasJwHqzmqEhh+H6aekj7n//QObE7MaDJo/wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSqPLWo77i+bj3oT8WfSidc
+6B4G4DANBgkqhkiG9w0BAQUFAAOCAQEAkxnvzAFJbs1U1INVh+eA44P4S7vFsyW7
+nCsUsRQHNW7AtmrDNURRVgnbni+tCzpDfKJP+V8x8tAKSwA4x12NMCUiW7blAeNO
+aJa8AXHmX8hOlLl/UGwlXqersvJaSb9WkaVyhdeRCHugmH+f8Qz5m8pBDm5zMRgc
+TOUzUhrC3aYqfm3nuCcReB3yn1LpyKe5oGzUBvrDAtME7XM87mc4w3tJRCnp8HX7
+IEaSCtshej7lX+OeaisnalaocNYgiCOKQg3GSmP6R3pfchjZd/bJaCfHGXSI/gMd
+9hnnNk0rP0HZsyJNtCXezQxMoznT2V9XmkuNr1rKfgSNaSTQ6MW/wQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.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-26.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.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-26.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-26.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-26.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-26.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-26.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>