resolve conflicts and merge

1 files changed, 0 insertions, 91 deletions

diff --git a/swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index a9905fb9..00000000
--- a/swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.staffsubs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Development Staff Subscriptions Site" for the University of Oxford.
-	-->
-  <Extensions>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-29T13:49:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAMPTupjyLfCfMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmRldi5zdGFmZnN1YnMub3guYWMudWswHhcNMTQwOTI2MTMwODA5WhcNMjQw
-						OTIzMTMwODA5WjAhMR8wHQYDVQQDExZkZXYuc3RhZmZzdWJzLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsIra3HDvpQGik+04o7Hi353+
-						0xtA8JgwRy78IYhWNWr4v0a5B5Ahpsc/i7slwZLHmgZirCdMZdgrDktVuEQTbi8m
-						TO7NLo9vra8odrHzHoHmWgvWIOp9Foj6POlPzTNU8snjUMUVNM7ShZ/4jV3H4CGZ
-						vd4zpHmfvkfOYPRkWt4VMUdzjs6fpt9hAeSiEZf7XuS/cbkE/0ZGfo7yHDrq8Ul0
-						1iEp+95odJCuyL3qIf8jSgyqJCJP918d5F6SE3t+u4Q1syQazgNSzHePrwCHSSGR
-						ztZSJeeNZUexdLOYASL/ysNXWVhP77WGjMVqwU4Zv7f0kpl1S9gH12CEaD/NAwID
-						AQABo0QwQjAhBgNVHREEGjAYghZkZXYuc3RhZmZzdWJzLm94LmFjLnVrMB0GA1Ud
-						DgQWBBRVSkzRfVG/AW8Ec4VyYVUEwJ1fZjANBgkqhkiG9w0BAQUFAAOCAQEAl4cc
-						V+K4waP0sgXUQAaNpl+N0r/2DLg0njCJN0QUiWzqvfan6jJ+5FlUYOqeUtLfuOMQ
-						Ikwx9PvFqhoyK+QuP0/9Y5REar4Oinc8xn2nWgpTaKgOcBihdrGeN0k72NbjS+UO
-						g81H9RzGsPzWp1rKC+4AmdJFIaWNiqlcg59FKzF4KiVfXfF123mKIiKr/Pj9ir2k
-						P1B0Wxj420naHJHUIHG2yt64DwKbWRsMgJCdyT4U3zTr7Q4ycO+cMExw7f2z9LIM
-						hvYWVctcejaX+2FYRleI+SzKFzZAT7jAUy1PrYQ7v0MRkBc68iAyycFfStNlZYNF
-						tkBUW7bI089WV6OA0Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Development Staff Subscriptions Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Hebron</SurName>
-    <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>