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-14.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-14.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..0fe25e9f
--- /dev/null
+++ b/swamid-2.0/nya-14.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-14.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-14.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-14.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-14.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOf2TJJC9obLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUzWhcNMjAxMTIx
+MTIxODUzWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1l1dyGmF/t6slbX9MkgpYBtHIHmrF68j
+IB1FeZdc4q553BkbV5KQBwu6n68ammk7Nz6OOwdOWmGJ6MX+2PjVVerdD3IT3M9t
+Ip9pfbEoMQAWu1FNMa2+PGIj8MSU5YG7QU2KFCt4HDB0NSr3VikR3ZTrF1DURX4N
+kqWzrMAJ82xSj4RkUR+9zgaAO+95Nh7zngCyvIm0/YDLIsCvYQCn2PaLdZdviAyi
+ttiLDo/P53vqt7bJmbaQQMk+PFp7BR9kRVL61Ckyjxe8b6CCvxe/NUXoXEcuMjz/
+kgfkvhhhM536Q6LvJmOIgGC67b1l58XSXajP2wbCnx3hI3B11N4E2QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTQubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRgjvTHIWqXb+/QKwVaWxL8
+G7xILzANBgkqhkiG9w0BAQUFAAOCAQEAj6RsTBwEL32xpcvUi23tCA+58rygz7i1
+zg9moyxkbswHrdumM9WtU2Ofp/ZhzDkyI3CK9srELMoXR3en8X2GPAIijEHSU5BK
+XIJNQo4odRPTw9eZhVdF427bptpIOiL555cQhsLFx1DduXXvUpLzeE7JRmPtwJY1
+fPzDX14r5J/yXBZyljlJfwBv+04D9RNcfMr9yNfga61h/nJzwlWqfdwdyvyi8ORM
+3k6oXPp98TbUscWVBPQ05imvyFwDIwIuFJu9NiwORXDqdELPRXCmV3YnhN9kSSEF
+nmOWiIiH9RKtRI4u5ypWzfu3S6XDcYrTiNeZeGyTB4v6bu74nFyzbA==
+</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-14.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-14.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-14.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOf2TJJC9obLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUzWhcNMjAxMTIx
+MTIxODUzWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1l1dyGmF/t6slbX9MkgpYBtHIHmrF68j
+IB1FeZdc4q553BkbV5KQBwu6n68ammk7Nz6OOwdOWmGJ6MX+2PjVVerdD3IT3M9t
+Ip9pfbEoMQAWu1FNMa2+PGIj8MSU5YG7QU2KFCt4HDB0NSr3VikR3ZTrF1DURX4N
+kqWzrMAJ82xSj4RkUR+9zgaAO+95Nh7zngCyvIm0/YDLIsCvYQCn2PaLdZdviAyi
+ttiLDo/P53vqt7bJmbaQQMk+PFp7BR9kRVL61Ckyjxe8b6CCvxe/NUXoXEcuMjz/
+kgfkvhhhM536Q6LvJmOIgGC67b1l58XSXajP2wbCnx3hI3B11N4E2QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTQubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRgjvTHIWqXb+/QKwVaWxL8
+G7xILzANBgkqhkiG9w0BAQUFAAOCAQEAj6RsTBwEL32xpcvUi23tCA+58rygz7i1
+zg9moyxkbswHrdumM9WtU2Ofp/ZhzDkyI3CK9srELMoXR3en8X2GPAIijEHSU5BK
+XIJNQo4odRPTw9eZhVdF427bptpIOiL555cQhsLFx1DduXXvUpLzeE7JRmPtwJY1
+fPzDX14r5J/yXBZyljlJfwBv+04D9RNcfMr9yNfga61h/nJzwlWqfdwdyvyi8ORM
+3k6oXPp98TbUscWVBPQ05imvyFwDIwIuFJu9NiwORXDqdELPRXCmV3YnhN9kSSEF
+nmOWiIiH9RKtRI4u5ypWzfu3S6XDcYrTiNeZeGyTB4v6bu74nFyzbA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.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-14.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-14.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-14.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-14.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-14.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>