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

diff --git a/swamid-2.0/connect-stable.sunet.se-shibboleth.xml b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..476f4b44
--- /dev/null
+++ b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-stable.sunet.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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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://connect-stable.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <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://connect-stable.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <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://connect-stable.sunet.se/Shibboleth.sso/DS/kalmar2" index="3"/>
+      <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://connect-stable.sunet.se/Shibboleth.sso/DS/nordu.net" index="4"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect-stable.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect-stable.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAJ+bOx8RXj3iMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2Nvbm5lY3Qtc3RhYmxlLnN1bmV0LnNlMB4XDTEyMTEwMTE0MTEzNFoXDTIy
+MTAzMDE0MTEzNFowIjEgMB4GA1UEAxMXY29ubmVjdC1zdGFibGUuc3VuZXQuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOuf57LwczW6o8YEv8IlZe
+6mWurJUD3iDMS1jyt9/HxUpHcQfMVrHmei7aBLzYiQMON7sYSi0pQ6/EtFMpoaeN
+WYIAEXdXVfhGVCte9mfTmLEtgxsELyK+YofXwTXkNX1VzBK3z9qRyV6BBqzgA6Zu
+4BkTabmubG4qdwHf+TJWfwJ9QkwOIuy+j+KCXELW8Cgy1q8WUvocpTfEXzILEHL8
+kel1ej8sclf0cdHjYLJpPSaBvJ+2DmvZgVLdZcWxSVLbwoMOFq4g5spFT8bZxemY
+mG185UwcQtFK3VoXdfiBn28HChMgdSxSWvt8CWj3dK49i6/eKaq/0Dam3SPHbJIN
+AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2Nvbm5lY3Qtc3RhYmxlLnN1bmV0LnNlMB0G
+A1UdDgQWBBQW0PGcUIDR4qgsERc7Jy1PpfkPujANBgkqhkiG9w0BAQUFAAOCAQEA
+Q7MY+AQRal0ZYIvqjw36YQZyBCGADzI/v5K1xMxGiPAj+WiSXRIHozVFRL8lqStO
+2zh68/yWkEl4SxyU0dQ+/YpZjolRMVNPxYaUd5YhhvpS4wOwwERhuMo1KOqO/04t
+TfN3/ASiYN5qhxO7DoJy0/jJwhy6QNE8Ey3FU4t2aFo9/FcUIE6huoBqLWMP5M4N
+Xc+d9o3tWDW8EzEbxsyZhpin7qczxWHl5MeztPY3kvr4M6lVswf8KkGUxgdy1a5W
+Epnud0wADmhSb4J6hSbUreM6gyvYvMNI4Tzv5xxL/+CTuIv/Ys+IAKh/g2tT3ct0
+SgXS3Q4K3pF+qwGrb3INKQ==
+</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>connect-stable.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect-stable.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAJ+bOx8RXj3iMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2Nvbm5lY3Qtc3RhYmxlLnN1bmV0LnNlMB4XDTEyMTEwMTE0MTEzNFoXDTIy
+MTAzMDE0MTEzNFowIjEgMB4GA1UEAxMXY29ubmVjdC1zdGFibGUuc3VuZXQuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOuf57LwczW6o8YEv8IlZe
+6mWurJUD3iDMS1jyt9/HxUpHcQfMVrHmei7aBLzYiQMON7sYSi0pQ6/EtFMpoaeN
+WYIAEXdXVfhGVCte9mfTmLEtgxsELyK+YofXwTXkNX1VzBK3z9qRyV6BBqzgA6Zu
+4BkTabmubG4qdwHf+TJWfwJ9QkwOIuy+j+KCXELW8Cgy1q8WUvocpTfEXzILEHL8
+kel1ej8sclf0cdHjYLJpPSaBvJ+2DmvZgVLdZcWxSVLbwoMOFq4g5spFT8bZxemY
+mG185UwcQtFK3VoXdfiBn28HChMgdSxSWvt8CWj3dK49i6/eKaq/0Dam3SPHbJIN
+AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2Nvbm5lY3Qtc3RhYmxlLnN1bmV0LnNlMB0G
+A1UdDgQWBBQW0PGcUIDR4qgsERc7Jy1PpfkPujANBgkqhkiG9w0BAQUFAAOCAQEA
+Q7MY+AQRal0ZYIvqjw36YQZyBCGADzI/v5K1xMxGiPAj+WiSXRIHozVFRL8lqStO
+2zh68/yWkEl4SxyU0dQ+/YpZjolRMVNPxYaUd5YhhvpS4wOwwERhuMo1KOqO/04t
+TfN3/ASiYN5qhxO7DoJy0/jJwhy6QNE8Ey3FU4t2aFo9/FcUIE6huoBqLWMP5M4N
+Xc+d9o3tWDW8EzEbxsyZhpin7qczxWHl5MeztPY3kvr4M6lVswf8KkGUxgdy1a5W
+Epnud0wADmhSb4J6hSbUreM6gyvYvMNI4Tzv5xxL/+CTuIv/Ys+IAKh/g2tT3ct0
+SgXS3Q4K3pF+qwGrb3INKQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-stable.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-stable.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect-stable.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-stable.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-stable.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-stable.sunet.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect-stable.sunet.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-stable.sunet.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-stable.sunet.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-stable.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://connect-stable.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-stable.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect-stable.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect-stable.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect-stable.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">SUNET E-Meeting Service (stable)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (stable)</md:ServiceDescription>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet NOC</md:Company>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>