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, 50 insertions, 0 deletions

diff --git a/swamid-2.0/nya-40.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-40.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..ef2fa310
--- /dev/null
+++ b/swamid-2.0/nya-40.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-40.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-40.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-40.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-40.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAODcFomYSLTPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ5WhcNMjIwMjE3
+MTIxMjQ5WjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwzA6u1A91BAphAM6jHimrOfEd6xbQxKs
+SFqVXOun5a5bhJPjIjw7AN5tTcJZheleRmIRcgwyT2qkSSUSDvjxSRa7pP4xOuAz
+Ndulke3BmAszJxUkvbJaMmDRS13pC/S6XjwfcM9j30eym77WY1+ibchWrJg5UMxk
+f4+uoPVRJC8ELEjU/U+wgj6ctUm/xr2t/qDekZRoc4SAGBxutGccE3tkeuFl/Ae0
+82H/xgDh8pCPnnAsL//XghX303n2gS7Zl59vbMV74nVKqNP1P/3Yw7pm4waMPObU
+F7/JRHcyOyTtIzDfyEUVDlkh8TQFD0dxRTzVenO1HBN4p+4tRGMVpQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtNDAubGFkb2sudW11LnNlhiJodHRwczovL255YS00
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQZ4WDCudtLR2Z0viTTew//
+NkCaATANBgkqhkiG9w0BAQUFAAOCAQEAHvTIQSXND30IDNBQ7AQxdG0x5y+kgcJU
+ZUaz87TMmP70XmRK/uH9ONsm2IngmoPi1urOF8T14rdyScSLw/FkzIsbYSICnVvC
+yBO1atn/KPnSr3ZmmEzAWZo1FNvVtMLbIMv9OSGTclqJTC9fnZFdaK0AP3fxjEVv
+HzBSSc3T9/OpTQ2ARyPqODpmkP+GOxzpPBjcLV6r8o0cqbU9fsXOHRfaXxaNUCJa
+WUGsJ1Rxrsfct7C16sfb9rvGl26cdtJXsWN+n9VHsuHbObr0zz0EdJ5GxwDany5t
+mDWz1pcSoipCbE/xT96vf388dBYIryBl2nclJCkKKCaoHbHlmvSmgQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.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-40.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-40.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-40.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-40.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-40.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>