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-33.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-33.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..a597519d
--- /dev/null
+++ b/swamid-2.0/nya-33.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-33.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-33.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-33.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-33.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-33.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJGSDl1GqxhaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ1WhcNMjEwODIx
+MDcxNzQ1WjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuoM4oUsdlRVkGlj5sVWxf4np+CFQRNKW
+dEwdSLfw1iZ4kzk6/rI6VIxSQISgYwAR2wjGlikprer9gcCP+TVqTawgfxyG/Tgi
++aHSEIGvHey9sX6ojmoT9AqkYZdNzoutAkt6p1rNwv67tQKSb4SojwWYAVEwjXjH
+mQr3YzWSLSe+PnjNJ1XOOhdqEXBel7Mvltu/dAO/xesF7PoUamfRAD3/phZ85+gn
+k/bW8A3ALqO55FOTAg/8Va/VJ+O1JObdd2xOyGdKlqfuUXKwA/ASIlQW0mtImicw
+y34uGHmXwJWlJ65ya2/MCigXwy0sSurMXwchx9aiAueVrzC5/GdEtwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzMubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRMCkIYHMjQeMewto16Q822
+JOMprTANBgkqhkiG9w0BAQUFAAOCAQEAcd2SgaBNZ7A+usMZASWBaGsN5qRUoxgT
+h2HEbCa7gr/shsNF9lSrDQHOuPXzDKYkDLdHlkoINLRc856zhJqaDGz5BJQI1Vfi
+8iu8BGmeo8QyBTtlm+oSBY9WCYHYuUFnoJs9aqw0HOwUM34TK+B99T9xau1qaCfh
+Gxv1Z6F9RzBaPznX/aXGew1TwvV1Shl/ZmpN5ZGVcGw1Ig6PHFkTzp86r7Rw3J7C
+ldfw5RAgBMtkBr3xyKEJ4JJJMuP3WLg1XN3mpuk7MiTCppvfXNSz/fHENGS5IuwJ
+QGi6KqPz2nNLckpWNPQlqC3OZ5mz+9TOJ/xHXWKOEeOCsOqcL9dhZA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.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-33.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-33.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-33.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-33.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-33.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>