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-13.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-13.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..7264ae1b
--- /dev/null
+++ b/swamid-2.0/nya-13.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-13.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-13.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-13.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-13.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-13.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALL/tkObN6dZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDMzWhcNMjExMjEz
+MTQxNDMzWjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2d6EOdxnw/cnpfz+sUBLp5jtL9oSMzX
+WSC/qSISv/VysAe6PJfQGhxfhb0PsH/WAiWJwFWmegImQ2DVzlGYOOdb+mM+AHrk
+/3AmNNijIzhG+/Zm8RdvX/ERgq64xGr2uGEHQxGMu21aabkjlUppIqUeX7bPki1k
+zG1DkMpf/6yVHsXYp3ks5HtBZSFRH2FsSdxTJZ4Z5AZO8RNIDXrxsEL+xYk2hzVx
+cjJHK9zE0iTCgZ4SRJ0lTC1ZuTBE5LP9rpONilozmHhY5V7ieg6fYyMX0njOArCu
+oknt4ISNrfo8xEbZJRCsbl6mSWSB/mcckv10DafpoGUNEYs/kc6iQQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTMubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+My5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSf8iP8ZKiWAM5iUEi/
+hDBlhMGe4TANBgkqhkiG9w0BAQUFAAOCAQEAqZYZRTtxEVSU2mVJXgZaxLiZ/dNv
+nMMbRqD6P9OXHrgkzqFWLsuo3STZviwOjroJNzGDot8fUwU0/wdlKYFuS0xQ+t03
+2ZfL3aX51+Y2yh4cBalqlGxSATFVux5tHzrcoXLaelkbeKJWPmTpgXTTvjB95mCn
+2iYJ/T8xFLsJZzTAEjanF3QYpEipJhxuxeqhmsvJ5E7QnGACwI1Og4AyeSeblYIh
+ef7RS+FSTgPUp3et4oXwKmUMdiFw7YnfeQcdaTmFlaX/lwssO/zPC2tvaNMOr6Nh
+ar1z5nbbSvQmbGQ9X3H3/JRxJ8pW/dJ/6fdEpNcaQ5mE8RFiL3xmX71sfw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.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-13.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.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-13.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-13.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-13.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-13.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-13.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>