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

diff --git a/swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml b/swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..cbbc8e9a
--- /dev/null
+++ b/swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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://testshib.user.uu.se/idp/shibboleth">
+  <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">user.uu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDODCCAiCgAwIBAgIVAJ/MP/fwynj0V2a6SuWq0ff5AJIdMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE3Rlc3RzaGliLnVzZXIudXUuc2UwHhcNMTEwMzA5MTAw
+OTE3WhcNMzEwMzA5MTAwOTE3WjAeMRwwGgYDVQQDExN0ZXN0c2hpYi51c2VyLnV1
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6szgtt3FMHTkikEZ
+rtOFE8j45IWdTO+LWU8/U2FUoqxCbNsezC4v4N/AU2/hhXdTyytv08Wcer/vKEUL
+lAmHjyxJfbY8JDbI5WlRqTNIE5svOeIWz2ZmuTpbgvLR6XT3V6QXptVTvmbwxvMv
+342HGuf2CWh7lJsjol/tt4DQb5OHPGIMtmmnm3TkJ4fC6DssVME9pU1P0d4dxJf4
+DLwuHoU60tbh35vjRMU9oXx094UB5HVvE52lX86BXKYKwRtSrSiqqafRz1JXwQTn
+5El0FC/VjpDjk4HSHqIA//PnIkGMKJfjdBKpeRfcs/xa4zF044IqYeiBBIDeKVvV
+sYtt0QIDAQABo20wazBKBgNVHREEQzBBghN0ZXN0c2hpYi51c2VyLnV1LnNlhipo
+dHRwczovL3Rlc3RzaGliLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFOoLZ2+a6gjtAe7HDIJr0X6UMj7KMA0GCSqGSIb3DQEBBQUAA4IBAQB3FnXh
+R7dTQFj6j+4B+DztizzR0WQNOg3zq1neO6CPVytz0UC/j/XYlQuUXZxmV0C7X6mS
+iBdhi2WqU5NqW7m+B3awKo9TZr6mnGZoLdv2I0ugMq3f+kM+PfOAGlRL41/Wihec
+entYIdNNqkgindg5H7CiF2lcKwcXwYfBfjnynmBLsfO3bD5S4bWfNsFjTdXobVcc
+75wWrC66FRW0DfUmqwXKDlLOid6wy6eyNoOoUVs90DCRgTw1rrWN7Y9uD84/axfr
+1gqh8YWIrrg9bvEUM0gO1ngrv486yKJjR/iBxSaEWqD5zQ3vrPFGBnafgBmxqEit
+c/xUut3UPRusaRjG
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testshib.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.user.uu.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://testshib.user.uu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testshib.user.uu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testshib.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testshib.user.uu.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">user.uu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDODCCAiCgAwIBAgIVAJ/MP/fwynj0V2a6SuWq0ff5AJIdMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE3Rlc3RzaGliLnVzZXIudXUuc2UwHhcNMTEwMzA5MTAw
+OTE3WhcNMzEwMzA5MTAwOTE3WjAeMRwwGgYDVQQDExN0ZXN0c2hpYi51c2VyLnV1
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6szgtt3FMHTkikEZ
+rtOFE8j45IWdTO+LWU8/U2FUoqxCbNsezC4v4N/AU2/hhXdTyytv08Wcer/vKEUL
+lAmHjyxJfbY8JDbI5WlRqTNIE5svOeIWz2ZmuTpbgvLR6XT3V6QXptVTvmbwxvMv
+342HGuf2CWh7lJsjol/tt4DQb5OHPGIMtmmnm3TkJ4fC6DssVME9pU1P0d4dxJf4
+DLwuHoU60tbh35vjRMU9oXx094UB5HVvE52lX86BXKYKwRtSrSiqqafRz1JXwQTn
+5El0FC/VjpDjk4HSHqIA//PnIkGMKJfjdBKpeRfcs/xa4zF044IqYeiBBIDeKVvV
+sYtt0QIDAQABo20wazBKBgNVHREEQzBBghN0ZXN0c2hpYi51c2VyLnV1LnNlhipo
+dHRwczovL3Rlc3RzaGliLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFOoLZ2+a6gjtAe7HDIJr0X6UMj7KMA0GCSqGSIb3DQEBBQUAA4IBAQB3FnXh
+R7dTQFj6j+4B+DztizzR0WQNOg3zq1neO6CPVytz0UC/j/XYlQuUXZxmV0C7X6mS
+iBdhi2WqU5NqW7m+B3awKo9TZr6mnGZoLdv2I0ugMq3f+kM+PfOAGlRL41/Wihec
+entYIdNNqkgindg5H7CiF2lcKwcXwYfBfjnynmBLsfO3bD5S4bWfNsFjTdXobVcc
+75wWrC66FRW0DfUmqwXKDlLOid6wy6eyNoOoUVs90DCRgTw1rrWN7Y9uD84/axfr
+1gqh8YWIrrg9bvEUM0gO1ngrv486yKJjR/iBxSaEWqD5zQ3vrPFGBnafgBmxqEit
+c/xUut3UPRusaRjG
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testshib.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.user.uu.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>
+</EntityDescriptor>