resolve conflicts and merge

1 files changed, 0 insertions, 92 deletions

diff --git a/swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml
deleted file mode 100644
index 9748ac95..00000000
--- a/swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wwwtest.york.ac.uk/shibboleth">
-  <!--
-	This is a test Shibboleth 2.3.1 SP for the University of York
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol          urn:oasis:names:tc:SAML:1.1:protocol          urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAMpppKRb3Aa9MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnd3d3Rlc3QueW9yay5hYy51azAeFw0xMDA0MjgwNzUxMzFaFw0yMDA0MjUw
-						NzUxMzFaMB0xGzAZBgNVBAMTEnd3d3Rlc3QueW9yay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAOev3cDnTddwIwV1D6Be/OTdiR0bkXVLwVXg
-						BQrPVS7agammnWqmr6IMSHUrrx7SE83W8Bnsd2pZwWKd9sYLOuldcuROSMJPWHNk
-						x4S876XI/gTzciuw6pUOI+lfW/eTcXzFsnPeo1Co+ixURSAp6mg5MG3LzOmNgqN6
-						zElyuEIEnopnccPWYYH0Sx7J+frN39FT8dRlm7p0i/iK0aQHTLBM3m1lmVthdXeo
-						6e6SnEqAEkw9yWdBAoGUiXrYL3sxkJl1Osgs6JknHnzemDgJM4oKiFOsLZ9dUlc5
-						mdyXyn4DMczvdbAk28TkBlvzobbaRQJmlssLL75TsL+VW90Hq38CAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISd3d3dGVzdC55b3JrLmFjLnVrMB0GA1UdDgQWBBR+cm91kjXz
-						R9qmvtX0UMEs+TryyTANBgkqhkiG9w0BAQUFAAOCAQEA2yvE/7/5Vz+BNFPKtv6L
-						LEnLoFhzJpS4w0JOX/Z2Ym+R9DkAVVaN9ePlkkfy16T4j6OzXTTa3fu8oauayw5d
-						x4KCqeD/mTbE4kSJImNOofh+Jm35ImXFTiLS7kGljl+eVgmclxo6mxMs/fzPQ49o
-						uKlO4U5whclaxTEbsmsZ9JgLKEQUilHUzTqp6/EbuIo8ixC/tl1QdS2e1VQ3rAzj
-						DnkGe+8RmWThnmvC3CfOTlTFg89iembQ/DhtG5b8xsGcGEbSbBixtfzgQ+sfTQhC
-						4ck/5yXbFICjI9Ev6zmgYQXlhkOh7SC4uIgmef8PDpBcKBs3QlwgTkmCOHkohf/+
-						Ig==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAMpppKRb3Aa9MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnd3d3Rlc3QueW9yay5hYy51azAeFw0xMDA0MjgwNzUxMzFaFw0yMDA0MjUw
-						NzUxMzFaMB0xGzAZBgNVBAMTEnd3d3Rlc3QueW9yay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAOev3cDnTddwIwV1D6Be/OTdiR0bkXVLwVXg
-						BQrPVS7agammnWqmr6IMSHUrrx7SE83W8Bnsd2pZwWKd9sYLOuldcuROSMJPWHNk
-						x4S876XI/gTzciuw6pUOI+lfW/eTcXzFsnPeo1Co+ixURSAp6mg5MG3LzOmNgqN6
-						zElyuEIEnopnccPWYYH0Sx7J+frN39FT8dRlm7p0i/iK0aQHTLBM3m1lmVthdXeo
-						6e6SnEqAEkw9yWdBAoGUiXrYL3sxkJl1Osgs6JknHnzemDgJM4oKiFOsLZ9dUlc5
-						mdyXyn4DMczvdbAk28TkBlvzobbaRQJmlssLL75TsL+VW90Hq38CAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISd3d3dGVzdC55b3JrLmFjLnVrMB0GA1UdDgQWBBR+cm91kjXz
-						R9qmvtX0UMEs+TryyTANBgkqhkiG9w0BAQUFAAOCAQEA2yvE/7/5Vz+BNFPKtv6L
-						LEnLoFhzJpS4w0JOX/Z2Ym+R9DkAVVaN9ePlkkfy16T4j6OzXTTa3fu8oauayw5d
-						x4KCqeD/mTbE4kSJImNOofh+Jm35ImXFTiLS7kGljl+eVgmclxo6mxMs/fzPQ49o
-						uKlO4U5whclaxTEbsmsZ9JgLKEQUilHUzTqp6/EbuIo8ixC/tl1QdS2e1VQ3rAzj
-						DnkGe+8RmWThnmvC3CfOTlTFg89iembQ/DhtG5b8xsGcGEbSbBixtfzgQ+sfTQhC
-						4ck/5yXbFICjI9Ev6zmgYQXlhkOh7SC4uIgmef8PDpBcKBs3QlwgTkmCOHkohf/+
-						Ig==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of York</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of York: Test version of main York website</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.york.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>User Support</GivenName>
-    <EmailAddress>mailto:itsupport@york.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:itsupport@york.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>