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/meta.eduroam.se-shibboleth.xml b/swamid-2.0/meta.eduroam.se-shibboleth.xml
new file mode 100644
index 00000000..c1ad7c52
--- /dev/null
+++ b/swamid-2.0/meta.eduroam.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://meta.eduroam.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://meta.eduroam.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>meta.eduroam.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=meta.eduroam.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDBTCCAe2gAwIBAgIJAPh6o9VnEARbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD21ldGEuZWR1cm9hbS5zZTAeFw0xMTEwMDcxNDM5MDBaFw0yMTEwMDQxNDM5
+MDBaMBoxGDAWBgNVBAMTD21ldGEuZWR1cm9hbS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANZ98HMQtCgIEsR8nwsnLFK0THbzS/mBg5RZLn6N72Ev
+Lh1m/IjUEb6biqsRIaq3e377tABcvgD4UnCFi5yX6DQvwV6U46G4CJ6M4ilOAM01
+KWNhcX3JNUo2/vczWX4dSj3/u1uBc9DwqBdkCNeOBluzQuYJtIOd7bb3SBGomDbP
+cwwzk4RbUR4D/6i14+zLhivx6sFcFxLzZw3cyb8+bmlHwNdoyZYpXJpwXVLc1iFI
+650ZXw8jUNg7XZHqKEnnzIIjNmo3NwywBosLDUmksjNJlftvHBAVWo2lKgUffS/z
+8gfRUT10NBJGVasy84cm60R+scuvBLtIxxHezUJO2cMCAwEAAaNOMEwwKwYDVR0R
+BCQwIoIPbWV0YS5lZHVyb2FtLnNlhg9tZXRhLmVkdXJvYW0uc2UwHQYDVR0OBBYE
+FJdh5hCOYUWIC7Ftaflm0xXkfwaYMA0GCSqGSIb3DQEBBQUAA4IBAQAopSB0Jj6G
+7nHlsblCirgCvFwvIEoKxyBLCsdjhzG6YdwzPPAKEnHBsrx02CNesHe1i8ksTlRK
+8KUEmf+L2PG0LXZNeYO02W+3mr18MOxt0z6f4QIAp1tpsDJkoERuEVVQOcthRA/J
+JAF6/j66o21JsCuXnrPmjCVRS8xtxRIeJ7AitKIVQOcYVsHafw0QbHgz1t+uWI0U
+7OnL+DyOpCQ7eiqwdYOwcWjOoR/McIMzQ0oTIl03Gqe1aRzuOPkszANfNXhbWtKw
+oc1+nqi2B03IRK/9s4QsOZVrcdczbrq97zE8pZcHVCzwgD9L3pWIYNY1WGE7qwTx
+VHwj8+XpYqMH
+</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>meta.eduroam.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=meta.eduroam.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDBTCCAe2gAwIBAgIJAPh6o9VnEARbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD21ldGEuZWR1cm9hbS5zZTAeFw0xMTEwMDcxNDM5MDBaFw0yMTEwMDQxNDM5
+MDBaMBoxGDAWBgNVBAMTD21ldGEuZWR1cm9hbS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANZ98HMQtCgIEsR8nwsnLFK0THbzS/mBg5RZLn6N72Ev
+Lh1m/IjUEb6biqsRIaq3e377tABcvgD4UnCFi5yX6DQvwV6U46G4CJ6M4ilOAM01
+KWNhcX3JNUo2/vczWX4dSj3/u1uBc9DwqBdkCNeOBluzQuYJtIOd7bb3SBGomDbP
+cwwzk4RbUR4D/6i14+zLhivx6sFcFxLzZw3cyb8+bmlHwNdoyZYpXJpwXVLc1iFI
+650ZXw8jUNg7XZHqKEnnzIIjNmo3NwywBosLDUmksjNJlftvHBAVWo2lKgUffS/z
+8gfRUT10NBJGVasy84cm60R+scuvBLtIxxHezUJO2cMCAwEAAaNOMEwwKwYDVR0R
+BCQwIoIPbWV0YS5lZHVyb2FtLnNlhg9tZXRhLmVkdXJvYW0uc2UwHQYDVR0OBBYE
+FJdh5hCOYUWIC7Ftaflm0xXkfwaYMA0GCSqGSIb3DQEBBQUAA4IBAQAopSB0Jj6G
+7nHlsblCirgCvFwvIEoKxyBLCsdjhzG6YdwzPPAKEnHBsrx02CNesHe1i8ksTlRK
+8KUEmf+L2PG0LXZNeYO02W+3mr18MOxt0z6f4QIAp1tpsDJkoERuEVVQOcthRA/J
+JAF6/j66o21JsCuXnrPmjCVRS8xtxRIeJ7AitKIVQOcYVsHafw0QbHgz1t+uWI0U
+7OnL+DyOpCQ7eiqwdYOwcWjOoR/McIMzQ0oTIl03Gqe1aRzuOPkszANfNXhbWtKw
+oc1+nqi2B03IRK/9s4QsOZVrcdczbrq97zE8pZcHVCzwgD9L3pWIYNY1WGE7qwTx
+VHwj8+XpYqMH
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.eduroam.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meta.eduroam.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.eduroam.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meta.eduroam.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meta.eduroam.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>