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

diff --git a/swamid-2.0-obsolete/ecsidp.antagning.se-ecs-idp.xml b/swamid-2.0-obsolete/ecsidp.antagning.se-ecs-idp.xml
new file mode 100644
index 00000000..ddc03c28
--- /dev/null
+++ b/swamid-2.0-obsolete/ecsidp.antagning.se-ecs-idp.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ecsidp.antagning.se/ecs-idp">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">NyA Expert-IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NyA Expert-IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Expert-användare i NyA (UHR)</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider för Expert-användare i NyA (UHR)</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOwDbZrbG8naMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE2Vjc2lkcC5hbnRhZ25pbmcuc2UwHhcNMTMwMjA0MTMyODU0WhcNMjMwMjAyMTMyODU0WjAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPBW48pxe0oFiQ734yuWdFf/9PX1j4k0oZdpn+Rxijxa+6vUsw9wwYW5d8c/md146bJBHQxPOZU7KcIkUvtal4sCAwEAAaN/MH0wHQYDVR0OBBYEFJEfx9uenj5vD0UI0K79rIeRIdqIME4GA1UdIwRHMEWAFJEfx9uenj5vD0UI0K79rIeRIdqIoSKkIDAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlggkA7ANtmtsbydowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMHpR+JNUb++fOsiuksO9gEfSpXcZBY8WgEaSH2i76CV7IFtB08uW4TgEkIpMz0lyOw+lhz0f/qkkeDF4Gha4v4=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ecsidp.antagning.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.antagning.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOwDbZrbG8naMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE2Vjc2lkcC5hbnRhZ25pbmcuc2UwHhcNMTMwMjA0MTMyODU0WhcNMjMwMjAyMTMyODU0WjAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPBW48pxe0oFiQ734yuWdFf/9PX1j4k0oZdpn+Rxijxa+6vUsw9wwYW5d8c/md146bJBHQxPOZU7KcIkUvtal4sCAwEAAaN/MH0wHQYDVR0OBBYEFJEfx9uenj5vD0UI0K79rIeRIdqIME4GA1UdIwRHMEWAFJEfx9uenj5vD0UI0K79rIeRIdqIoSKkIDAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlggkA7ANtmtsbydowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMHpR+JNUb++fOsiuksO9gEfSpXcZBY8WgEaSH2i76CV7IFtB08uW4TgEkIpMz0lyOw+lhz0f/qkkeDF4Gha4v4=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">UHR</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">NyA Expert-IdP</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">NyA Expert-IdP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Swedish Council for Higher Education</Company>
+    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>