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-40.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-40.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..a7ece519
--- /dev/null
+++ b/swamid-2.0/nya-40.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-40.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-40.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-40.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-40.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-40.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALUQAcCizerIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ4WhcNMjIwMjE3
+MTIxMjQ4WjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArLEifVjXNxe1n1So0nglaFe1WRfBajfF
+YxyoDPNCKUjABlEloGYJX5xFI58JCjCdB3tL5qtSrynGMAsXH+uZZIsE6tDeu/N9
+mPgQEskDEpK9vwhZMjxjm9uB3u6wTcik0EzaY9Su+qkdydu4jgSs+jN1htBYNdoR
+iSdviVuYZdoMfY1iqG2lHoJEcPZ2rw5tmqcNC68KKCXZU6hJ0jO8Iy/sj+jZjV2D
+Uv52TBwcTF28/ehZSZh7tWNpSZek6YL8tC8qDTBF9/bV5FBs2InbLp+4jr50BVsd
+mTrmw0hqtxHcZfX6iCt8kIJcR6gKhk7Ta1/gs08HwjWA8SJSZuDISwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDAubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSF4APs2/Z27aDl4bZy
+HO7h9mgcSDANBgkqhkiG9w0BAQUFAAOCAQEATg4TgWIjDaLi3odEn5uq0t5Fo5vJ
+Qktsx2khtqebj0bMpYJXrt32V+syTmEYCcpRaCFIc/rrR7BzFaGzpTKZCcuJ9iGn
+zn/2O7Ir83FwYgzAk/H/uWstTU1kwEPln7ftkQjOpRUUNue5yicPioP4aHsfAc+p
+TrKP6iTnk5j/6/bbb6ufpK9lSF8IQZa7c3/jr+wCt64IgUw6xZsrocjFLZnlaT6V
+q/uvja1ROVq95gYP9wQBTzxL0qoHam8hkAVHtix0hThK4Z1xar5trAEoL6n/FNVk
+5esUa0cDupBnQ5i1ku0MtO5zSrix0MlhKIdLtFzeprZe0cfxaupjyeVEVg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.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-40.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.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-40.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-40.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-40.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-40.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-40.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>