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-06.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-06.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..286c4e04
--- /dev/null
+++ b/swamid-2.0/nya-06.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-06.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-06.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJU9ZyGFpaf1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMwWhcNMjAwOTE0
+MTQ0NzMwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3y6ms5BR7ANajUZ48upzTAGNtLFnGQWn
+UJjh3+rWC4YR6poRJdPqy2D/X6Qk5U6XllkzQK6/87QNcvWNQYuHFsohsqdQbDqN
+TRQFcUY/GrZrsWi1BqK4Kur9X1blE00bgfF3g1Q4ckSPnYJrsRLjhuEwNDGxMd4D
+54DVY8oyq1p0XBJCdzV98HxgT50RWSZtU8mZsFeqMXupG3pdYsARPsT8KJyWuruz
+8VBP3OUJ2zpEI1HGcbPmw7mrXSEpS5AGCYxCmoOtWH8ivtpPkRYejytYdyli1ODR
+NTsWoeLPYiEtCrTEx+csmwB9yMZTcQDkS8AyL78xGft0oCFT0PZGuQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS69I6J1WnLhxDpTA2xOuaF
+2P/YnTANBgkqhkiG9w0BAQUFAAOCAQEAQiVF/VQOsIDzj1dU50AU4tdt/BW970Is
+67hrpK57WkAVfQrNfu1h0M4dElif9ue1ijk/Z8zE2JKdlh+qVTkfgCVSWiJspOUw
+NvCE9XEqxXQRGE7IBuRjSRKcFNxQ5uf6Ye0By5IW6C9ey9j4+fsY022uKAo41p5/
+O2EgL84jp7AH+leW6OqVNnnbbIT7bGbEJBJtJgK003fyc5Vs1qYkpW2PSHVsKtf1
+08osMW3Nz1X59nMhxwevKIUQ2ScCaGG12ddFQAtB3DNAhUG5j1/xx7ZdczYZyu7Y
+vRRFxllLGv3BJNrCPy1xECAcdy8S6qCXnscdNzxGpaBGyTflbekmFA==
+</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-06.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJU9ZyGFpaf1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMwWhcNMjAwOTE0
+MTQ0NzMwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3y6ms5BR7ANajUZ48upzTAGNtLFnGQWn
+UJjh3+rWC4YR6poRJdPqy2D/X6Qk5U6XllkzQK6/87QNcvWNQYuHFsohsqdQbDqN
+TRQFcUY/GrZrsWi1BqK4Kur9X1blE00bgfF3g1Q4ckSPnYJrsRLjhuEwNDGxMd4D
+54DVY8oyq1p0XBJCdzV98HxgT50RWSZtU8mZsFeqMXupG3pdYsARPsT8KJyWuruz
+8VBP3OUJ2zpEI1HGcbPmw7mrXSEpS5AGCYxCmoOtWH8ivtpPkRYejytYdyli1ODR
+NTsWoeLPYiEtCrTEx+csmwB9yMZTcQDkS8AyL78xGft0oCFT0PZGuQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS69I6J1WnLhxDpTA2xOuaF
+2P/YnTANBgkqhkiG9w0BAQUFAAOCAQEAQiVF/VQOsIDzj1dU50AU4tdt/BW970Is
+67hrpK57WkAVfQrNfu1h0M4dElif9ue1ijk/Z8zE2JKdlh+qVTkfgCVSWiJspOUw
+NvCE9XEqxXQRGE7IBuRjSRKcFNxQ5uf6Ye0By5IW6C9ey9j4+fsY022uKAo41p5/
+O2EgL84jp7AH+leW6OqVNnnbbIT7bGbEJBJtJgK003fyc5Vs1qYkpW2PSHVsKtf1
+08osMW3Nz1X59nMhxwevKIUQ2ScCaGG12ddFQAtB3DNAhUG5j1/xx7ZdczYZyu7Y
+vRRFxllLGv3BJNrCPy1xECAcdy8S6qCXnscdNzxGpaBGyTflbekmFA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.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-06.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-06.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-06.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-06.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-06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>