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

diff --git a/swamid-2.0/play.liu.se-shibboleth.xml b/swamid-2.0/play.liu.se-shibboleth.xml
new file mode 100644
index 00000000..e9d5fb58
--- /dev/null
+++ b/swamid-2.0/play.liu.se-shibboleth.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.liu.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.liu.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.liu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=play.liu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAKe3B+KUVP3+MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3BsYXkubGl1LnNlMB4XDTExMTIwNjEyMTk1OVoXDTIxMTIwMzEyMTk1OVow
+FjEUMBIGA1UEAxMLcGxheS5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC+vp3loPQsTZ0uL5qOMD6OiqrZvbtwc1yggSBWE7aZ+JCYrM9VcJQs
+3vPC9i4hf/mZDNFmvBWz8aDCXG5PpLtoVsrhYuNhetNbHyvagnl51MwK0KY5JDOk
+f5pAii8WD+88EPqdFGbLCDKQ6UpSR1hsUMudpJlmu0hdPvhVuXexRmaYPEk3vN3P
+FnmBqD4YNPTVkLrfC6OXm5EL7Q7J1DWDyowr1xAJfMlfyhSMay6DKvuE/zA8vWpp
+28kMjcoQWDFNROp6+RHlPmYBhzEmhzoxULKl3QCv/3hwvw3C70vOABBBq+xj1iRJ
+GnO5IO9HWBlUG8O1O7Ohrk+3F6tt6pY1AgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Bs
+YXkubGl1LnNlhgtwbGF5LmxpdS5zZTAdBgNVHQ4EFgQUo7pfHcTYa3XfSHE+g3l0
+p6ergSkwDQYJKoZIhvcNAQEFBQADggEBAJOjVfPaleYl/RdJDGtjdOredI0MoiJR
+XWkC5Zm0Qp28KRJoV7kGgzPCiF0M7CH6w1ZF0t1qMU+kSsIRsxLhwG+7bT8ECONx
+0c7DnZY/qZcZb3USf7h9DwaO/RMxGa+Fm76eUNQ9HurprEmaXfEQsYFYWsGj56Q8
+0fquuSogz4O1dEGjG85IV8ehGKS5JlLJsLnC0eggjYZFK954g3bRkEcLwcBDEbaa
+6QQZ52emPo6rYMFX90CxvkJwxt7GA2BHDziqi/51SUPpfWYhXtNiHioUt1D1dbNd
+Hk7Vkl5qHXdOgulvHmmaLJXl7ABXJmddzV49NpKlhS5V79JGu6bbkeA=
+</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.liu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=play.liu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAKe3B+KUVP3+MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3BsYXkubGl1LnNlMB4XDTExMTIwNjEyMTk1OVoXDTIxMTIwMzEyMTk1OVow
+FjEUMBIGA1UEAxMLcGxheS5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC+vp3loPQsTZ0uL5qOMD6OiqrZvbtwc1yggSBWE7aZ+JCYrM9VcJQs
+3vPC9i4hf/mZDNFmvBWz8aDCXG5PpLtoVsrhYuNhetNbHyvagnl51MwK0KY5JDOk
+f5pAii8WD+88EPqdFGbLCDKQ6UpSR1hsUMudpJlmu0hdPvhVuXexRmaYPEk3vN3P
+FnmBqD4YNPTVkLrfC6OXm5EL7Q7J1DWDyowr1xAJfMlfyhSMay6DKvuE/zA8vWpp
+28kMjcoQWDFNROp6+RHlPmYBhzEmhzoxULKl3QCv/3hwvw3C70vOABBBq+xj1iRJ
+GnO5IO9HWBlUG8O1O7Ohrk+3F6tt6pY1AgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Bs
+YXkubGl1LnNlhgtwbGF5LmxpdS5zZTAdBgNVHQ4EFgQUo7pfHcTYa3XfSHE+g3l0
+p6ergSkwDQYJKoZIhvcNAQEFBQADggEBAJOjVfPaleYl/RdJDGtjdOredI0MoiJR
+XWkC5Zm0Qp28KRJoV7kGgzPCiF0M7CH6w1ZF0t1qMU+kSsIRsxLhwG+7bT8ECONx
+0c7DnZY/qZcZb3USf7h9DwaO/RMxGa+Fm76eUNQ9HurprEmaXfEQsYFYWsGj56Q8
+0fquuSogz4O1dEGjG85IV8ehGKS5JlLJsLnC0eggjYZFK954g3bRkEcLwcBDEbaa
+6QQZ52emPo6rYMFX90CxvkJwxt7GA2BHDziqi/51SUPpfWYhXtNiHioUt1D1dbNd
+Hk7Vkl5qHXdOgulvHmmaLJXl7ABXJmddzV49NpKlhS5V79JGu6bbkeA=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.liu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.liu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.liu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.liu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.liu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.liu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.liu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.liu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.liu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.liu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://play.liu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.liu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://play.liu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.liu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.liu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>