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

diff --git a/swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml b/swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml
new file mode 100644
index 00000000..1d679ace
--- /dev/null
+++ b/swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://minasidor.ladok.umu.se/shib-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://minastudier.ladok.umu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://minastudier.ladok.umu.se/shib-sp</ds:KeyName>
+        <ds:KeyName>minastudier.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=minastudier.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIJAK5Ick7Lu3Y+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZTAeFw0xMjA1MzEwODQ1NDZaFw0y
+MjA1MjkwODQ1NDZaMCMxITAfBgNVBAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMaB49YGTFm67lkGcJW0
+2j8nFZQ7WVK/uWEufaL6IRWWGTPm7e7hPRrwHXOqJpZQjIT87d/9lnjpgWThOs/D
+pV7BX7H5d4+EFihUV7czOrvdASubTf429yUpRY1ch0/134jks2uOgBlHznOnDYuD
+KxsktAe9Eau9HJ1WBfIdj3BAD+5IGcoassZimysSqhWKrQ4qKQhb4Z2i25DnF64r
+O+Xdevu1x3EBUfFpmodXo8jSlSmUm/RjabCQvE0ZnNVDHFigFlE0sTJQVKthZVfw
+16tor6Z7G3JTPB+nGTzC3vQYt4Ea3fMBIHsNKykXM22F7NXAYf4Pm3o6T4JY3/L6
+spMCAwEAAaNwMG4wTQYDVR0RBEYwRIIYbWluYXN0dWRpZXIubGFkb2sudW11LnNl
+hihodHRwczovL21pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZS9zaGliLXNwMB0GA1Ud
+DgQWBBQStVXl5Vu66/j8S1iZTj3rSmV42zANBgkqhkiG9w0BAQUFAAOCAQEAWRFm
+ZJTf5A2awpmUT6yNngEAbANXFgspa55XDsSgbv/9yCRmhrbTWADbp4SIuAYzmY+U
+O2qoHrQV2BaJA1WomGWP8Sgx+eZzcea4dO69RH/8lL7wgK13Bp5osjRgCGXX8Zih
+BLJ1BCwX9VZ1w0vPXmj/KLc7XM9sRmZvNqaD6tEeKeHgC9AUsMfrYJW6dpDeiunC
+6DBBshYlj0vhGiRUqLvZcUblNNrOhfEiaav4up4gRd93SEUUdqyYhpJRNNnHAvN1
+DFBgFVzSBKut1DQ6H8ikkUDDh6MHJMOwpv3NEXk776HgwMFDmHlE6Gnysa8aV/wj
+BSjBWAdDFrXgrc1jPw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>