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

diff --git a/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
new file mode 100644
index 00000000..899fbfd5
--- /dev/null
+++ b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://graduateland.com/simplesaml/module.php/saml/sp/metadata.php/gl_gateway">
+  <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/eu-adequate-protection</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:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEoTCCA4mgAwIBAgIJAOc/Ph1JGdhtMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYDVQQGEwJESzEQMA4GA1UECBMHWmVhbGFuZDETMBEGA1UEBxMKQ29wZW5oYWdlbjEVMBMGA1UEChMMR3JhZHVhdGVsYW5kMQswCQYDVQQLEwJJVDEPMA0GA1UEAxMGTW9ydGVuMSYwJAYJKoZIhvcNAQkBFhdtb3J0ZW5AZ3JhZHVhdGVsYW5kLmNvbTAeFw0xMjA0MTAxODIxNDVaFw0yMjA0MTAxODIxNDVaMIGRMQswCQYDVQQGEwJESzEQMA4GA1UECBMHWmVhbGFuZDETMBEGA1UEBxMKQ29wZW5oYWdlbjEVMBMGA1UEChMMR3JhZHVhdGVsYW5kMQswCQYDVQQLEwJJVDEPMA0GA1UEAxMGTW9ydGVuMSYwJAYJKoZIhvcNAQkBFhdtb3J0ZW5AZ3JhZHVhdGVsYW5kLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9agl1h9xznM2AmNyKd+Y8Qdz7mql64pmXf5lujFqN/NtTm1T+aXK8lF6Cmm6g3RsqAcc8u+cazUzKE6jivDueh5NFgVuO3Ep8J6pKXvyqITtDMS9nmnV6xeXQHkfK8STItZpfOSmtWIcycED0fqYaimZa+Nz7mlZezbR0d5SPEqDT3E0XTHJqui6Q4fQbLSU6Tw8W16uqEmGs1N4eJvihFmrLASgQ/Mai/USWLdDMEsX4JeenAV/wuyliGRaYHS8wP7CpXsdlDOXgGkJ+CyJ2a42NsCfbTzt9hhwRH4K1V+5jpu9G62+ggGYMLLThyN32KV7cyJrT9rcJ5sdRYKcECAwEAAaOB+TCB9jAdBgNVHQ4EFgQU512bAo9RuH5HVbpw+S2qDVo3bsMwgcYGA1UdIwSBvjCBu4AU512bAo9RuH5HVbpw+S2qDVo3bsOhgZekgZQwgZExCzAJBgNVBAYTAkRLMRAwDgYDVQQIEwdaZWFsYW5kMRMwEQYDVQQHEwpDb3BlbmhhZ2VuMRUwEwYDVQQKEwxHcmFkdWF0ZWxhbmQxCzAJBgNVBAsTAklUMQ8wDQYDVQQDEwZNb3J0ZW4xJjAkBgkqhkiG9w0BCQEWF21vcnRlbkBncmFkdWF0ZWxhbmQuY29tggkA5z8+HUkZ2G0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA1SVF6F8C5XbKlGr27zpvlkcCBSvDbI7MHWMZ52Mxai+xPyy+au6QASwcc40gEtP8PYN2b8m2zDBgKnt7GMjku0BclpdSKdS+/wVsMl8PCBMxgk4CLNsbeghkv9IQUTP8axSpwmtikYW84K69fYYyaBtvBV+dk+JQRO0Ss/rXSOCmT+E56pXZh7g2lfK9lX9el9u1U60EzHayQXELkqYsUB+cuz/wFhb/oxd1Qdbf/dq72cdIXywsuJqV6UMT5fYBIrhoKY24wNbgELXfJNOcoMiiBugbKay+TZD4k7TGy59wfmSKW1JZRFToZSbdNJQEDK5LFNaeGUoB6YzlQ7PvfQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEoTCCA4mgAwIBAgIJAOc/Ph1JGdhtMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYDVQQGEwJESzEQMA4GA1UECBMHWmVhbGFuZDETMBEGA1UEBxMKQ29wZW5oYWdlbjEVMBMGA1UEChMMR3JhZHVhdGVsYW5kMQswCQYDVQQLEwJJVDEPMA0GA1UEAxMGTW9ydGVuMSYwJAYJKoZIhvcNAQkBFhdtb3J0ZW5AZ3JhZHVhdGVsYW5kLmNvbTAeFw0xMjA0MTAxODIxNDVaFw0yMjA0MTAxODIxNDVaMIGRMQswCQYDVQQGEwJESzEQMA4GA1UECBMHWmVhbGFuZDETMBEGA1UEBxMKQ29wZW5oYWdlbjEVMBMGA1UEChMMR3JhZHVhdGVsYW5kMQswCQYDVQQLEwJJVDEPMA0GA1UEAxMGTW9ydGVuMSYwJAYJKoZIhvcNAQkBFhdtb3J0ZW5AZ3JhZHVhdGVsYW5kLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9agl1h9xznM2AmNyKd+Y8Qdz7mql64pmXf5lujFqN/NtTm1T+aXK8lF6Cmm6g3RsqAcc8u+cazUzKE6jivDueh5NFgVuO3Ep8J6pKXvyqITtDMS9nmnV6xeXQHkfK8STItZpfOSmtWIcycED0fqYaimZa+Nz7mlZezbR0d5SPEqDT3E0XTHJqui6Q4fQbLSU6Tw8W16uqEmGs1N4eJvihFmrLASgQ/Mai/USWLdDMEsX4JeenAV/wuyliGRaYHS8wP7CpXsdlDOXgGkJ+CyJ2a42NsCfbTzt9hhwRH4K1V+5jpu9G62+ggGYMLLThyN32KV7cyJrT9rcJ5sdRYKcECAwEAAaOB+TCB9jAdBgNVHQ4EFgQU512bAo9RuH5HVbpw+S2qDVo3bsMwgcYGA1UdIwSBvjCBu4AU512bAo9RuH5HVbpw+S2qDVo3bsOhgZekgZQwgZExCzAJBgNVBAYTAkRLMRAwDgYDVQQIEwdaZWFsYW5kMRMwEQYDVQQHEwpDb3BlbmhhZ2VuMRUwEwYDVQQKEwxHcmFkdWF0ZWxhbmQxCzAJBgNVBAsTAklUMQ8wDQYDVQQDEwZNb3J0ZW4xJjAkBgkqhkiG9w0BCQEWF21vcnRlbkBncmFkdWF0ZWxhbmQuY29tggkA5z8+HUkZ2G0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA1SVF6F8C5XbKlGr27zpvlkcCBSvDbI7MHWMZ52Mxai+xPyy+au6QASwcc40gEtP8PYN2b8m2zDBgKnt7GMjku0BclpdSKdS+/wVsMl8PCBMxgk4CLNsbeghkv9IQUTP8axSpwmtikYW84K69fYYyaBtvBV+dk+JQRO0Ss/rXSOCmT+E56pXZh7g2lfK9lX9el9u1U60EzHayQXELkqYsUB+cuz/wFhb/oxd1Qdbf/dq72cdIXywsuJqV6UMT5fYBIrhoKY24wNbgELXfJNOcoMiiBugbKay+TZD4k7TGy59wfmSKW1JZRFToZSbdNJQEDK5LFNaeGUoB6YzlQ7PvfQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://graduateland.com/simplesaml/module.php/saml/sp/saml2-logout.php/gl_gateway"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://graduateland.com/simplesaml/module.php/saml/sp/saml2-acs.php/gl_gateway" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://graduateland.com/simplesaml/module.php/saml/sp/saml1-acs.php/gl_gateway" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://graduateland.com/simplesaml/module.php/saml/sp/saml2-acs.php/gl_gateway" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://graduateland.com/simplesaml/module.php/saml/sp/saml1-acs.php/gl_gateway/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Morten</md:GivenName>
+    <md:SurName>Petersen</md:SurName>
+    <md:EmailAddress>morten@graduateland.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>