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, 74 insertions, 0 deletions

diff --git a/swamid-2.0/nya-20.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-20.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..74c64c1b
--- /dev/null
+++ b/swamid-2.0/nya-20.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-20.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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-20.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJ2nk4XWTmn1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4
+MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8pLu2n6wDBw+3YzOsX7f9ue07z1oesWK
+WLQIG28pNuweFDsfhRZtzrSe/3r0Ong82J/t6ElnA1rr731Ko3sqHbMWMqCd14eA
+px6YVukOWA4xs8sPXPM3PHR6f9gnmyvSm7KW+gLqhQgIx3ioPQGgzkcLZDM0pI9m
+t0KerV7zwoRlNVsUn4oky1gsidDLPuLn3GWKyoXzcUK4x5LCfx4S18PSwW/OAerX
+5YbcI4b79RD9Ykr1cGtZZAb85vCRtcIfp+d4zm6hm1yVTGuItgpA8ZX18rxvUXgT
+10q8/GtmDf3tVYGXDdKZ3Tr4De8uYwRhaqjCrbm/blGtkK3utdJcrwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTnXAgZ+ObomUUo/1YKrNLy
+tGbA5DANBgkqhkiG9w0BAQUFAAOCAQEA2BQwjPjXYQRGXzaom2OYLAXZNBRPmr99
+Toyrpjuwp8SdDJk7Zw7kslGw+edjoB4RnbvLPpvPUxMSKLUKM9kCD3qY5MFg82p9
+rp3Qv+CAeNCWJnzok9IvuRXKLy0MUCMnrN53pqe0Sp9jxO2vyrhp+qCdKOFFb1Mk
+FRjcMlkpr42qhRIPGRa+JHr4WrGEeKnJ3O4ihESU4yc86HpHXCnHxyR3skwtUib9
+yCbdSne4A51XdcJlkgt0sNtDGt5WM0Q/9YxgPeYp6Ja5jeNobUyW4V18DNf3NlYq
+DOSyzgIFEpaeLyD5DnxZg0kXivNtZUkwoEAm28f1c23IGkR56qggbA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-20.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJ2nk4XWTmn1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4
+MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8pLu2n6wDBw+3YzOsX7f9ue07z1oesWK
+WLQIG28pNuweFDsfhRZtzrSe/3r0Ong82J/t6ElnA1rr731Ko3sqHbMWMqCd14eA
+px6YVukOWA4xs8sPXPM3PHR6f9gnmyvSm7KW+gLqhQgIx3ioPQGgzkcLZDM0pI9m
+t0KerV7zwoRlNVsUn4oky1gsidDLPuLn3GWKyoXzcUK4x5LCfx4S18PSwW/OAerX
+5YbcI4b79RD9Ykr1cGtZZAb85vCRtcIfp+d4zm6hm1yVTGuItgpA8ZX18rxvUXgT
+10q8/GtmDf3tVYGXDdKZ3Tr4De8uYwRhaqjCrbm/blGtkK3utdJcrwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTnXAgZ+ObomUUo/1YKrNLy
+tGbA5DANBgkqhkiG9w0BAQUFAAOCAQEA2BQwjPjXYQRGXzaom2OYLAXZNBRPmr99
+Toyrpjuwp8SdDJk7Zw7kslGw+edjoB4RnbvLPpvPUxMSKLUKM9kCD3qY5MFg82p9
+rp3Qv+CAeNCWJnzok9IvuRXKLy0MUCMnrN53pqe0Sp9jxO2vyrhp+qCdKOFFb1Mk
+FRjcMlkpr42qhRIPGRa+JHr4WrGEeKnJ3O4ihESU4yc86HpHXCnHxyR3skwtUib9
+yCbdSne4A51XdcJlkgt0sNtDGt5WM0Q/9YxgPeYp6Ja5jeNobUyW4V18DNf3NlYq
+DOSyzgIFEpaeLyD5DnxZg0kXivNtZUkwoEAm28f1c23IGkR56qggbA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.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-20.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-20.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-20.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-20.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-20.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>