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

diff --git a/swamid-2.0/play.sunet.se-shibboleth.xml b/swamid-2.0/play.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..e8e303fd
--- /dev/null
+++ b/swamid-2.0/play.sunet.se-shibboleth.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.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/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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://play.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>play.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=play.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAMNIXyGN4YjRMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMTDXBsYXkuc3VuZXQuc2UwHhcNMTExMDE2MDQyMDEwWhcNMjExMDEzMDQyMDEw
+WjAYMRYwFAYDVQQDEw1wbGF5LnN1bmV0LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAzs08Z/ncSkirmtP8gV/mP7PpR0UkVcArRbZHMzg/5JIX2Nkl
+MmSuywePMjninOvnw5/8imgPRW6eEit33XuBe6v3cZC3lDVY7KN8UWzQ6aWehW5g
+xIkmoSyxfQZEVMjw4a0eBnsQrvnQ4zs3IsR0NeZYChGfe9tOGVbPuzVfbAg9hI1E
+uIH+x6ubD4VjmU3S9WVsHCx8sYfhNVjtWtmWXRw7W07x57ni7zlWqt0DY83KTV7R
+XTn/EuncilZULBO2uqwsR5OHRUdGf2vShxwA1H43syuSrPsaGYQkDiJ7nOWHt+h0
+he9KR/ef+bstEjOryet4U6JdtsWTJpozekuEhwIDAQABo0owSDAnBgNVHREEIDAe
+gg1wbGF5LnN1bmV0LnNlhg1wbGF5LnN1bmV0LnNlMB0GA1UdDgQWBBSHNGjJjfq8
+1/hBw9vR5IxBhm5dgjANBgkqhkiG9w0BAQUFAAOCAQEAUTXIFeSv15+/RVHSE2vL
+HEcOGNhu3ppi12+enIko5hM+84R2RHZxx3WhGvd03tXjjIy9lk0odCzT861ct0dj
+HUlGzUtCKroE9wuAnyx1u1JEj+sCpTy1dXhCUldWM+sACbf5m9xbou8LHzG1xSfU
+nsReYgzf872TGKmmMtBupFctENltdZ5+ulKaM8/+orb38Srz9KP2svXXxOWb4uNS
+F6bdA0sNcWSObKJXHdHPZAeieXu0bP7tlY8+B/jF9SW/I3q0k4CIEsDjcUMozVVo
+4UieoIWb5B8xpklpbDmSLHc0R3Cq/YvpJgvz4RXnf6GlQ9pXr6AhMNkpMcroabsP
+wg==
+</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>play.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=play.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAMNIXyGN4YjRMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMTDXBsYXkuc3VuZXQuc2UwHhcNMTExMDE2MDQyMDEwWhcNMjExMDEzMDQyMDEw
+WjAYMRYwFAYDVQQDEw1wbGF5LnN1bmV0LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAzs08Z/ncSkirmtP8gV/mP7PpR0UkVcArRbZHMzg/5JIX2Nkl
+MmSuywePMjninOvnw5/8imgPRW6eEit33XuBe6v3cZC3lDVY7KN8UWzQ6aWehW5g
+xIkmoSyxfQZEVMjw4a0eBnsQrvnQ4zs3IsR0NeZYChGfe9tOGVbPuzVfbAg9hI1E
+uIH+x6ubD4VjmU3S9WVsHCx8sYfhNVjtWtmWXRw7W07x57ni7zlWqt0DY83KTV7R
+XTn/EuncilZULBO2uqwsR5OHRUdGf2vShxwA1H43syuSrPsaGYQkDiJ7nOWHt+h0
+he9KR/ef+bstEjOryet4U6JdtsWTJpozekuEhwIDAQABo0owSDAnBgNVHREEIDAe
+gg1wbGF5LnN1bmV0LnNlhg1wbGF5LnN1bmV0LnNlMB0GA1UdDgQWBBSHNGjJjfq8
+1/hBw9vR5IxBhm5dgjANBgkqhkiG9w0BAQUFAAOCAQEAUTXIFeSv15+/RVHSE2vL
+HEcOGNhu3ppi12+enIko5hM+84R2RHZxx3WhGvd03tXjjIy9lk0odCzT861ct0dj
+HUlGzUtCKroE9wuAnyx1u1JEj+sCpTy1dXhCUldWM+sACbf5m9xbou8LHzG1xSfU
+nsReYgzf872TGKmmMtBupFctENltdZ5+ulKaM8/+orb38Srz9KP2svXXxOWb4uNS
+F6bdA0sNcWSObKJXHdHPZAeieXu0bP7tlY8+B/jF9SW/I3q0k4CIEsDjcUMozVVo
+4UieoIWb5B8xpklpbDmSLHc0R3Cq/YvpJgvz4RXnf6GlQ9pXr6AhMNkpMcroabsP
+wg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.sunet.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.sunet.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.sunet.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.sunet.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://play.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://play.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>