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-34.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-34.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..90482cc5
--- /dev/null
+++ b/swamid-2.0/nya-34.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-34.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-34.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-34.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-34.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-34.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKxx3oVkObbxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ5WhcNMjEwODIx
+MDcxNzQ5WjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsP+9jOk89dR96rE/amEqdiEaybf752cn
+qnHsHZ4n6KXPzTrvJwtYbe5M9ywADxvo0gg+Nj7snvGaSsV+I3nhn8VJcxWQ3w+e
+rAjKxubhJ9G/t48yzH2CwMwEiA1p8/hFNdUSMYW4O6cO4UDDZ2VrlHzYdUPeSwEV
+D2QVGpHgmjaoK8w71OEnXZElRTjGjOBqC7htH9zKFjn56sq0t3nx3xv/tAJ5hmnl
+SMX7NQsPAAjX2s8EIlQH3Q8ET/Vinoa0FY+pZ0HXtYK2XfNW5wrZ7qfYErW8qJft
+aqEixU9KOTNGuBrCZKbGmfURuPRiEKf+WLelKpzl1car9BZwQa9uZQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzQubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQNgUSY0gZQT7vfyLqxm4uz
+cuQ0ujANBgkqhkiG9w0BAQUFAAOCAQEANMDvpGBIqILEof2JLjU2YT53zF90cE82
+9hhHxSYpd+56yTuBxriC5yHmclhSaADFSeliBPaCmZdclP68RlfOVdK6DS26e2fv
+0mFMnp3a/VfQgLVx/95vP1OakvGhrJgI6P0HPusPOir5z/rCK0MWC0Fy/pzTYL2q
+N8WC6op8aycyh/gzAKKPIs03dKMCwzL+s2molNe6GCqd9lkRcc8aG7lSH51COuJX
+Ie9boAYkUxRawkTK5Wd2BsdYc/QV4iVCeFohHgF1AQHHj/JMrgLUkr7H9zxvoyvJ
+zL57IjNvnf128YJ93hl1ZBT8gh+s10fCRNwYd4464RWmpJAxcNkIIw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.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-34.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-34.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-34.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-34.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-34.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>