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-11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-11.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..1414b868
--- /dev/null
+++ b/swamid-2.0/nya-11.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-11.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-11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK2Rn0ue0XijMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODMyWhcNMjAxMTIx
+MTIxODMyWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1G8hSmU2aJNRYqhtzTDYKXvSGla4zGMm
+zJ537Xf8FfgREoooCLQFnNRztGKvnZk/6R9NJA1LfzYkrU77EQlN8HG77NcAAZmS
+e1Uq8fkyOgCngFMSh/Ltc/lfmJlTx2jumkVjXWbvGDI9FHv/7aY1J9VKrIXDtWw2
++qsIo/yoeh1YjgwWq1G43D3KpEGkUfHoDSqkrqvQhUUZbebd2uRDck2/Dyc7lczQ
+zPDeWGgXwiFwfzEYijJP9C6WSSZbGUUPkuvmyFM8y57E4zAPLVK+LsRzUUMXVKEx
+K0hUxbW8r2gU9naUcGyZET7Em50SDvgcodGvJOm5XV1vCL5xvsENLwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTEubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRuf2bqHYwidTb+1cv8gHm3
+yZ7wHjANBgkqhkiG9w0BAQUFAAOCAQEAqJrAde9Tha1fV9MpQMDrcbVB+WJShcpa
+PQDPuyNEglzPg4LOr8l+6blVccJpsTofn83mQwsLFKC5EJFOJXi4SycKClXKLfoW
+EbiVOaHn09CzFMCGoF51remi0Z27whDobX3xbZGLjbCIr8PevH+fd9MCqHIqA/Rn
+nFZLN4c8l7CrG/PkmPfRyVziSIBmaQaUaPuxz37KBfyJFKdu4drR/g0nYhFRHrvF
+fyqdXb3s6ov7+dPe1+Rlar/ej21wUhvjAuMyddVEQIA+AQ4+svmQ06+9qVuKGnUY
+I4tiNRJDuFIy2L7PegtOwoBAm9rDP5c2Q06DX+t7nFulPL9mWLufmw==
+</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-11.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK2Rn0ue0XijMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODMyWhcNMjAxMTIx
+MTIxODMyWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1G8hSmU2aJNRYqhtzTDYKXvSGla4zGMm
+zJ537Xf8FfgREoooCLQFnNRztGKvnZk/6R9NJA1LfzYkrU77EQlN8HG77NcAAZmS
+e1Uq8fkyOgCngFMSh/Ltc/lfmJlTx2jumkVjXWbvGDI9FHv/7aY1J9VKrIXDtWw2
++qsIo/yoeh1YjgwWq1G43D3KpEGkUfHoDSqkrqvQhUUZbebd2uRDck2/Dyc7lczQ
+zPDeWGgXwiFwfzEYijJP9C6WSSZbGUUPkuvmyFM8y57E4zAPLVK+LsRzUUMXVKEx
+K0hUxbW8r2gU9naUcGyZET7Em50SDvgcodGvJOm5XV1vCL5xvsENLwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTEubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRuf2bqHYwidTb+1cv8gHm3
+yZ7wHjANBgkqhkiG9w0BAQUFAAOCAQEAqJrAde9Tha1fV9MpQMDrcbVB+WJShcpa
+PQDPuyNEglzPg4LOr8l+6blVccJpsTofn83mQwsLFKC5EJFOJXi4SycKClXKLfoW
+EbiVOaHn09CzFMCGoF51remi0Z27whDobX3xbZGLjbCIr8PevH+fd9MCqHIqA/Rn
+nFZLN4c8l7CrG/PkmPfRyVziSIBmaQaUaPuxz37KBfyJFKdu4drR/g0nYhFRHrvF
+fyqdXb3s6ov7+dPe1+Rlar/ej21wUhvjAuMyddVEQIA+AQ4+svmQ06+9qVuKGnUY
+I4tiNRJDuFIy2L7PegtOwoBAm9rDP5c2Q06DX+t7nFulPL9mWLufmw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.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-11.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-11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-11.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-11.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-11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>