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/www4.genuinetext.com-shibboleth.xml b/swamid-2.0/www4.genuinetext.com-shibboleth.xml
new file mode 100644
index 00000000..8f6d8288
--- /dev/null
+++ b/swamid-2.0/www4.genuinetext.com-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://www4.genuinetext.com/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/eu-adequate-protection</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://www4.genuinetext.com/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www4.genuinetext.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www4.genuinetext.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAKekqkqvTaFGMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHd3dzQuZ2VudWluZXRleHQuY29tMB4XDTEwMTEwMTEzMzMyM1oXDTIwMTAy
+OTEzMzMyM1owHzEdMBsGA1UEAxMUd3d3NC5nZW51aW5ldGV4dC5jb20wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDADxHC/Xm6WdlyLSPS754suXc2FSqo
+xnfXXhnAE7ZfhVhD8PIanswRPq5YCAZm3MVBZUsV5cI/nlXNBOuyiv4+P5KG2fIi
+MIEaDoWSa9UCnQ8xr/nF1towuhlTkJ5FX/n8P3jIw6/crilOzD+HmL94iiCSAG87
+jU/H7fhnm10KMjfPpMthD7PxQLU0u8J+dJ0kfzRzsv+ico7v4yzTSZUOVkLiYl2z
+hw4WKWz6px2sdNpBkBGjw+BuOpVyuTHZTw8Wf/b4FWhY4WvIBM6FonH7bvIYUdgz
+sgYJEW/cYPiP590QKOQX4yPv8UWZT7QqimI5r7UVZAlwmU/nnswnIg0VAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHd3dzQuZ2VudWluZXRleHQuY29tMB0GA1UdDgQWBBSG
+3sJULU8LbAUhqhTxd0Lej7QzGzANBgkqhkiG9w0BAQUFAAOCAQEAl+pmNhY8cPox
+x7vEvy0q1VXWbuu3BMauQs53Zv6NpLmmcXpGaPfNAKpKduYUHBCqUHeQBDyFppdz
+M/YhperS0/zQu9nwi5MKINx1/+hUG7g8WbR7FzlMAVuYByMDJSi3Ofiz57PHmjPr
+eCulUcFlFMsSpozk2vuTt5Mou92Cxv+JHvh5rvdjQf68xr1K7rS/n40igixsUwh7
+B1WDIB8S6ng+7XqUxnVH1XXfZI9JslSp1f2eNFx/3ajYGotewmVquDS5Jg6IYSJL
+kIbZGzwQ9C6RneoNDIirnfYZogu3XFNwix8uFTvl9EI4rxvJZjH5WFWr/1rWcmgo
+iMZC8zXUhA==
+</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>www4.genuinetext.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www4.genuinetext.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAKekqkqvTaFGMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHd3dzQuZ2VudWluZXRleHQuY29tMB4XDTEwMTEwMTEzMzMyM1oXDTIwMTAy
+OTEzMzMyM1owHzEdMBsGA1UEAxMUd3d3NC5nZW51aW5ldGV4dC5jb20wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDADxHC/Xm6WdlyLSPS754suXc2FSqo
+xnfXXhnAE7ZfhVhD8PIanswRPq5YCAZm3MVBZUsV5cI/nlXNBOuyiv4+P5KG2fIi
+MIEaDoWSa9UCnQ8xr/nF1towuhlTkJ5FX/n8P3jIw6/crilOzD+HmL94iiCSAG87
+jU/H7fhnm10KMjfPpMthD7PxQLU0u8J+dJ0kfzRzsv+ico7v4yzTSZUOVkLiYl2z
+hw4WKWz6px2sdNpBkBGjw+BuOpVyuTHZTw8Wf/b4FWhY4WvIBM6FonH7bvIYUdgz
+sgYJEW/cYPiP590QKOQX4yPv8UWZT7QqimI5r7UVZAlwmU/nnswnIg0VAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHd3dzQuZ2VudWluZXRleHQuY29tMB0GA1UdDgQWBBSG
+3sJULU8LbAUhqhTxd0Lej7QzGzANBgkqhkiG9w0BAQUFAAOCAQEAl+pmNhY8cPox
+x7vEvy0q1VXWbuu3BMauQs53Zv6NpLmmcXpGaPfNAKpKduYUHBCqUHeQBDyFppdz
+M/YhperS0/zQu9nwi5MKINx1/+hUG7g8WbR7FzlMAVuYByMDJSi3Ofiz57PHmjPr
+eCulUcFlFMsSpozk2vuTt5Mou92Cxv+JHvh5rvdjQf68xr1K7rS/n40igixsUwh7
+B1WDIB8S6ng+7XqUxnVH1XXfZI9JslSp1f2eNFx/3ajYGotewmVquDS5Jg6IYSJL
+kIbZGzwQ9C6RneoNDIirnfYZogu3XFNwix8uFTvl9EI4rxvJZjH5WFWr/1rWcmgo
+iMZC8zXUhA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www4.genuinetext.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www4.genuinetext.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www4.genuinetext.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www4.genuinetext.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www4.genuinetext.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www4.genuinetext.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www4.genuinetext.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www4.genuinetext.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www4.genuinetext.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www4.genuinetext.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www4.genuinetext.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www4.genuinetext.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www4.genuinetext.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www4.genuinetext.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www4.genuinetext.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>