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-21.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-21.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..0f92d667
--- /dev/null
+++ b/swamid-2.0/nya-21.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-21.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-21.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJg26jet2Q3XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMxWhcNMjEwMjI3
+MTYyODMxWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0un7EXE+8dkUQ79q7iTAd5+Pmbh/Xr95
+Y/n6KQX833Td8UvGIIGOI9TASztBeC5+FA/7Niy8n5lXdA41u4PVnsAqkhqooyyG
+nM1RfCVUNnk3EW2+tCymUtp30LnKUSydPkvC2toeHZEb/o7kzq+Egcf+c80z+HjC
+Ut4mNqhuRv1sriX1PkbBnZwkL04/y+Wh9eXoCbVw0dJH6D7GazD3lwEaB7bPsy5c
+jtZSX89jFu8OrMI7B6pwvM/r2KYz0YT/75cSaM7UJwlb9KmMhjF0lpVc2eCzEhsf
+kACK5gxkZo7HFq+/kdhwmC6bMWfhVZQaFyx8WPg0+w50SMrccpz6VwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSkvTHNRlqlEKBIDQlZjRdV
+1KY/GjANBgkqhkiG9w0BAQUFAAOCAQEALrIIQVRBTM+IjaGDSyL0Vv+M6DeD8+qy
+Bv93gksswuPBgUu6Sg4s/MG4I/XCKNnoB16q7cLh6NlDN4CN7WYZaGtblmw1lMnZ
+Nbgw/ghCQWpJZ1AmMlSpH0Ew2YunUdRjMqJlaopgGHD9NZgpAtH6qWAw8d8JdzgS
+H9tL3L6GOp7rQEbGxVm+IXMQdMCazchEskcT6qe7Bixh/QOi0Sd4ZQULhu0vVS8O
+Tm4TeNirPPOJbRjbdh5Oz/ikn5kP7iTVdcvIfvn7F1dZnS15JMA2yxoXCysB9oj9
+8Vk3p9f3k2Uug3YtQK3uR3bZwffzni4GJqbYUq/ti8dcWMGZbBtyNg==
+</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-21.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJg26jet2Q3XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMxWhcNMjEwMjI3
+MTYyODMxWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0un7EXE+8dkUQ79q7iTAd5+Pmbh/Xr95
+Y/n6KQX833Td8UvGIIGOI9TASztBeC5+FA/7Niy8n5lXdA41u4PVnsAqkhqooyyG
+nM1RfCVUNnk3EW2+tCymUtp30LnKUSydPkvC2toeHZEb/o7kzq+Egcf+c80z+HjC
+Ut4mNqhuRv1sriX1PkbBnZwkL04/y+Wh9eXoCbVw0dJH6D7GazD3lwEaB7bPsy5c
+jtZSX89jFu8OrMI7B6pwvM/r2KYz0YT/75cSaM7UJwlb9KmMhjF0lpVc2eCzEhsf
+kACK5gxkZo7HFq+/kdhwmC6bMWfhVZQaFyx8WPg0+w50SMrccpz6VwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSkvTHNRlqlEKBIDQlZjRdV
+1KY/GjANBgkqhkiG9w0BAQUFAAOCAQEALrIIQVRBTM+IjaGDSyL0Vv+M6DeD8+qy
+Bv93gksswuPBgUu6Sg4s/MG4I/XCKNnoB16q7cLh6NlDN4CN7WYZaGtblmw1lMnZ
+Nbgw/ghCQWpJZ1AmMlSpH0Ew2YunUdRjMqJlaopgGHD9NZgpAtH6qWAw8d8JdzgS
+H9tL3L6GOp7rQEbGxVm+IXMQdMCazchEskcT6qe7Bixh/QOi0Sd4ZQULhu0vVS8O
+Tm4TeNirPPOJbRjbdh5Oz/ikn5kP7iTVdcvIfvn7F1dZnS15JMA2yxoXCysB9oj9
+8Vk3p9f3k2Uug3YtQK3uR3bZwffzni4GJqbYUq/ti8dcWMGZbBtyNg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.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-21.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-21.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-21.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-21.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-21.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>