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-16.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-16.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..3a135d48
--- /dev/null
+++ b/swamid-2.0/nya-16.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-16.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-16.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANrj2jIWBkK3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDAzWhcNMjEwMjA4
+MDYzMDAzWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DRKG7KPX4zKZPQ8Zwe04nkWUsRNYE8s
+X0o8xqnfYuSpOHe2FoxuqEfculKQXPZVNiwxbV0gSROGP37R/2EIVoM6iAviiqyL
+OWGjZsuus6qTEUf7aFnhUF6xaANeyhC5TfM1JpWNDdmUVOuphl4kG0xNKWyKc+au
+WBw9/hPAfJ+npbpJ4euEQzgZAZzne8NFRL9ZODLUb0affPrROFG0V5k8myXQe8o/
+8LgTX05q5OxlFvh3iilZ3hTgGXasLWblQHE14lQNF7K2wOcH6W2Lsbwz0lk4ZBKM
+1WngIwstD3bKkdIyvsc4Kc7R5Mi5VxCwbMqaxB0K6Ufoy49qh+MqoQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpqYomq43TEIegKcLLYfhc
+SnmNCzANBgkqhkiG9w0BAQUFAAOCAQEAyiyt2FrUTznCjn4zGjidlGy/IWFS4fSZ
+T/TFWnEmpWvshxQrHAn0B7B/vkvvP44BexM6u6ztpfwFOkPE1XTsZoEC39zP/Urr
+wCOWSyqgdo6V19WvlDVSvzZUWX5PO8v6r1L8LhhdEYl7yzrLECPjHFwI0C/wA1mS
+E0cdmb9XLO9yjlBu7yqVJ92dqusAf92Jlz1uueToDgyK3MnRJRguD5aPv0yg+JkO
+b/ww2LTOR929U9YkjBUukM6dKPM0kYISPjVOPJCfivOA89/ZULWT28lmL/CET4Oh
+jl5VAnadb+E4/k9GzSwWtiR0p8Uv2arCq1/gzt1qDp3m37+C+pJ+wg==
+</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-16.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANrj2jIWBkK3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDAzWhcNMjEwMjA4
+MDYzMDAzWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DRKG7KPX4zKZPQ8Zwe04nkWUsRNYE8s
+X0o8xqnfYuSpOHe2FoxuqEfculKQXPZVNiwxbV0gSROGP37R/2EIVoM6iAviiqyL
+OWGjZsuus6qTEUf7aFnhUF6xaANeyhC5TfM1JpWNDdmUVOuphl4kG0xNKWyKc+au
+WBw9/hPAfJ+npbpJ4euEQzgZAZzne8NFRL9ZODLUb0affPrROFG0V5k8myXQe8o/
+8LgTX05q5OxlFvh3iilZ3hTgGXasLWblQHE14lQNF7K2wOcH6W2Lsbwz0lk4ZBKM
+1WngIwstD3bKkdIyvsc4Kc7R5Mi5VxCwbMqaxB0K6Ufoy49qh+MqoQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpqYomq43TEIegKcLLYfhc
+SnmNCzANBgkqhkiG9w0BAQUFAAOCAQEAyiyt2FrUTznCjn4zGjidlGy/IWFS4fSZ
+T/TFWnEmpWvshxQrHAn0B7B/vkvvP44BexM6u6ztpfwFOkPE1XTsZoEC39zP/Urr
+wCOWSyqgdo6V19WvlDVSvzZUWX5PO8v6r1L8LhhdEYl7yzrLECPjHFwI0C/wA1mS
+E0cdmb9XLO9yjlBu7yqVJ92dqusAf92Jlz1uueToDgyK3MnRJRguD5aPv0yg+JkO
+b/ww2LTOR929U9YkjBUukM6dKPM0kYISPjVOPJCfivOA89/ZULWT28lmL/CET4Oh
+jl5VAnadb+E4/k9GzSwWtiR0p8Uv2arCq1/gzt1qDp3m37+C+pJ+wg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.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-16.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.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-16.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-16.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-16.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-16.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-16.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>