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-00.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-00.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..2b701611
--- /dev/null
+++ b/swamid-2.0/nya-00.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-00.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-00.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-00.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-00.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPnkgyiVy3SGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDcwODU5WhcNMjAwODE3
+MDcwODU5WjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuOTz2HgGQOUBfOqpb5FCef6/OTKD/qjX
+r86Ol36BIVB1UPLpX80jLXwX6BfXA7jFcrsuSHK/wIqvALfprP8GuEdfg4yCLxgV
+deODB+xBGMtokmzHOhbzOj2Gp9L64a1Y8M5kcpQrf1WWrNPmGH7/NIbXa7LL69vd
+GFp+fLDM15C1xryzgve686mICmxSEJbyGe6+TTxQNorTNtZ5yQGp0sgduu8diYMW
+wDe29AJzIVPnjkRjPRxitPKwxWQJPT3fbhb2Fz/V9HsddE585ydOTYjJwkMmDNgg
+fOXwPNVxRVBeJGNGf83BtanPCf5SoY2wchabMAVRcL3kLoPDlG0kGQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDAubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRbGyy2KE2LI+t+yYYmfKwT
+penTYDANBgkqhkiG9w0BAQUFAAOCAQEAHw8OjcuBB3EIlVXsVAwM+hhqISLh8LvT
+ZsGbBCWPPo5NOvle/Aa+4oVV1Gib/F+1wtJHUTwCTp+dNQadPCnzj2jcLt52x8Mr
+2aT/GHtEjHU55nIqMYyb++d9cuzDjXJdPwY7VGUrvlnSxN0VYmrG8cYZIlnaqQa9
+cBkHihT/F46zGHLlZu9kH/1uO0ZZZcQZHmdSyGUyZoJu6gO5dFDBbVQqS6vmkzpj
+6qskzr18Hf3VIB1FWNi91DRxZJski2UpjveU+X5i5kSw11i3Bqhu5N04XC5SvLGp
+5lJ1W7OUkZNaCB0XnvZ6BwbvEsZ/o0Axv5ZDeoAbQjVmolThH6vzdA==
+</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-00.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-00.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-00.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPnkgyiVy3SGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDcwODU5WhcNMjAwODE3
+MDcwODU5WjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuOTz2HgGQOUBfOqpb5FCef6/OTKD/qjX
+r86Ol36BIVB1UPLpX80jLXwX6BfXA7jFcrsuSHK/wIqvALfprP8GuEdfg4yCLxgV
+deODB+xBGMtokmzHOhbzOj2Gp9L64a1Y8M5kcpQrf1WWrNPmGH7/NIbXa7LL69vd
+GFp+fLDM15C1xryzgve686mICmxSEJbyGe6+TTxQNorTNtZ5yQGp0sgduu8diYMW
+wDe29AJzIVPnjkRjPRxitPKwxWQJPT3fbhb2Fz/V9HsddE585ydOTYjJwkMmDNgg
+fOXwPNVxRVBeJGNGf83BtanPCf5SoY2wchabMAVRcL3kLoPDlG0kGQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDAubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRbGyy2KE2LI+t+yYYmfKwT
+penTYDANBgkqhkiG9w0BAQUFAAOCAQEAHw8OjcuBB3EIlVXsVAwM+hhqISLh8LvT
+ZsGbBCWPPo5NOvle/Aa+4oVV1Gib/F+1wtJHUTwCTp+dNQadPCnzj2jcLt52x8Mr
+2aT/GHtEjHU55nIqMYyb++d9cuzDjXJdPwY7VGUrvlnSxN0VYmrG8cYZIlnaqQa9
+cBkHihT/F46zGHLlZu9kH/1uO0ZZZcQZHmdSyGUyZoJu6gO5dFDBbVQqS6vmkzpj
+6qskzr18Hf3VIB1FWNi91DRxZJski2UpjveU+X5i5kSw11i3Bqhu5N04XC5SvLGp
+5lJ1W7OUkZNaCB0XnvZ6BwbvEsZ/o0Axv5ZDeoAbQjVmolThH6vzdA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.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-00.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-00.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-00.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-00.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-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>