resolve conflicts and merge

1 files changed, 0 insertions, 67 deletions

diff --git a/swamid-interfederations-2.0/www.qoam.eu-.xml b/swamid-interfederations-2.0/www.qoam.eu-.xml
deleted file mode 100644
index 36d25bf3..00000000
--- a/swamid-interfederations-2.0/www.qoam.eu-.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.qoam.eu/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-06-02T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml: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:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">QOAM - Quality Open Access Market</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.qoam.eu/oamarket/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.qoam.eu/oamarket/about#privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo width="65" height="65">https://static.surfconext.nl/media/sp/OAmarket.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</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>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-logout.php/qoam-wayf"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">QOAM</md:ServiceName>
-      <md:ServiceName xml:lang="nl">QOAM</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">QOAM</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">QOAM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.qoam.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>info@qoam.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Leo</md:GivenName>
-    <md:SurName>Waaijers</md:SurName>
-    <md:EmailAddress>leowaa@xs4all.nl</md:EmailAddress>
-    <md:TelephoneNumber>+31 24 36 17961</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>