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-48.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-48.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..82f13363
--- /dev/null
+++ b/swamid-2.0/nya-48.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-48.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-48.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-48.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-48.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-48.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOWzeN1n4fSfMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ4WhcNMjIwMjE3
+MTIxMzQ4WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt46bHIrH1UxDGmUkPQ8zk0AjwOykg5qz
+Sgs6RDthEQaEMV4U4FnA1IgQrWkP4b5ypn52ljuVPpSfHy90z09NbmiO/19S+d1a
+5WDyvaV/DmAQOla/dQ/AwJ01p81fjWP8fGTlfG1i56wE/w1QK/KU3UQVeP0YjFXB
+T6Qjy3W/TO8QAL5n64H+rY5l0JKmA4N43tPDPpYNB8QELNZdeF3fCmCiRvd7ZEr6
+6L+Df7LI+C9v804vcrhnj4GyyHOMYCNSEHPJHA0D4hrHZVpxw9VCHYRc2TyzaIBm
+A6EWum8BkEiy7VcowPKjpN8BFGZGvdw3MDzUbEH9h57tb8XZgipxcwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDgubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR9Em1nezTSUcY018x3Sz6C
+O/w3FDANBgkqhkiG9w0BAQUFAAOCAQEAqFDlFFRoqt2HVOQBdinvju0nFi9ef10b
+TVfEjvMODTH3pFICcDODmRCxN+I2TOSKaiy4GoPWm2BN83PPRoPGDbfjhqVWrd2K
+Plp5BT75lSeux2v0GnJNqnclaACrZIgrF42Z+iiKYNiTeO8zy0RsNFFndnipWMpI
+U0x5DyU7WjHvfCWolOl9Vrc6m742lB4JVolf6g20bsRjsTjukZvpvo7l1/yj92l5
+TJNC9duOEgnZzzEzcAOZ67gLMf6QeisY3eMpWtbh5DOekKSXBv9Xmk2pWTViTKZH
+xpwu1BXpAzhSvrSWzn05rfqCc1IGOT4sTSv99GRgYU0464GidHpmUg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.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-48.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-48.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-48.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-48.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-48.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>