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, 50 insertions, 0 deletions

diff --git a/swamid-2.0/nya-01.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-01.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..47c3a710
--- /dev/null
+++ b/swamid-2.0/nya-01.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-01.ladok.umu.se/aws-sp-en">
+  <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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-01.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOk5OkS88spqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxMzUxWhcNMjExMjEz
+MTQxMzUxWjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoJRopt/Q7gbXeMHHsM9eCqsa+gyx9smk
+sK6qJHlX46CLJDJ0BdqvuUL0lSkLBXh7GsRotxvq7DKUQ3m8QK4XPBUWMxFRDSMm
+becMtyjDH4puZYTZSJZ450ICBNoY9vv7WdWbyqDkzBiyewa3t8QzF7JuFGqFMvYM
+BljDKhSIOJ+l4EGCKQ3yjnFJQsnhPIuJKnHIXHlpD79gxb3Jq7y8MMIsCsl9JkK5
+AiO5XbMkWQlEMJU4FOHw1I4ZLBQrv0qjdu+IrkiD2UU51RCY7Wq4ZpjqAiBlz5xI
+my8x/qatq6tbgynJchhIIgiwxnFEJeXvP/nz2qfs3t9CTLTyzUKSgQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMDEubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
+MS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRUYeiHtle+jKpG/5pk
+ZUUeHzpC0TANBgkqhkiG9w0BAQUFAAOCAQEAQp+52YesKMPZUoLnAfe8aIB02HxT
+g7Lx8BIMJ4PqrBkxSwtbQEWURqHXxygohGoTPzlFJDB++4oGghwplCLvXF27YuJp
+/K5KbQ5Si/qw4KGF2+w0jnnw0mhWaMoj3+cFu5Jzfu4GK9AfcGZzOoNGUjcs5ofx
+GZ2tHONvYzKlXvsj31ky+yS4WEMCBlgIM811Yrw6P5Vfq4py7V1Le0DWfUVwBRmR
+OJxsyizOhif4JiOQYGdK4NHpby9naFNpF4IXwtagoLY6T9Gi5ktUfqSsqqTdak/6
+1pdCY3YrggXgqqubLfIBeYxczT94rwFgraZ+oNRpUXRwy9FTEXQmog8fjw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>