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-35.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-35.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..c1a5fb12
--- /dev/null
+++ b/swamid-2.0/nya-35.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-35.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-35.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-35.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-35.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-35.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKs6KyONyI5kMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTQ5WhcNMjExMjEz
+MTQxNTQ5WjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4zTWWdHMvvXnoCjftPRBBqc7ne7aIQuI
+rVbZMCC4Hupc7HXPv9YNcllFIt31x133Pl+pMkbCL8XPxJexsHpfb1L9kLElW4bL
++kZ6Xp6e3YehgF9D/bN0sL2sGPT5BOTAC5xPYk7fbAqk4VzEdIe8QgTfA6jNciBK
+tlvFVdcIeZA/1EfqymQW7xAIMPDWNgOkI8oFUDxDKyLWXEeNKgekqXRDj+L3qzOy
+ZSL9CQPzKGS5deDGBtjqch0VJx5KPhcPW5LZaEVCm/iSNdZi8+eAPtNhcHTdlCWl
+2dqmF0m1+O9hL6LmqPIK3jvlnzcwncXOIxbw0pgqgx1z8kNRWaQmjQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzUubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+NS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSddo1xVsPufJwusEPA
+HdADKq4ACTANBgkqhkiG9w0BAQUFAAOCAQEAoMVSME/FNjBVVz3QQaTGbQM9eYoS
+s9Uxyc1ida0uyeJlqEkKXkKFW/XlER/MLCphR+8aM2h658OJJIOlfJqh4Ptx1oIE
+EzYjDM0/ozpW0xkR2Gbeo5J8Eu2VEKMd+VnoauuxzpGOXMRdQJDAeYLG2mRC85bp
+22qiDmjUdX8OA9AFusHF+9oScu3fVwMozL6EfJwjWdv92rU/+5PohCg6hWE+aPou
+BPoT6aoz5sXDppS3v0/cyPjl7/DXtnSdxFXPrTTmCgqnuxEjQF2MPVcws0VpOs2S
+PC7LK44YcvEIRMBINj1NvlD4wCjEM+JwUTQ8Be8/OhQ+5zrA8qI391pkEQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.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-35.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.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-35.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-35.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-35.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-35.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-35.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>