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-09.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-09.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..7a8d5bcc
--- /dev/null
+++ b/swamid-2.0/nya-09.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-09.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-09.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-09.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMDWEx2nCo+IMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDE5WhcNMjExMjEz
+MTQxNDE5WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwRpIsMkkCFMEtqcsg9PT16AURNboCqXC
+01b1OKSauQXt93tn2VsoQhVoCJefLiYRRw4X0L3ZKdAEFq31LpzIiIdmIJlae4BO
+AVul3c0qjh2Y875u4lDuo9u/NGiED1wfOBwfYNIUaUBfsTA+YrDIbbuYeXxeStMl
+fvL8idQZ3GbAbMR/SB1mDyeB+YijRsBBeQzuj4AF9Hg2NjP+H8grwsvPoMlM40P8
+/Il8oT+NqVmHxU2Wmg1MkqlgKI4FrfSkj6i78LaIgOihHBu0h83R7wx2CM0mcNWM
+Y/7td7Fzyr19SrSn7b5Rh/3A14NIJ5XEJu/eZEXVpfdPC3vodeQWjwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMDkubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
+OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQK9PQjxmWtOvJ+n8Q3
+Ou0Xs6GfMjANBgkqhkiG9w0BAQUFAAOCAQEAewQqdvOeIgA+SwJ6I/sLHUVh5Iab
+ZpzxpG0CsKn07GaiKVTHViMZdS1hTVXel9CBM+eRUqUBbR8FQVDb8tFW7gbEYayT
+neTl2PxbiIsjlJyZAIGloFhNf0y3TK0Hvuc0eqVDcLybmy9GOM85GZwwv+VuuRUT
+0dABrNWQyfq316vvDWNYYHF0/i331l27XkbV0WXqu2ffUx8lbaSTMhETR/eNvXl7
+VGHDJhfkfJ6xPJrFVTM4plJ4tZ00DzyRMKUSDkV5so7EB9ZgA889dAQHViyLvXrx
+2+Yu8CQ/GR5np56Ce/neI8MZfpx0h8pD8vWvC0Zx286MzsKMAaMSc8mIoA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.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-09.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.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-09.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-09.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-09.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-09.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-09.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>