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

diff --git a/swamid-2.0/epc.ub.uu.se-shibboleth.xml b/swamid-2.0/epc.ub.uu.se-shibboleth.xml
new file mode 100644
index 00000000..02dbc635
--- /dev/null
+++ b/swamid-2.0/epc.ub.uu.se-shibboleth.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://epc.ub.uu.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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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://epc.ub.uu.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>epc.ub.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=epc.ub.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAPfL+CYfRXf3MA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGVwYy51Yi51dS5zZTAeFw0xMTA0MjgwNjI1NDdaFw0yMTA0MjUwNjI1NDda
+MBcxFTATBgNVBAMTDGVwYy51Yi51dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMUEG0sMm1hQ/cU6c91BMeTgJq5G4HqmmNOMIwkBaLKgVd6X8nyB
+lMbd6KP+X3EzMT6W/uZRG++yYlYtLAbeA0juXrB7FvB2RN2gAMxFSveNz+MO28k/
+XXJ0qTEl0GDL7QCNGUojJ7HOoZ8716mBXKZw3gmAnyfRIWR4X/tnZ8tIKH+r6Jr1
+wWGHzw1uPzEIGeS3l3kfdYhYFncObWgns0Ptic6zmFXcVShfU64rzlurME5eHC5G
+iNKT8UmbZjLGmgzpGxQfS1zhRG9zs9ALM1d/lyF+UFLHDMejFqQYfPKkrS+JU/Bw
+tLFhkhhgQ3DRv1k93j9DhE1bq1XldbCnFQUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+ZXBjLnViLnV1LnNlMB0GA1UdDgQWBBQJPhqH0Pdo2v0HzpSCFTtL3SXY8zANBgkq
+hkiG9w0BAQUFAAOCAQEAYn86jjAEVTBoIFoAMl18OgX95pMBV2J9NUIQ4uZIjp3Z
+Up7z5yfrnVH9BCs0LAbCdQCLrh+87rslBxY3FA8ozuBPMO3mMzemGlT9PNeofGY7
+vTC+5XAybhuqhiHfw5ZYpMzL4fyVNz0bC5vTTCF11RUK/IXD0ZfISvheSUgdGoP/
+iv/0CV0q978vNja0BjZ6qESVEOr3xFKLUJvsGOPrtoW32eVoaJ7idR53Rc4LdZIx
+0o7hTAzFGzSIdxc0SoBbJ32KqeZSWgmN1d6AvBiID4USZsfQXwBdrUQZSEgGYRwf
+LUklHC4ncWzgxrI1yRQeU2gF0WMmCBF4UOX5e1J5JA==
+</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>epc.ub.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=epc.ub.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAPfL+CYfRXf3MA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGVwYy51Yi51dS5zZTAeFw0xMTA0MjgwNjI1NDdaFw0yMTA0MjUwNjI1NDda
+MBcxFTATBgNVBAMTDGVwYy51Yi51dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMUEG0sMm1hQ/cU6c91BMeTgJq5G4HqmmNOMIwkBaLKgVd6X8nyB
+lMbd6KP+X3EzMT6W/uZRG++yYlYtLAbeA0juXrB7FvB2RN2gAMxFSveNz+MO28k/
+XXJ0qTEl0GDL7QCNGUojJ7HOoZ8716mBXKZw3gmAnyfRIWR4X/tnZ8tIKH+r6Jr1
+wWGHzw1uPzEIGeS3l3kfdYhYFncObWgns0Ptic6zmFXcVShfU64rzlurME5eHC5G
+iNKT8UmbZjLGmgzpGxQfS1zhRG9zs9ALM1d/lyF+UFLHDMejFqQYfPKkrS+JU/Bw
+tLFhkhhgQ3DRv1k93j9DhE1bq1XldbCnFQUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+ZXBjLnViLnV1LnNlMB0GA1UdDgQWBBQJPhqH0Pdo2v0HzpSCFTtL3SXY8zANBgkq
+hkiG9w0BAQUFAAOCAQEAYn86jjAEVTBoIFoAMl18OgX95pMBV2J9NUIQ4uZIjp3Z
+Up7z5yfrnVH9BCs0LAbCdQCLrh+87rslBxY3FA8ozuBPMO3mMzemGlT9PNeofGY7
+vTC+5XAybhuqhiHfw5ZYpMzL4fyVNz0bC5vTTCF11RUK/IXD0ZfISvheSUgdGoP/
+iv/0CV0q978vNja0BjZ6qESVEOr3xFKLUJvsGOPrtoW32eVoaJ7idR53Rc4LdZIx
+0o7hTAzFGzSIdxc0SoBbJ32KqeZSWgmN1d6AvBiID4USZsfQXwBdrUQZSEgGYRwf
+LUklHC4ncWzgxrI1yRQeU2gF0WMmCBF4UOX5e1J5JA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://epc.ub.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://epc.ub.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://epc.ub.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epc.ub.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://epc.ub.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://epc.ub.uu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://epc.ub.uu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epc.ub.uu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://epc.ub.uu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epc.ub.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://epc.ub.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://epc.ub.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://epc.ub.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epc.ub.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://epc.ub.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>