resolve conflicts and merge

1 files changed, 113 insertions, 0 deletions

diff --git a/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml
new file mode 100644
index 00000000..c7175ccd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vub.ac.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vub.ac.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">VUB - Vrije Universiteit Brussel</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Vrije Universiteit Brussel</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.vub.ac.be/logo/vub-small.jpg</mdui:Logo>
+        <mdui:Logo height="110" width="347">https://idp.vub.ac.be/logo/vub-large.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>134.184.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:06a8:1190::/64</mdui:IPHint>
+        <mdui:DomainHint>vub.ac.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:50.8213690,4.3957100</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUUfJ0sMk1r7U/7VeOC4dUi0tFk+4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLnZ1Yi5hYy5iZTAeFw0xMzEyMTcwODQ5NDRaFw0z
+MzEyMTcwODQ5NDRaMBgxFjAUBgNVBAMTDWlkcC52dWIuYWMuYmUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgAg+ICRsB+l1EPx8pRtbp/W/s0DruoIHO
+wlHgtvhVToh/GDdAqDNHdhGGTSTVc77JO1j1yV3sQgczH+4Hz/bczwUCbna3ItgN
+SvnhzzFcpzdJ7MKJJaIc4CszrZG4TBA3hHaAIOsjlOz8QwG7DIhx7pF/wZktYJkQ
+RE6vC6Y579QcFqxBF8nNi+jKELWgwean36+lqIDYLhsWDye/lJ/h5dgp0W1bfYM+
+CNXNbBF5IiLY9RgypiGBtm+717vig8GVpHOsiFsN7+CPboRr0BFVwg2NEpnvlZSa
+plqYBHOlmqLDJv8l7Du6ss1Vp1eLgp/cdb0pbeBme/+NCMZIGOJvAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC52dWIuYWMuYmWGJGh0dHBzOi8vaWRwLnZ1Yi5hYy5i
+ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb3yOJUsB5SdaKAXaXW+Xxlub4Dgw
+DQYJKoZIhvcNAQEFBQADggEBAArzqWvBazHyT82L/HbNUH+KbrbOtgj2eiLRmWDT
+GCB1/qXuuh+WLejyvN7EJ+SBGGdWEdytBvZyAmIq4Kv4EDDupu/ynYCxP03v6oW5
+ucpeNa/q3lA9oAXPNp4z5DXJYTTMlRXOojmJnokizp4pxKM9hKVPBN7QB7n6KjPy
+2F+EAkHGF5c4LKgMsOK4Gsjux1vi/PbAO0qiMOfsHdKM1ZUJQP+skNYkhjMCVV4d
+/h/4Ex6XuS8nqlpwIti+gqTmnULy0Aa3fBluoLmvB38uDPdlC3QkBiFbQtX+GUDG
+dnwz715sBlh9o1XpY8ZJk6VAdG4njwd/RBj9cZcya3tIaMw=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vub.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vub.ac.be/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vub.ac.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vub.ac.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vub.ac.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUUfJ0sMk1r7U/7VeOC4dUi0tFk+4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLnZ1Yi5hYy5iZTAeFw0xMzEyMTcwODQ5NDRaFw0z
+MzEyMTcwODQ5NDRaMBgxFjAUBgNVBAMTDWlkcC52dWIuYWMuYmUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgAg+ICRsB+l1EPx8pRtbp/W/s0DruoIHO
+wlHgtvhVToh/GDdAqDNHdhGGTSTVc77JO1j1yV3sQgczH+4Hz/bczwUCbna3ItgN
+SvnhzzFcpzdJ7MKJJaIc4CszrZG4TBA3hHaAIOsjlOz8QwG7DIhx7pF/wZktYJkQ
+RE6vC6Y579QcFqxBF8nNi+jKELWgwean36+lqIDYLhsWDye/lJ/h5dgp0W1bfYM+
+CNXNbBF5IiLY9RgypiGBtm+717vig8GVpHOsiFsN7+CPboRr0BFVwg2NEpnvlZSa
+plqYBHOlmqLDJv8l7Du6ss1Vp1eLgp/cdb0pbeBme/+NCMZIGOJvAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC52dWIuYWMuYmWGJGh0dHBzOi8vaWRwLnZ1Yi5hYy5i
+ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb3yOJUsB5SdaKAXaXW+Xxlub4Dgw
+DQYJKoZIhvcNAQEFBQADggEBAArzqWvBazHyT82L/HbNUH+KbrbOtgj2eiLRmWDT
+GCB1/qXuuh+WLejyvN7EJ+SBGGdWEdytBvZyAmIq4Kv4EDDupu/ynYCxP03v6oW5
+ucpeNa/q3lA9oAXPNp4z5DXJYTTMlRXOojmJnokizp4pxKM9hKVPBN7QB7n6KjPy
+2F+EAkHGF5c4LKgMsOK4Gsjux1vi/PbAO0qiMOfsHdKM1ZUJQP+skNYkhjMCVV4d
+/h/4Ex6XuS8nqlpwIti+gqTmnULy0Aa3fBluoLmvB38uDPdlC3QkBiFbQtX+GUDG
+dnwz715sBlh9o1XpY8ZJk6VAdG4njwd/RBj9cZcya3tIaMw=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vub.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">
+                Vrije Universiteit Brussel
+        </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">
+                VUB - Vrije Universiteit Brussel
+        </md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">
+                http://www.vub.ac.be
+        </md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>support@vub.ac.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>