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

diff --git a/swamid-1.0/amiga.kib.ki.se-shibboleth.xml b/swamid-1.0/amiga.kib.ki.se-shibboleth.xml
deleted file mode 100644
index e78b7388..00000000
--- a/swamid-1.0/amiga.kib.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://amiga.kib.ki.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/hei-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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://amiga.kib.ki.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>cbs-vamiga2.cb.ad</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cbs-vamiga2.cb.ad</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAI/jlsIaImbuMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWNicy12YW1pZ2EyLmNiLmFkMB4XDTEyMDEyNTE1MDcyMFoXDTIyMDEyMjE1
-MDcyMFowHDEaMBgGA1UEAxMRY2JzLXZhbWlnYTIuY2IuYWQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQD8hH4aZW5mwrL2q4HmRewIhpwyv6Y/cp1m2jvp
-J72Q1Hm1hA7lvz36BbDvpLj6nY03t4KtPIRqMfsdM7olfW9aqLuFlrGCwW5jucSt
-2q1hIMyD6k+fAookYXzEnOcR2s4UqViWqDWulTnIhSTZmgS+CoMqEfoGzPC3m5X5
-SzTbismoWnnzRujfdUj0nLrCEU7gluZH1ag737ISR1qolNpyvS/hazMmGxFKEePW
-WGnUp4/enpdqIlYNqDX0FBr+/RXrLM7GloIj3s9J83oMWXLTUiCTwPyW0Yh0UySd
-cxfVHOKUe4g6n2MbC8sotatKD7Vg8hPZwlMF1mDLYZxKST/jAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEWNicy12YW1pZ2EyLmNiLmFkMB0GA1UdDgQWBBQyr0RxfgrJY6Ej
-PBJk8DqV6LoXdjANBgkqhkiG9w0BAQUFAAOCAQEAYnfKqiA3WIA9m/gcbsnFHs+Y
-wc1Qpud5avz9PIj9i6bbz/qEtKNUzg4bw3Mp8y0taNyJ+jpR/QCMGoSF+PcyjbS8
-eNcQWwcoSrukwSGNRtU9JUrVekOqi8pq8I2lLJXRMyDHrQ8hQcIydZRQS/Zsxy9E
-YP5oUY2cwkBfl2v6ipoF5FYQRwcfVYTTQD5zZSS74OQWpQU6qXus34JTf/DVNzeT
-gL6webRP5OqizXYZlJZKKOVemeUHBcc/PGI1bq1na8jeAZ9jw+p7zHJWZTZPl9iL
-PHvIC/GJm2biV6LD6eLIriuNXZ5mcocCsCScdEpNLUp2+0+V+tE3Vj1c1jKmfA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amiga.kib.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amiga.kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://amiga.kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amiga.kib.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amiga.kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://amiga.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>