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

diff --git a/swamid-2.0/hubbletest.ladok.umu.se-ecs-sp.xml b/swamid-2.0/hubbletest.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..d7efa8e4
--- /dev/null
+++ b/swamid-2.0/hubbletest.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hubbletest.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://hubbletest.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>hubbletest.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hubbletest.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAMHgh8Q6vsedMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1MloXDTIw
+MTIwNTEwMjQ1MlowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRAHC7OUXdXewrMUWcRqoa
+6I3/znBTt+XPSCzf7aLnfRz35iP2jj4WPE/GWWLbfwHqdbTJ7Rtp0KrNXtFVCPXv
+XsBONnx3rIl/KU9iGIv6ICAdH83yqXF50B5mvwHgO7KXhXokiF+K6uM+2RqXMs+q
+9w9knyHQs1/NWXzLaEENG27HuR3pYDkiVDnQA6FT6WfoO7fvzUxPiLgI47+qeESA
+ieLh9Q26pixYycsGSKHTo2TK0SvYtxB2FVWNYDFHb9WYwuIFlQRurehrckvxNr58
+Pp5CVTLcZhGO9IbQoFTQj7L6gY6H1Ped0VcD+JK6oGtS5t+VZ8fk7h/EgxxVopJf
+AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2h1YmJsZXRlc3QubGFkb2sudW11LnNlhiZo
+dHRwczovL2h1YmJsZXRlc3QubGFkb2sudW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQU
+0K8/aTv9MuDohuDTagFI/JNU8iUwDQYJKoZIhvcNAQEFBQADggEBAIv5wk8aUMbm
+yFBpaI7iweOPhr0wGoVR3Vvp1/uhb0FRz4p6snp1Ps2TgGjGNlNTc22lpHRVjaMc
+c9uOkUqhomDa5YhO9S2zFPv/pRNFZ0Xgf0lVFk7u2jqP/sKuUGUbypCwRv+R7ZNG
+jFWT7wq2RS3L3pZCOW5OceJHSpxSFPVWJ6UPhUwPESl/Q75HU3mvWAUE7DjcbjK6
+F+Rzb5tk6M1wcYe+P9G7Y60+qe4a38GeOZwHQgKVH7Uo+d5YekxuXJLKrwN0mKSL
+GawGIqkPtA/Y3LAJhwA9qpVH6jywJy53/exXtdno7dwRUjKd8hR+/RqWTSdO6nzf
+6OZggcYa9mo=
+</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://hubbletest.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>hubbletest.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hubbletest.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAMHgh8Q6vsedMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1MloXDTIw
+MTIwNTEwMjQ1MlowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRAHC7OUXdXewrMUWcRqoa
+6I3/znBTt+XPSCzf7aLnfRz35iP2jj4WPE/GWWLbfwHqdbTJ7Rtp0KrNXtFVCPXv
+XsBONnx3rIl/KU9iGIv6ICAdH83yqXF50B5mvwHgO7KXhXokiF+K6uM+2RqXMs+q
+9w9knyHQs1/NWXzLaEENG27HuR3pYDkiVDnQA6FT6WfoO7fvzUxPiLgI47+qeESA
+ieLh9Q26pixYycsGSKHTo2TK0SvYtxB2FVWNYDFHb9WYwuIFlQRurehrckvxNr58
+Pp5CVTLcZhGO9IbQoFTQj7L6gY6H1Ped0VcD+JK6oGtS5t+VZ8fk7h/EgxxVopJf
+AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2h1YmJsZXRlc3QubGFkb2sudW11LnNlhiZo
+dHRwczovL2h1YmJsZXRlc3QubGFkb2sudW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQU
+0K8/aTv9MuDohuDTagFI/JNU8iUwDQYJKoZIhvcNAQEFBQADggEBAIv5wk8aUMbm
+yFBpaI7iweOPhr0wGoVR3Vvp1/uhb0FRz4p6snp1Ps2TgGjGNlNTc22lpHRVjaMc
+c9uOkUqhomDa5YhO9S2zFPv/pRNFZ0Xgf0lVFk7u2jqP/sKuUGUbypCwRv+R7ZNG
+jFWT7wq2RS3L3pZCOW5OceJHSpxSFPVWJ6UPhUwPESl/Q75HU3mvWAUE7DjcbjK6
+F+Rzb5tk6M1wcYe+P9G7Y60+qe4a38GeOZwHQgKVH7Uo+d5YekxuXJLKrwN0mKSL
+GawGIqkPtA/Y3LAJhwA9qpVH6jywJy53/exXtdno7dwRUjKd8hR+/RqWTSdO6nzf
+6OZggcYa9mo=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>