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

diff --git a/swamid-2.0/idp-fre-1.eduid.se-idp.xml b/swamid-2.0/idp-fre-1.eduid.se-idp.xml
new file mode 100644
index 00000000..c0d390a5
--- /dev/null
+++ b/swamid-2.0/idp-fre-1.eduid.se-idp.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp-fre-1.eduid.se/idp.xml">
+  <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns1:Scope regexp="false">eduid.se</ns1:Scope>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>MIICtjCCAZ4CCQCcz/piVprfwDANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJp
+ZHAtZnJlLTEuZWR1aWQuc2UwHhcNMTMwNDA0MTM0NDQ0WhcNMjMwNDAyMTM0NDQ0
+WjAdMRswGQYDVQQDExJpZHAtZnJlLTEuZWR1aWQuc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDZYoiNY7wsKOg0HuPEIOmFt4sNOPANo1WXOEAi4gdr
+Ov5RyA+j4c5qtxgX30eT1mSS+xxd1UYy78jIR42QnvmwZRAw3XGzCT4u+41u+4KP
+ZuzsNmueFruQ/FUj5YvYJdo9LKDXnhqj7GrOYwVKRx3TtV+76IXbY+OQF5mNXNdn
+qFepNt6ukBGqdWjEi6fslbjVwCkRwN9gFm/f0xshITr79MEsmEbm97n8+TxNWx9o
+Vx2cIGHVKur+iBR0ntY71jXCGb/0drVlogMluXUssMV9fZSP0W1HnlI2vNQrVA6p
+0hzRsi+kGGAXn0/u1rhfJ7G6/Tz43OqhVqH5BeKs+0v/AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBANfLG7xG2d2bc8ib/XCMly48KEPYqNXIeDIHPR8MpEZrdCph4TUz
+Y96pEbhM3Onn7iZTAqk7QUfVzj3qH35H8FG6XJuUlpeo11c94dsS6+euamdf+9qZ
+ZP0uQyvYepSdQWCeBljDUxp/u6h9NdKpcwK9AvfBVCTNR0gdFNfADi1QtdAtW3Wx
+N4TxcEV9YT6QopkdXKR+Vx+Bp8iM3ij+epA5M87hrrHUFd9s324x2ktl1cx0znS/
+6VT121qX752B4lzzych/glgqUaSZe6/iFq2LYxK5qPZAViEy6by4lYghzdKPjAvu
+97NSksdDvmueTb8t8S2G2CqPc3Wus+M6yQw=
+</ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>MIICtjCCAZ4CCQCcz/piVprfwDANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJp
+ZHAtZnJlLTEuZWR1aWQuc2UwHhcNMTMwNDA0MTM0NDQ0WhcNMjMwNDAyMTM0NDQ0
+WjAdMRswGQYDVQQDExJpZHAtZnJlLTEuZWR1aWQuc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDZYoiNY7wsKOg0HuPEIOmFt4sNOPANo1WXOEAi4gdr
+Ov5RyA+j4c5qtxgX30eT1mSS+xxd1UYy78jIR42QnvmwZRAw3XGzCT4u+41u+4KP
+ZuzsNmueFruQ/FUj5YvYJdo9LKDXnhqj7GrOYwVKRx3TtV+76IXbY+OQF5mNXNdn
+qFepNt6ukBGqdWjEi6fslbjVwCkRwN9gFm/f0xshITr79MEsmEbm97n8+TxNWx9o
+Vx2cIGHVKur+iBR0ntY71jXCGb/0drVlogMluXUssMV9fZSP0W1HnlI2vNQrVA6p
+0hzRsi+kGGAXn0/u1rhfJ7G6/Tz43OqhVqH5BeKs+0v/AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBANfLG7xG2d2bc8ib/XCMly48KEPYqNXIeDIHPR8MpEZrdCph4TUz
+Y96pEbhM3Onn7iZTAqk7QUfVzj3qH35H8FG6XJuUlpeo11c94dsS6+euamdf+9qZ
+ZP0uQyvYepSdQWCeBljDUxp/u6h9NdKpcwK9AvfBVCTNR0gdFNfADi1QtdAtW3Wx
+N4TxcEV9YT6QopkdXKR+Vx+Bp8iM3ij+epA5M87hrrHUFd9s324x2ktl1cx0znS/
+6VT121qX752B4lzzych/glgqUaSZe6/iFq2LYxK5qPZAViEy6by4lYghzdKPjAvu
+97NSksdDvmueTb8t8S2G2CqPc3Wus+M6yQw=
+</ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-fre-1.eduid.se/slo/soap"/>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-fre-1.eduid.se/slo/post"/>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-fre-1.eduid.se/slo/redirect"/>
+    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
+    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-fre-1.eduid.se/sso/redirect"/>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-fre-1.eduid.se/sso/post"/>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-fre-1.eduid.se/sso/art"/>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-fre-1.eduid.se/sso/ecp"/>
+  </ns0:IDPSSODescriptor>
+  <ns0:Organization>
+    <ns0:OrganizationName xml:lang="en">eduID TEST</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="en">eduID TEST</ns0:OrganizationDisplayName>
+    <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
+  </ns0:Organization>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:GivenName>eduID</ns0:GivenName>
+    <ns0:SurName>developers</ns0:SurName>
+    <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
+  </ns0:ContactPerson>
+  <ns0:ContactPerson contactType="support">
+    <ns0:GivenName>Support</ns0:GivenName>
+    <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
+  </ns0:ContactPerson>
+</ns0:EntityDescriptor>