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-36.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-36.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..aa60398e
--- /dev/null
+++ b/swamid-2.0/nya-36.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-36.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-36.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-36.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-36.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-36.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALhK1Y9fpmtHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwOTU4WhcNMjIwMjE3
+MTIwOTU4WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl2sWYZR3jZWNdn+mvD+fAQI9NdpaAQGd
+NnRjHYaYfUW145+h3mrzQg5kxrfC+EvN6+T6cJsNtrHoTquupXtbfGoxQZQ0CIuL
+FfnyNjETW72gpwGoezdXz2DIGI83CC9KmiUpFHDVcqK/DjWMNhhbqSe2sTVLZHq5
+BfIYFn2oZ+CFrhKPbCMHeXrAfRXHUqkezRIDYZQ4Xjh6IrpoXfEUZE5bl79Ya+Re
+zFpflBgKIJz1r08qQM69uTkUtm4YJamqiaED+TB+YMBRD74fbYtlLKedjThzy25j
+/G25B+AQ5JDOQybWGhajgk6L+sPCdkQ++yJKQin8alqU1GgO5q1kbQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzYubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBREAxTVc+1fC+5MvURg
+VAmm5tdP7zANBgkqhkiG9w0BAQUFAAOCAQEAIsLGcRyLpB+H9XtfUyigRA1LoGKv
+nzjxVGyKT0QlML6T/MMETEippnm/iDR4DxxK8JRgNu8L1OpnJTACmL8qWBSUnDRG
+jw9CFfIvfUksy6Y6Yxlee/gQXa7cGXOZMKIBTsKT26ZjB5bc3030j9iIJWgX5q8X
+ruGz8wVhMAG+NuRhdUkZZmgMnVNNiibMmFwP/uzjbgADy5BzB9iaCXLuVL8amRzA
+vXDXzJgkSeaGxlwmRVhzSO53eNo3Pu+NrN/FsrhgcRETjaaFTHCQjDS3yhCWVgkT
+fR7Mgv7dwRyEa5eRgSTdxngJEIQ2/96kThMvqEOn8M85N51fr/8jQaPrRQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.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-36.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.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-36.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-36.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-36.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-36.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-36.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>