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-09.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-09.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..0651a2fa
--- /dev/null
+++ b/swamid-2.0/nya-09.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-09.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-09.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPbKYUWz91aaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM3WhcNMjAwOTE0
+MTQ0NzM3WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAugmpodAJ9MNQukBYVU0zrFs4diDQWqeI
+1m/lhKiTlbyrJ1HJO797IKj+dCMaLxPm46k/0Hw/xK2nJTfc30zT/Fo/arfrWaZP
+xoF3w1d4QmnYzubrMBr4Nc5WY9ymcVShQ1KMo9XvsACDJcwXMYMidgBAxwmz9u3f
+scVQRhenQkmDWyypT6MOf5LcikpDnS+eMUnyx1WimmtgN5i+aA2EViEb2ZOzfbVr
+KJcUjbZG/774vISYwhlR3SErLDIZklBLAID86iZo0cnuA4FXAMNJ8drPT/B0PoM4
+vktPubB6JAeNq5SPFTxDJBc+SBzP433X8V+HSvv5L+npnZ0Pq1QndQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRldgQJWoBWWFtXKeHQwvQE
+5v6wazANBgkqhkiG9w0BAQUFAAOCAQEAjSL/c0MY1vwaHA7gxYmyxMo+jyw2QC59
+5fIFXnZSfaDo2GDTC4WfPB6gFM5DrciiMbWfRQ89EJ7XIdp3t1HMo3i3eaj3SW+B
+eEX6MMEAZAIfSwMZYAIaH45krAnTjlR4V/TiLK0OhVHQ3AWYJewa8xRasDjiTKlt
+ORItfkHMjvt033n8jJQ0QFWWGiE08Mw+rlDBipVU1TrxefY/1rDJZIQNJ2qnPwze
+Xs9OHWfzbCnXss96yH20LjI/rrRVRtpfgTjgXxiQKnjwTtmxcSqbZoU7hmfBcIEv
+ena5FI92jFRbLqMXu2ViYfxIuQjvdrkNSX0vqF8f2ULc4JCVXIxArw==
+</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-09.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPbKYUWz91aaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM3WhcNMjAwOTE0
+MTQ0NzM3WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAugmpodAJ9MNQukBYVU0zrFs4diDQWqeI
+1m/lhKiTlbyrJ1HJO797IKj+dCMaLxPm46k/0Hw/xK2nJTfc30zT/Fo/arfrWaZP
+xoF3w1d4QmnYzubrMBr4Nc5WY9ymcVShQ1KMo9XvsACDJcwXMYMidgBAxwmz9u3f
+scVQRhenQkmDWyypT6MOf5LcikpDnS+eMUnyx1WimmtgN5i+aA2EViEb2ZOzfbVr
+KJcUjbZG/774vISYwhlR3SErLDIZklBLAID86iZo0cnuA4FXAMNJ8drPT/B0PoM4
+vktPubB6JAeNq5SPFTxDJBc+SBzP433X8V+HSvv5L+npnZ0Pq1QndQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRldgQJWoBWWFtXKeHQwvQE
+5v6wazANBgkqhkiG9w0BAQUFAAOCAQEAjSL/c0MY1vwaHA7gxYmyxMo+jyw2QC59
+5fIFXnZSfaDo2GDTC4WfPB6gFM5DrciiMbWfRQ89EJ7XIdp3t1HMo3i3eaj3SW+B
+eEX6MMEAZAIfSwMZYAIaH45krAnTjlR4V/TiLK0OhVHQ3AWYJewa8xRasDjiTKlt
+ORItfkHMjvt033n8jJQ0QFWWGiE08Mw+rlDBipVU1TrxefY/1rDJZIQNJ2qnPwze
+Xs9OHWfzbCnXss96yH20LjI/rrRVRtpfgTjgXxiQKnjwTtmxcSqbZoU7hmfBcIEv
+ena5FI92jFRbLqMXu2ViYfxIuQjvdrkNSX0vqF8f2ULc4JCVXIxArw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.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-09.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-09.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-09.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-09.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-09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>