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, 71 deletions

diff --git a/swamid-1.0/converis.info-shibboleth.xml b/swamid-1.0/converis.info-shibboleth.xml
deleted file mode 100644
index f8ddc1cd..00000000
--- a/swamid-1.0/converis.info-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://converis.info/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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>converis.info</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=converis@avedas.com,CN=converis.info,O=Avedas AG,L=Kar,ST=Bad,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIICaTCCAdICCQCLAbSDwUzlcTANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJE
-RTEMMAoGA1UECBMDQmFkMQwwCgYDVQQHEwNLYXIxEjAQBgNVBAoTCUF2ZWRhcyBB
-RzEWMBQGA1UEAxMNY29udmVyaXMuaW5mbzEiMCAGCSqGSIb3DQEJARYTY29udmVy
-aXNAYXZlZGFzLmNvbTAeFw0wOTA2MzAxMzI3MzlaFw0xMDA2MzAxMzI3MzlaMHkx
-CzAJBgNVBAYTAkRFMQwwCgYDVQQIEwNCYWQxDDAKBgNVBAcTA0thcjESMBAGA1UE
-ChMJQXZlZGFzIEFHMRYwFAYDVQQDEw1jb252ZXJpcy5pbmZvMSIwIAYJKoZIhvcN
-AQkBFhNjb252ZXJpc0BhdmVkYXMuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQC0AXsGnmd4Ue0YGctAeKBjrRxENIszZj2NjzEZ5hjGXwsvgHExBYejynR4
-x0YRlF7kVg+hkZ5jIK+t3iIDLmUkRBlMZSbkQ0EYUBHvLXECtxggRZFoFEMssB20
-Dm4F2I0bK51/ip6KZpltX81Zo44RpRjconBMc0FUZwjNYM2JUwIDAQABMA0GCSqG
-SIb3DQEBBQUAA4GBAIs+aQEHMnmVo8jm8NpzVYpPCN3/27F5IGtS0xgduAttJnYX
-lXi4upRjGaljdEqtTicQzpuZVZTnyik5KscVuSU4rtI5u1b7ybf6oL1xKiqkN7m1
-u7Xr9dYOqLXYBTCx/0NY5C+RF+dq2CYmY8fL/TILzmVGaZhXKzEYKIAPiKv3
-</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>converis.info</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=converis@avedas.com,CN=converis.info,O=Avedas AG,L=Kar,ST=Bad,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIICaTCCAdICCQCLAbSDwUzlcTANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJE
-RTEMMAoGA1UECBMDQmFkMQwwCgYDVQQHEwNLYXIxEjAQBgNVBAoTCUF2ZWRhcyBB
-RzEWMBQGA1UEAxMNY29udmVyaXMuaW5mbzEiMCAGCSqGSIb3DQEJARYTY29udmVy
-aXNAYXZlZGFzLmNvbTAeFw0wOTA2MzAxMzI3MzlaFw0xMDA2MzAxMzI3MzlaMHkx
-CzAJBgNVBAYTAkRFMQwwCgYDVQQIEwNCYWQxDDAKBgNVBAcTA0thcjESMBAGA1UE
-ChMJQXZlZGFzIEFHMRYwFAYDVQQDEw1jb252ZXJpcy5pbmZvMSIwIAYJKoZIhvcN
-AQkBFhNjb252ZXJpc0BhdmVkYXMuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQC0AXsGnmd4Ue0YGctAeKBjrRxENIszZj2NjzEZ5hjGXwsvgHExBYejynR4
-x0YRlF7kVg+hkZ5jIK+t3iIDLmUkRBlMZSbkQ0EYUBHvLXECtxggRZFoFEMssB20
-Dm4F2I0bK51/ip6KZpltX81Zo44RpRjconBMc0FUZwjNYM2JUwIDAQABMA0GCSqG
-SIb3DQEBBQUAA4GBAIs+aQEHMnmVo8jm8NpzVYpPCN3/27F5IGtS0xgduAttJnYX
-lXi4upRjGaljdEqtTicQzpuZVZTnyik5KscVuSU4rtI5u1b7ybf6oL1xKiqkN7m1
-u7Xr9dYOqLXYBTCx/0NY5C+RF+dq2CYmY8fL/TILzmVGaZhXKzEYKIAPiKv3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://converis.info/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://converis.info/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://converis.info/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://converis.info/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://converis.info/Shibboleth.sso/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://converis.info/Shibboleth.sso/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://converis.info/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://converis.info/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://converis.info/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://converis.info/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://converis.info/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://converis.info/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://converis.info/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://converis.info/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>