resolve conflicts and merge

1 files changed, 81 insertions, 0 deletions

diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
new file mode 100644
index 00000000..71284944
--- /dev/null
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/fs.edu.simac.dk/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-07-30T14:58:21Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">simac.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="da">SIMAC</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SIMAC</mdui:DisplayName>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>simac.dk</mdui:DomainHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cDovL2Zz
+LmVkdS5zaW1hYy5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAw
+MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cDovL2ZzLmVkdS5zaW1h
+Yy5kay9hZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
+lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
+x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
+jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
+tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
+d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQCMnEPPjnsBWSGeheSYbDsSi0Xu7lRxxqEKZYwRCoTMmYIJRCXnJbPxA/BiP2nK
+K/ZnqJB9yHrNaLzE5rQw8QOkgCw1hGH3KspHtW29g9LkUpUnlPrmcqHYJFFuAIhF
+gsqSQ6jdv9q0q4vOSnhyKNVOA613djnxmNfbpPhwTMS6Udv/1euPi9xo6x/+ExL7
+beahYAykMS99l1bn1/tAhD+HoHbF1E5bKhsAQ5VqhEm+c1zY3sZNDrSi8ca7wv/x
+3vZ3PhzIxt23JHiArE7JPSQ7/8sbDf5qKUPRltdh8NxLRwVFzeyTrBwEwMF/mpRg
+fwnoK0wK5Qy+Hac98sg1DygI
+</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>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cDovL2Zz
+LmVkdS5zaW1hYy5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAw
+MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cDovL2ZzLmVkdS5zaW1h
+Yy5kay9hZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
+lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
+x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
+jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
+tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
+d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQCMnEPPjnsBWSGeheSYbDsSi0Xu7lRxxqEKZYwRCoTMmYIJRCXnJbPxA/BiP2nK
+K/ZnqJB9yHrNaLzE5rQw8QOkgCw1hGH3KspHtW29g9LkUpUnlPrmcqHYJFFuAIhF
+gsqSQ6jdv9q0q4vOSnhyKNVOA613djnxmNfbpPhwTMS6Udv/1euPi9xo6x/+ExL7
+beahYAykMS99l1bn1/tAhD+HoHbF1E5bKhsAQ5VqhEm+c1zY3sZNDrSi8ca7wv/x
+3vZ3PhzIxt23JHiArE7JPSQ7/8sbDf5qKUPRltdh8NxLRwVFzeyTrBwEwMF/mpRg
+fwnoK0wK5Qy+Hac98sg1DygI
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/fs.edu.simac.dk/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">SIMAC</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">SIMAC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">SIMAC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SIMAC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www.simac.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.simac.dk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>WAYF</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>