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

diff --git a/swamid-2.0/connect-test.sunet.se-shibboleth.xml b/swamid-2.0/connect-test.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..419b83d1
--- /dev/null
+++ b/swamid-2.0/connect-test.sunet.se-shibboleth.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-test.sunet.se/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <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>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-test.sunet.se/Shibboleth.sso/DS/nordu.net" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>acp-web.sunet.se</ds:KeyName>
+        <ds:KeyName>https://acp-web.sunet.se/shibboleth</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=acp-web.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKkN4aqE4O7tMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFjcC13ZWIuc3VuZXQuc2UwHhcNMDkwNjE3MTAwNTA1WhcNMTkwNjE1MTAw
+NTA1WjAbMRkwFwYDVQQDExBhY3Atd2ViLnN1bmV0LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA3iWXh1+ub5i8ZOypk7syIpndivWpp4jbcMYpmiEX
+q9Jym97j7x9WXc0vNrmKkccoUcWU1FgoiiXso6vhdgzKkqrcBIzc/YJpphN5K3tt
+pVabdgV9TG6PJ0Q6k07bvZew9yEhpXDE3gfKLOFAKeSUILHGc2FBU32EuBqVt/sn
+zBleOEBb3tiIB9/YCZS2A6wtnvzGY1mUX27Vyv2SH6Bx/GlmWuTJRrv01avrldfv
+3CiFrCeeAfLfnljfy4WbpszzlqBQvaZFBaBRtg1AgmFNkryTCm5yO2BrM3NyurN/
+K/Uc/YBZ8thxQPSEeUVWHCStXTQGLREYwJKZMfp4yFhzeQIDAQABo2MwYTBABgNV
+HREEOTA3ghBhY3Atd2ViLnN1bmV0LnNlhiNodHRwczovL2FjcC13ZWIuc3VuZXQu
+c2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUmtnePgSQNSvDZIox3d5mG/+AJb8wDQYJ
+KoZIhvcNAQEFBQADggEBAIaEDBm1eN9o7j0cQBQQNMh1FJFX2h1EklGj4YgXbqjj
+By3duIzXVAut+z4VtCTGx2CjQ1YcmSqWvx7+XFY0xEnmuAMUw8rdp0OR2Sk0iU4/
+BZt5125JOtJRRVJIDz4n9jbf6NNUsP4+HA0ukqyHDrTD0+30IV48MaWxR7HdPpyE
+bCMK0FZIQYm6d3zSgZW6ofsx24AonFZBtJBCQZxdInvqg2eYemOUh37vEBxbjWqE
+51pFWLbVUit84wy8eG3E28OPa64gc/VNk1XEj1ILLzXFV59XuZG2jzjB9xCyPmHW
+iMkYL+yQK1JqNXDJwr+eW3+iWptUXnyRCnGBrYMAvqw=
+</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>acp-web.sunet.se</ds:KeyName>
+        <ds:KeyName>https://acp-web.sunet.se/shibboleth</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=acp-web.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKkN4aqE4O7tMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFjcC13ZWIuc3VuZXQuc2UwHhcNMDkwNjE3MTAwNTA1WhcNMTkwNjE1MTAw
+NTA1WjAbMRkwFwYDVQQDExBhY3Atd2ViLnN1bmV0LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA3iWXh1+ub5i8ZOypk7syIpndivWpp4jbcMYpmiEX
+q9Jym97j7x9WXc0vNrmKkccoUcWU1FgoiiXso6vhdgzKkqrcBIzc/YJpphN5K3tt
+pVabdgV9TG6PJ0Q6k07bvZew9yEhpXDE3gfKLOFAKeSUILHGc2FBU32EuBqVt/sn
+zBleOEBb3tiIB9/YCZS2A6wtnvzGY1mUX27Vyv2SH6Bx/GlmWuTJRrv01avrldfv
+3CiFrCeeAfLfnljfy4WbpszzlqBQvaZFBaBRtg1AgmFNkryTCm5yO2BrM3NyurN/
+K/Uc/YBZ8thxQPSEeUVWHCStXTQGLREYwJKZMfp4yFhzeQIDAQABo2MwYTBABgNV
+HREEOTA3ghBhY3Atd2ViLnN1bmV0LnNlhiNodHRwczovL2FjcC13ZWIuc3VuZXQu
+c2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUmtnePgSQNSvDZIox3d5mG/+AJb8wDQYJ
+KoZIhvcNAQEFBQADggEBAIaEDBm1eN9o7j0cQBQQNMh1FJFX2h1EklGj4YgXbqjj
+By3duIzXVAut+z4VtCTGx2CjQ1YcmSqWvx7+XFY0xEnmuAMUw8rdp0OR2Sk0iU4/
+BZt5125JOtJRRVJIDz4n9jbf6NNUsP4+HA0ukqyHDrTD0+30IV48MaWxR7HdPpyE
+bCMK0FZIQYm6d3zSgZW6ofsx24AonFZBtJBCQZxdInvqg2eYemOUh37vEBxbjWqE
+51pFWLbVUit84wy8eG3E28OPa64gc/VNk1XEj1ILLzXFV59XuZG2jzjB9xCyPmHW
+iMkYL+yQK1JqNXDJwr+eW3+iWptUXnyRCnGBrYMAvqw=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-test.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect-test.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-test.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-test.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-test.sunet.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect-test.sunet.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-test.sunet.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-test.sunet.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-test.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://connect-test.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-test.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect-test.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect-test.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect-test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>