resolve conflicts and merge

1 files changed, 63 insertions, 0 deletions

diff --git a/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml b/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
new file mode 100644
index 00000000..a970a4cf
--- /dev/null
+++ b/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/metadata.php/discover">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:20:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="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">RESTENA FileSender Service (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">(TEST) RESTENA FileSender is a secure way to share large files with anyone! Logon to upload your files or to invite people to send you a file.</mdui:Description>
+        <mdui:Description xml:lang="fr">(TEST) RESTENA FileSender propose un moyen sécurisé pour partager des gros fichiers avec vos collègues! Connectez-vous pour envoyer vos fichiers ou pour inviter vos interlocuteurs à vous en envoyer.</mdui:Description>
+        <mdui:Description xml:lang="de">(TEST) RESTENA FileSender ist eine sichere Methode grosse Dateien mit jedermann zu teilen! Verbinden Sie sich um Dateien zu verschicken oder um jemanden aufzufordern Ihnen eine Datei zu schicken.</mdui:Description>
+        <mdui:Description xml:lang="lb">(TEST) De RESTENA FileSender ass e séchere Wee, fir grouss Fichieren ze verschécken! Loggt Iech an, fir Fichieren eropzelueden oder aner Leit ze invitéieren, Iech Fichieren ze schécken.</mdui:Description>
+        <mdui:Keywords xml:lang="en">RESTENA FileSender large XXL file transfer</mdui:Keywords>
+        <mdui:Logo width="100" height="100" xml:lang="en">http://fs-test.restena.lu/filesender.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>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</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>MIIG5TCCBM2gAwIBAgIJAIlJ6s/iVngWMA0GCSqGSIb3DQEBDQUAMIGMMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MSowKAYDVQQDDCFSRVNURU5BIFNBTUwgRW50aXR5IGZzLnJlc3RlbmEubHUwIBcNMTUwNzA3MDczODM0WhgPMjA1NjA3MzEwNzM4MzRaMIGMMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MSowKAYDVQQDDCFSRVNURU5BIFNBTUwgRW50aXR5IGZzLnJlc3RlbmEubHUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFF6WZKlTiLtMKFcaxto35kXkY+E5+rwMgmfMJwiLwGLqYiZT+Wf0cmhJNm8GXKGl6dncYeuJOsR6oN26vQGNa3mAK8FVagQlvurjhncu7i0Slo0jdIz6sYRYUBtegRXjdJ0Xlnvm2v45azl/3XGteRQaSks9a1buWY+mxTcbgIWYNKCIKlgf+DKZtVs7dIKytsa2F0RaV7b56o9JmknpzDxOoucxGdMB9874gcI4F8n7465tMMxRyL0DYXksQt3nyBJYlK54C4pJcpPMq6dqRiuVucHyjZ88Q1NNphhBFPWHrlfEz0S4CBbtwNym+U0YUERh/AZmcisl6eJjFGISvhHGLMSBPQiiQVktNzZkQdCsoWOA7YO0a1Yh/ywxQXFxP4ldyA6Xe5bcTMBfQlZ7i1TJWfyyCpWtmqekr/uf6MHuDXFlWvxZNwNdtJdwaykz/Ql4sYw5tTGXd7waH0p0WWckWQwUOQcGloP1fhCo5bPaFAnJHtOgnLw2MIEd+uSsO3WcEGXvNlTLCl98hedx1tKsIE2zDFzBrJaq9JSBk/QHTGEgBC4pAD49jvK8FlRug/ljbXDCLcBitZqQhW/tyqLn6/6b2abCa91DxmacLp74OFtRi3Cvd7la6nogPSeeyOdo58KGxDkjs7woEwT7uWm5uXDl3iiRYfeJVM7VkIQIDAQABo4IBRDCCAUAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO7KeYdBzZfUWhMqrom6YSJaptSrMIHBBgNVHSMEgbkwgbaAFO7KeYdBzZfUWhMqrom6YSJaptSroYGSpIGPMIGMMQswCQYDVQQGEwJMVTETMBEGA1UEBwwKTHV4ZW1ib3VyZzEbMBkGA1UECgwSUkVTVEVOQSBGb3VuZGF0aW9uMR8wHQYJKoZIhvcNAQkBFhBhZG1pbkByZXN0ZW5hLmx1MSowKAYDVQQDDCFSRVNURU5BIFNBTUwgRW50aXR5IGZzLnJlc3RlbmEubHWCCQCJSerP4lZ4FjAJBgNVHRMEAjAAMDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly93d3cucmVzdGVuYS5sdS9jYS9mcy5yZXN0ZW5hLmx1LmNybDANBgkqhkiG9w0BAQ0FAAOCAgEAWup+YqfjH+BZbuo7VVBNP+UelxnRjC9Pnev5950kYQimC67OOrkJoILpEMiSJz9D5XhmmmCYAfsxUZmHHh2INkl41o8TQbLmNNgQKh4JQ9foi+jhvyhAuE8S+1X5t0gpmb5otxQwUC7utdvXn70sY5Kke+DiFmkiIZFB0gm8xeBpELZc1zPMS1vHtbx3SbHwuYqZYCFK3IxVdgJ1n2kD1yVavJ4clhaW+ytBZ4vdSaRBytEa6nMDE5Yj2oQEqTH85VKswnEG/xt38speI2DYqHJKCA7iIK+FXBuNGAjxRLcUuBYolGjL4qhmShO89mCqCVWmornMJZxPlURhbE2CtEhupMLW8jPKCmTVr+6k0X65YgWpnqhiwYv8sPmqNt1eyIcJkif0iKdxtB6iWo8VAROD0LgChPMuwQxrzkUMDVgvYb8MQfPuhwPynM4i0XkHZVX8E4d0W1u2Xewmuu0HsKa8GFj/OyMdE7bQSvk2KkvBhqxD2DSZJ72uVRiqxjgZuEVpSwuv6ZMPxwUT9I8P7zCL8wVtqJET0Kooh6ZXe+oogbGeuh/nmFRtgPy1va2SSKVkdl5dt77fC/nf3qlBMNmCp9N6H7zCt2VsDq3THM5FiNz8vtafch+9jUN7goJCmLU5134Rt6+SfTWn/E6fsr7I7+UMu+hjkqWS7K0jqaI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-logout.php/discover"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" index="2"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">RESTENA FileSender Service (TEST)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">(TEST) RESTENA FileSender is a secure way to share large files with anyone! Logon to upload your files or to invite people to send you a file.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="fr">(TEST) RESTENA FileSender propose un moyen sécurisé pour partager des gros fichiers avec vos collègues! Connectez-vous pour envoyer vos fichiers ou pour inviter vos interlocuteurs à vous en envoyer.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="de">(TEST) RESTENA FileSender ist eine sichere Methode grosse Dateien mit jedermann zu teilen! Verbinden Sie sich um Dateien zu verschicken oder um jemanden aufzufordern Ihnen eine Datei zu schicken.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="lb">(TEST) De RESTENA FileSender ass e séchere Wee, fir grouss Fichieren ze verschécken! Loggt Iech an, fir Fichieren eropzelueden oder aner Leit ze invitéieren, Iech Fichieren ze schécken.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.23735.100.0" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <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"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RESTENA Foundation asbl</md:OrganizationName>
+    <md:OrganizationName xml:lang="fr">Fondation RESTENA asbl</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RESTENA Foundation</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">Fondation RESTENA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.restena.lu/restena/en/EN-Presentation.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.restena.lu/restena/fr/FR-Presentation.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>RESTENA</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>noc@restena.lu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>