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

diff --git a/swamid-2.0/nacho.adm.gu.se-shibboleth.xml b/swamid-2.0/nacho.adm.gu.se-shibboleth.xml
new file mode 100644
index 00000000..62f3f0ce
--- /dev/null
+++ b/swamid-2.0/nacho.adm.gu.se-shibboleth.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nacho.adm.gu.se/shibboleth">
+  <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://nacho.adm.gu.se/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>nacho-pc</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nacho-pc</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC3zCCAcegAwIBAgIJANjsPUfkRN00MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+BAMTCG5hY2hvLXBjMB4XDTEwMDQxMzEzMzI1OVoXDTIwMDQxMDEzMzI1OVowEzER
+MA8GA1UEAxMIbmFjaG8tcGMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC99pEipkOSaRwbIYY/dfFIR2/COahYi+fU3qDpCmG6JbZzO3O9ybjF/sUmt1fA
+Unq+1HinEwSGDfizUoN+/NUcAG4N8juD+UL9bbYEcfx7Ly7jlGiZa3Fr3zFqxXGQ
+w+vAtnk4tKtt0kNKPXNs9oApEzGpUAj12EQBRMiKLhFPqNMo8YQ+OUqCyZMYm2Oc
+uJFj9QBN3vLCRFJJZCt7kmpfnC9M4KdMFvhzbDMixrk4qdjuUB0W7bRAiHk0Yupw
+QUZMk0kF4AJrWFliUIsNVIm3q4I0AOlAgbii5rsarDjGaRlE421K6TZxwx+0UfnQ
+G3pn+xmBV7purr0y6VmQOaZvAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG5hY2hvLXBj
+MB0GA1UdDgQWBBQAzw+GSXwuDMhAaUP+M9D28G8yNDANBgkqhkiG9w0BAQUFAAOC
+AQEAKmp+HbJKFXb+NEPdktE8Y+PKV9YWsPpBKCxSHxDkgFSXLnCjxr6RpPYPvgqY
+oHjkqzea//qZ4oqVRjOBauGqZ1u+PBYEwsZGSL6v2/AMjM51D1VOvMJz3Rt63ee1
++oIZbU7teIK3n5BpSjHhScglXf2psZEEmQ5FGTLMUvq1Ri5bMJjmVNNyQH0Cm1WM
+IGGsITC3/oso3+KzpqcWISIqCeBFfYZ4mh/PIOoZEpYSN9jkMBHtlcc9mcR6aQX3
+0KtgoDtLnJA0Xw9ubL3YhxZLOdWTswHGr4AoplV09zQkNG87GIfVDAtzmZHLlP6S
+s0eg2zS0HU2kmUbaL6tbYB5jyw==
+</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>nacho-pc</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nacho-pc</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC3zCCAcegAwIBAgIJANjsPUfkRN00MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+BAMTCG5hY2hvLXBjMB4XDTEwMDQxMzEzMzI1OVoXDTIwMDQxMDEzMzI1OVowEzER
+MA8GA1UEAxMIbmFjaG8tcGMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC99pEipkOSaRwbIYY/dfFIR2/COahYi+fU3qDpCmG6JbZzO3O9ybjF/sUmt1fA
+Unq+1HinEwSGDfizUoN+/NUcAG4N8juD+UL9bbYEcfx7Ly7jlGiZa3Fr3zFqxXGQ
+w+vAtnk4tKtt0kNKPXNs9oApEzGpUAj12EQBRMiKLhFPqNMo8YQ+OUqCyZMYm2Oc
+uJFj9QBN3vLCRFJJZCt7kmpfnC9M4KdMFvhzbDMixrk4qdjuUB0W7bRAiHk0Yupw
+QUZMk0kF4AJrWFliUIsNVIm3q4I0AOlAgbii5rsarDjGaRlE421K6TZxwx+0UfnQ
+G3pn+xmBV7purr0y6VmQOaZvAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG5hY2hvLXBj
+MB0GA1UdDgQWBBQAzw+GSXwuDMhAaUP+M9D28G8yNDANBgkqhkiG9w0BAQUFAAOC
+AQEAKmp+HbJKFXb+NEPdktE8Y+PKV9YWsPpBKCxSHxDkgFSXLnCjxr6RpPYPvgqY
+oHjkqzea//qZ4oqVRjOBauGqZ1u+PBYEwsZGSL6v2/AMjM51D1VOvMJz3Rt63ee1
++oIZbU7teIK3n5BpSjHhScglXf2psZEEmQ5FGTLMUvq1Ri5bMJjmVNNyQH0Cm1WM
+IGGsITC3/oso3+KzpqcWISIqCeBFfYZ4mh/PIOoZEpYSN9jkMBHtlcc9mcR6aQX3
+0KtgoDtLnJA0Xw9ubL3YhxZLOdWTswHGr4AoplV09zQkNG87GIfVDAtzmZHLlP6S
+s0eg2zS0HU2kmUbaL6tbYB5jyw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nacho.adm.gu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nacho.adm.gu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nacho.adm.gu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nacho.adm.gu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nacho.adm.gu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nacho.adm.gu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nacho.adm.gu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nacho.adm.gu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nacho.adm.gu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nacho.adm.gu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>