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-50.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-50.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..440a3bae
--- /dev/null
+++ b/swamid-2.0/nya-50.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-50.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-50.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-50.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-50.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-50.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOfUla/9GwRqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDAxWhcNMjIwMjE3
+MTIxNDAxWjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEece+RKhm3N1BP7W7mQL1VUIWEezbYL
+PtP8xJaTQ0dBJyW4qO1dQFCxxBG2jRqBhphH85YOUWP6pwvy14xgJNY4GlkQ1Ljq
+m7QHB1Oe9xDsbLeQdpnMFYJpt9Xqk9fUzWWYP6vi/TUTZqexEvLvRPZA8tXFc+vE
+5NS2WXvAp1DU1LMKPcEfD0rXbJXLuJL5CqDYDtGe5oIKDv3ZOjUY/yxLlHQaDcZg
+Vz8R8k1BgvfKm3QkaubiDzPL3oRqgB5jGq7IA2/Iu3XVPZ6fTvCSdm9NlUgwCyy7
+q3YbSNx8tE7Fc6lsMkFsRUtZ1/7r8FpsJb3Wy05+NHwKQgT3YXrB0QIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNTAubGFkb2sudW11LnNlhiVodHRwczovL255YS01
+MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRjxiq4M/Q3PE56NMgQ
+4qPCk+CE0DANBgkqhkiG9w0BAQUFAAOCAQEAkf0Bi3RxWVukg4Y6fg+5W7OkPczh
++F14HIkOBF9huEzs8KzkamJMmqBVTyozcaLe3Ohrml2FNShjY0TA4YQGgVLUWGOG
+HnSlB5IYgQQ2l3P45e6H3eTVbdeXFSTLn27Me2xRtoBAspAhCAYlW//rtfuGM9HD
+frfKH3aYFfVnWzumnaCReB9AL5P5wjRNWqeo6JZeQI3CTLvbm3Ox3B0cXh1mk/4T
+FWmypCx6sjn+v/7fckstlh1QVqANsRkitYiYMs08UUXHnobqffpk2fWqzO1qiTt4
+PVB1CNb1sjfUbkvX5zSoIKsrl3E1T1k70ec+aK0GKun8Q8kLQ4T/ApeVWA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.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-50.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.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-50.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-50.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-50.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-50.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-50.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>