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-07.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-07.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..7a1cee32
--- /dev/null
+++ b/swamid-2.0/nya-07.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-07.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-07.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIBTGPss5w3HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0
+MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOLxq8SkZ8b8YdyGfwPjV0OB6QyocICe
+bvxHU5HEr1VTKEsgehrS4ugDc1yCfHS68ut5KOaJKjA6aIyilBq0nOSAX5Z68agy
+5yBR+v4RTjIVhgi2MbRp5CoJxISA9h3GLS+0gMLi656wNeDg1mQRJt8fjy8R2jUD
+hC5eIHoRbfx5LezoxDu7KcOt20nJGx3rdRKrREYDYJ4rWVb/F8LxkU5JgzAF0Kkq
+EkE2ZNJMmeSLolK6TVfKvL7kiZGgbSIUapvg1Lcx+KHHfaod6WuI1g/GnaUmHSIb
+o6pPwVQ293IxMbn5EY9a2ALmYtJIiE9QqK0173wWdur9jw8KTZfWzQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRnl3x6WJMUOAnWqrPqr7CE
+/8QEwTANBgkqhkiG9w0BAQUFAAOCAQEAEkoE3brtHxrF29V4NRUDHf130+XIDlXA
+48nvD1IgPuzaILoX/5m/5xgF+HRPd356ecwu3tvs7yI2EExXDFCZc7SxmyhnPkrJ
+fxjC0NdVK9TsmfvFlOp3Jz/WOmvvNdL4nSK25eA+9XYDEB6p6dQUF5WJhNHKczWE
+CJvwCutzSJd9h+onoILD24yGJNnEE0enX/vMQHVI848ywdcdn0L2Y+rXRreianaW
+wkKQxPioaOS4e4xZrju9nEIW7Yownjhe/0UachrFLZ6XnCgQLTSiSJn9sypkO9VK
+OfYJhJ8JXiZCjsWFsQHuEtLwPjYx9nUTAB7NtqNZYHGDy8/xlobQqg==
+</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-07.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIBTGPss5w3HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0
+MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOLxq8SkZ8b8YdyGfwPjV0OB6QyocICe
+bvxHU5HEr1VTKEsgehrS4ugDc1yCfHS68ut5KOaJKjA6aIyilBq0nOSAX5Z68agy
+5yBR+v4RTjIVhgi2MbRp5CoJxISA9h3GLS+0gMLi656wNeDg1mQRJt8fjy8R2jUD
+hC5eIHoRbfx5LezoxDu7KcOt20nJGx3rdRKrREYDYJ4rWVb/F8LxkU5JgzAF0Kkq
+EkE2ZNJMmeSLolK6TVfKvL7kiZGgbSIUapvg1Lcx+KHHfaod6WuI1g/GnaUmHSIb
+o6pPwVQ293IxMbn5EY9a2ALmYtJIiE9QqK0173wWdur9jw8KTZfWzQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRnl3x6WJMUOAnWqrPqr7CE
+/8QEwTANBgkqhkiG9w0BAQUFAAOCAQEAEkoE3brtHxrF29V4NRUDHf130+XIDlXA
+48nvD1IgPuzaILoX/5m/5xgF+HRPd356ecwu3tvs7yI2EExXDFCZc7SxmyhnPkrJ
+fxjC0NdVK9TsmfvFlOp3Jz/WOmvvNdL4nSK25eA+9XYDEB6p6dQUF5WJhNHKczWE
+CJvwCutzSJd9h+onoILD24yGJNnEE0enX/vMQHVI848ywdcdn0L2Y+rXRreianaW
+wkKQxPioaOS4e4xZrju9nEIW7Yownjhe/0UachrFLZ6XnCgQLTSiSJn9sypkO9VK
+OfYJhJ8JXiZCjsWFsQHuEtLwPjYx9nUTAB7NtqNZYHGDy8/xlobQqg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.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-07.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-07.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-07.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-07.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-07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>