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/nb11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nb11.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..acbb6de2
--- /dev/null
+++ b/swamid-2.0/nb11.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://nb11.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://nb11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOGEddor1oZSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMloXDTIwMDkxNDE0
+NDcxMlowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC5/PAbfjnvJOjm9Oxe74JAFbQ7zegR+b75jcHV
+YP+fiR52Lh/F/uV+hGHhz64Ynu5l0FIouU/WttTwmUu48tfVa11GJcPbRG4oOPnv
+whfVnIvky8ZpaxIEj1Ke9fvE/cYDL16QX2YD7FnttXy/EBG97XbU6EsgfEbNHSUR
+Dzk1evC9sh/njCWzQglrStOWyxjc7hW7Ex05KffeCX78MBCX1Uk7edOmVjlqbxvZ
+/i9xHg4ovT7exTX6FVlr0FCoy3980u+u06/B6SzWiL/N+AWFMi7Zce3riC9hxTQf
+lswftcduNexQ5MbT9dVmv59shAeyUcTKDXAbs2azpzQWxn73AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUjBFneivciFfdFQFKdJ9rkDNQv14wDQYJ
+KoZIhvcNAQEFBQADggEBAGMxTmoddCaGM+FIT9TeWcetsEBXwuY/7YOo7d/++fKb
+4OyByiIAnfAoYQUPEuUEJn+O0Pk4suzC/jLc0W3Vu+ih4dE1LTJLU05bayxgbqfO
+42OLoU+fuyIsxgyGsduQvaG9BYYXAVio9lD76Gi4tGAMtERjGZuvO/6l5rR7s4gU
+uSmMdeDjkBRag1Su250dylx+SZYpnL6sOe6IwZ0d00Tm2h07RepuvK6KIpkTvmBu
+SkilI6r/vLR8/Ta5S3orj63g7DEP+QF7/OLDE4wC3wkyN+Hp5AmyWM43Aqa5TQxI
+CW028wnxsYsPpbKp9m+Q2DC6ucnzozt6kYfxmksErAk=
+</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://nb11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOGEddor1oZSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMloXDTIwMDkxNDE0
+NDcxMlowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC5/PAbfjnvJOjm9Oxe74JAFbQ7zegR+b75jcHV
+YP+fiR52Lh/F/uV+hGHhz64Ynu5l0FIouU/WttTwmUu48tfVa11GJcPbRG4oOPnv
+whfVnIvky8ZpaxIEj1Ke9fvE/cYDL16QX2YD7FnttXy/EBG97XbU6EsgfEbNHSUR
+Dzk1evC9sh/njCWzQglrStOWyxjc7hW7Ex05KffeCX78MBCX1Uk7edOmVjlqbxvZ
+/i9xHg4ovT7exTX6FVlr0FCoy3980u+u06/B6SzWiL/N+AWFMi7Zce3riC9hxTQf
+lswftcduNexQ5MbT9dVmv59shAeyUcTKDXAbs2azpzQWxn73AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
+dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUjBFneivciFfdFQFKdJ9rkDNQv14wDQYJ
+KoZIhvcNAQEFBQADggEBAGMxTmoddCaGM+FIT9TeWcetsEBXwuY/7YOo7d/++fKb
+4OyByiIAnfAoYQUPEuUEJn+O0Pk4suzC/jLc0W3Vu+ih4dE1LTJLU05bayxgbqfO
+42OLoU+fuyIsxgyGsduQvaG9BYYXAVio9lD76Gi4tGAMtERjGZuvO/6l5rR7s4gU
+uSmMdeDjkBRag1Su250dylx+SZYpnL6sOe6IwZ0d00Tm2h07RepuvK6KIpkTvmBu
+SkilI6r/vLR8/Ta5S3orj63g7DEP+QF7/OLDE4wC3wkyN+Hp5AmyWM43Aqa5TQxI
+CW028wnxsYsPpbKp9m+Q2DC6ucnzozt6kYfxmksErAk=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.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://nb11.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://nb11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>