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-ecs-sp.xml b/swamid-2.0/nya-36.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..a4870290
--- /dev/null
+++ b/swamid-2.0/nya-36.ladok.umu.se-ecs-sp.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/ecs-sp">
+  <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/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/ecs-sp</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>MIIDJDCCAgygAwIBAgIJAJfszto/sxyMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTM3WhcNMjIwMjE3
+MTIwMTM3WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAteWDe95JkvjwEfkqQcnTXixyIfxzEYh+
+ubDHutrPd6DMlx3TvU6rppxYFbbhnK6AHwiXZcl7SMu7rdMbtCKcvTg5MoI8z1tm
+Z7NIf3CssarCQ1YpesRAL42TNkrZNUMuiH5zSyQiw07GZFrVWpfu8FvEdI5n03/J
+b9Kr44nFscz/oI4ny2mitv3GsXKbuaEDlPNkCnhiUQ9tRJozi+/zs+hb1Z4VC3XV
+FBa9AAfRv6MHBwINmTLUvI3UVvJOrG7PURIm2vZ3FNFZjxK0VMScgII9AQNGS9PS
+vsWoCjmgmEUN2U4ZkX+jPZM7UCkd+TS7teU8IEypZRBypu7y/B5H5QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzYubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSG5gPXQmtag0vgGRanV2MC
+c0kDaTANBgkqhkiG9w0BAQUFAAOCAQEAg22gdr1KtpAbqIV8rqtuLi2579qL4R7O
+lIlY+RpzUkAlruwPXaRpkt3Z8nI/fY+FeTYe1jgNZYr/cMV2LFdRYs5+7AiDpsuY
+JnHYsimjD1NRdbnMRXUk9izMHfEh9NIObkvuAne9ZFWjsc9+48vEDf738IKDygCf
+gPxvBseMzp+9mqm/jVaso2R1ign73UZ1a/OHJwAD5P1e6oh/AO1EyawB0Ypg0yko
+sh5u9UJkbD9UsSbezCxSM92VAgWaslANeWtqiP+70kMN4NIjv8Yh2/J5JWIYAtGO
+mB2mFhL1WTyIupbJ+KS/jPD49LDSmC/F7wM2Yp5zyURg70eCYcoi3w==
+</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/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/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se/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/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/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/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/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/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>