resolve conflicts and merge

1 files changed, 0 insertions, 97 deletions

diff --git a/swamid-interfederations-2.0/samlidp-its.ocad.ca:8443-idp-shibboleth.xml b/swamid-interfederations-2.0/samlidp-its.ocad.ca:8443-idp-shibboleth.xml
deleted file mode 100644
index 731855ea..00000000
--- a/swamid-interfederations-2.0/samlidp-its.ocad.ca:8443-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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://samlidp-its.ocad.ca:8443/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-08-14T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</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">ocad.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">OCAD University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ocadu.ca/about_ocad.htm</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIVAPRpRT0TrCPgXOSWUxrZTtTEeomRMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNhbWxpZHAtaXRzLm9jYWQuY2E6ODQ0MzAeFw0xNDA3
-MDgxNDE1MThaFw0zNDA3MDgxNDE1MThaMCMxITAfBgNVBAMTGHNhbWxpZHAtaXRz
-Lm9jYWQuY2E6ODQ0MzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ7X
-oFLpNI6mfEuOV2Y0Jx4dVi2t+VDHUahlmlf5r2IAascQMuJDmmAGgoq3SDQHcpvA
-R1JkEgAx8hAFys28faaWxNyfQezZNha/WflMEdcnMPGDKpSuH9zqZnkwm/7VwEIs
-JH+14u4AnjVAZTZdHtl6DIPvUql4GImhOW8SRQeriVhBtInqnCA/AKY9UGKK4JIr
-Fno/Opmqjo1T96gSiioyfGUhSW3uPzmFj8Xabl0xUt06EjkFMP/p91+vgzIEvg/9
-PMval4Mw0i/syuMfVG6QHQRfWszuIuSyxVbg65jINkeySHpRkQWelp+E2UDy77vJ
-zJk2SK+YzgXYtfHmr5cCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2FtbGlkcC1pdHMu
-b2NhZC5jYTo4NDQzhi9odHRwczovL3NhbWxpZHAtaXRzLm9jYWQuY2E6ODQ0My9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbJEIUMmVvHdI5G0vBFKtNUKz0bcwDQYJ
-KoZIhvcNAQEFBQADggEBAAPkUGthYxClJBy88O6uAq0WSObQ3w6Usbw2tRG47VQP
-UHe3sTXU/UgXKjQrgRDvMoyNW9y4EBm/+7+THAhTRTAISlhixId06csKJ3AW5WWS
-LVrezH22u+9M28AnTnxgH2BbhwkeSD6YZsPPXOySK6ivADlwPjgvxr4jxrZ4ioRS
-cQX0Ii9rS7spjxCmbicvlVfXl5Oe79NdtO+NcxQbRfU3QYHZap0lDVaZd+6zLXXU
-k5TIaeFkSh3RLdm4kBlaLFXzepvESschTHTfbH/PHntSGOYJVRGV34yKUEaG/mSQ
-KA9ippT+XCdKL7aFElL/FkA9Welvsk7w/EHZoo8Ixls=
-         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SLO" ResponseLocation="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca: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://samlidp-its.ocad.ca:8443/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlidp-its.ocad.ca:8443/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">ocad.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAo2gAwIBAgIDDC/fMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
-MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDkwNzI5MTM0NDQ0WhcNMTEwOTI5MTMwOTEy
-WjCBrjELMAkGA1UEBhMCQ0ExEjAQBgNVBAoUCSoub2NhZC5jYTETMBEGA1UECxMK
-R1QxMjE4MTcwMTExMC8GA1UECxMoU2VlIHd3dy5yYXBpZHNzbC5jb20vcmVzb3Vy
-Y2VzL2NwcyAoYykwOTEvMC0GA1UECxMmRG9tYWluIENvbnRyb2wgVmFsaWRhdGVk
-IC0gUmFwaWRTU0woUikxEjAQBgNVBAMUCSoub2NhZC5jYTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEApHxUZXD1VIVnpsVhmLRbKiUcf6ANdA7pbSwxCMECl+wu
-JhynMaHhiCkED8nWTkGAZ9ueSvcd8PURDpFHMFfsMPr1Q5ZN22fizxEP4+G0hbs6
-loh1WJBzJUuYXFtLftuSzOCJ1VhI00l2+38sjAWLDrJlRrIDl+lMFa6EpOy8LacC
-AwEAAaOBrjCBqzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFEy0g9UjmGGasnEQ
-BNdtChLTXsi2MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2VvdHJ1c3Qu
-Y29tL2NybHMvc2VjdXJlY2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr0rKV10fYIyAQ
-TzOYkJ/UMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
-AQUFAAOBgQBl1lnGQv6nOHC2Y/IyubqnlOBSW5dbSFSn3pvrxvuL24b1MR0XA+28
-hui8jdimOzGIOWS4+ShIXaO6rAaugPpMxFU+DArOHPJ9xjolw86bFdh6Z1xhLg9P
-lOKqmQXDe3+pEod35AFdmKjRVSbliDv5BZ2lN7GVDTzea0f66nblvQ==
-           </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca: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">OCAD University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">OCAD University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ocadu.ca/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Matthew Kwasnicki</md:SurName>
-    <md:EmailAddress>mkwasnicki@ocadu.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>