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-10.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-10.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..73ab1c34
--- /dev/null
+++ b/swamid-2.0/nya-10.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-10.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-10.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL4ng+2mpzLjMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0
+MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2yvAxQdxqb4/yf9+ewZXbdc9/WBZPvmc
+ZlKby1eLDpnEhgE1U+kKKyRKhoYTQXYGF8kdcvlupktrbDeiumqprdcizHcHk8xm
+crNT3wkh7AXVpQzasQacwS+SQ5LR1GzyR69z9U9NQB4vURsp/sFZBtN1DMyLcVmb
+Y1qTQG7yzvIZI0ZrKVS5yvfZSvY0YFoSAoBXm4aTdR/EGHDWSJwlrJpEKcSwOS+M
+KbjfPVX7Qet5igxQ//pANx1RnEdIT2i9dwTfGHWyZJmiIiEfI1R2xnbsk9eztyDV
+6AsxV9mgywH8II3yau028x6yhsW0Y11+dQqW2u4If93l8pVtQC1eJwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR1IrVGQRi3VkXTlBIGJhs3
+/rx8mDANBgkqhkiG9w0BAQUFAAOCAQEA1Aq5b9z9QDg68A98d9JNVLvxpf0QubYN
+5omV/jiFly4ca99WJ1Nbv7euPAzFBENgRP3v/THgnUVKQqxOMS8i+5VF7BYpiL9h
+JT5EE5AIzV2zMbrtyXJuNxR8e33CT5DKY696CADCGl3kuIYiHuSCUo2CaMtHA3Dy
+pFB1OPoffqg0Y+c2KMPV+ksrPVZYps3Yqma/f9xfoGVQ3BJVUD6vCiRuwYq7C8Re
+zVfsPT/8DTfaDPRpQPADXdmQN+qXKon8+75eWaQG+/KjR8EgRpjCckTqJ9UpXJen
+H5hgUoLJ1QbK7IJzQAPU27OUBo8A6o45QZQh87McTiNrRXw/s2w4cQ==
+</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-10.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL4ng+2mpzLjMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0
+MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2yvAxQdxqb4/yf9+ewZXbdc9/WBZPvmc
+ZlKby1eLDpnEhgE1U+kKKyRKhoYTQXYGF8kdcvlupktrbDeiumqprdcizHcHk8xm
+crNT3wkh7AXVpQzasQacwS+SQ5LR1GzyR69z9U9NQB4vURsp/sFZBtN1DMyLcVmb
+Y1qTQG7yzvIZI0ZrKVS5yvfZSvY0YFoSAoBXm4aTdR/EGHDWSJwlrJpEKcSwOS+M
+KbjfPVX7Qet5igxQ//pANx1RnEdIT2i9dwTfGHWyZJmiIiEfI1R2xnbsk9eztyDV
+6AsxV9mgywH8II3yau028x6yhsW0Y11+dQqW2u4If93l8pVtQC1eJwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR1IrVGQRi3VkXTlBIGJhs3
+/rx8mDANBgkqhkiG9w0BAQUFAAOCAQEA1Aq5b9z9QDg68A98d9JNVLvxpf0QubYN
+5omV/jiFly4ca99WJ1Nbv7euPAzFBENgRP3v/THgnUVKQqxOMS8i+5VF7BYpiL9h
+JT5EE5AIzV2zMbrtyXJuNxR8e33CT5DKY696CADCGl3kuIYiHuSCUo2CaMtHA3Dy
+pFB1OPoffqg0Y+c2KMPV+ksrPVZYps3Yqma/f9xfoGVQ3BJVUD6vCiRuwYq7C8Re
+zVfsPT/8DTfaDPRpQPADXdmQN+qXKon8+75eWaQG+/KjR8EgRpjCckTqJ9UpXJen
+H5hgUoLJ1QbK7IJzQAPU27OUBo8A6o45QZQh87McTiNrRXw/s2w4cQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.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-10.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-10.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-10.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-10.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-10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>