resolve conflicts and merge

1 files changed, 0 insertions, 93 deletions

diff --git a/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml
deleted file mode 100644
index 0410b235..00000000
--- a/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dames.nesc.gla.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2.2.3 SP 'DAMES Portal' for NeSC (Glasgow).
-	-->
-  <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://dames.nesc.gla.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>
-						MIIDAzCCAeugAwIBAgIJAPQi2lDJZSZcMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDgwNTE2MTMxOVoXDTE5MDgw
-						MzE2MTMxOVowHzEdMBsGA1UEAxMUZGFtZXMubmVzYy5nbGEuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFiNFI3HRhi1pkWtlq5qrZi4EkX4Q1
-						ZphI0wyd3oYMRemFXDP7Qfz+aSOEOnPA5w755P2EGDe9u1O97ETEpcVI0L6ArAPf
-						tKJPQkX95DVgZUD0wnJJc3kuKT2rIWlx5au2cLkHLZCaOIW3k/pCL8DiEcpGCTdm
-						Fnc23dfCoHWZymteu+ddYqmXTYyp5cNEh/rJqx5iuY3hSYmfi0MHcKe7447qvuoS
-						fxl2Lb3cAZUZK/xIR866QWEXDhOABd2weZ+8QwVjAo0aSYFHsKM91YVSq6DHBQC8
-						PKayl04ua0sx5jO40OIFtWnnTaz5JVYeGXLSp/XhhA3xSl95aLGflmS5AgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBSS
-						LnX9HSDn4RLNE/BaliWemJU0YDANBgkqhkiG9w0BAQUFAAOCAQEAZaRyJs7v5746
-						UKnFKwHbhcV9BEdrqAlaSlVpzTW/MrZ9UPHVmwUvUkDbxGNJHGFWUP7RmWcKy3S1
-						fOdSHJaNUqxGN1rKXkXiu2Ti6XXk3SQVHh9A2SU/ihOuPuFc+8LIlNiznlpBnJWH
-						OwfkVyGYl/iixt8Q6QWvWniqkKbl7e6vAqrGMEkAFqVnXm/jZYUyp9sBnNmLLsQf
-						PCXbU+ts+rDkA9pH8rxv+NYkf7qa7+d4tJTJ7Akq5hwAKEGVOJHBksQNpDSkbBGZ
-						10RBzS9+he84NPSi0FdiJiKZf+rHfry5PWnH0KkdkfY/xW7Bf6ka3ZScxMIS++Jn
-						LVUfkyIKAQ==
-					</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>
-						MIIDAzCCAeugAwIBAgIJAPQi2lDJZSZcMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDgwNTE2MTMxOVoXDTE5MDgw
-						MzE2MTMxOVowHzEdMBsGA1UEAxMUZGFtZXMubmVzYy5nbGEuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFiNFI3HRhi1pkWtlq5qrZi4EkX4Q1
-						ZphI0wyd3oYMRemFXDP7Qfz+aSOEOnPA5w755P2EGDe9u1O97ETEpcVI0L6ArAPf
-						tKJPQkX95DVgZUD0wnJJc3kuKT2rIWlx5au2cLkHLZCaOIW3k/pCL8DiEcpGCTdm
-						Fnc23dfCoHWZymteu+ddYqmXTYyp5cNEh/rJqx5iuY3hSYmfi0MHcKe7447qvuoS
-						fxl2Lb3cAZUZK/xIR866QWEXDhOABd2weZ+8QwVjAo0aSYFHsKM91YVSq6DHBQC8
-						PKayl04ua0sx5jO40OIFtWnnTaz5JVYeGXLSp/XhhA3xSl95aLGflmS5AgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBSS
-						LnX9HSDn4RLNE/BaliWemJU0YDANBgkqhkiG9w0BAQUFAAOCAQEAZaRyJs7v5746
-						UKnFKwHbhcV9BEdrqAlaSlVpzTW/MrZ9UPHVmwUvUkDbxGNJHGFWUP7RmWcKy3S1
-						fOdSHJaNUqxGN1rKXkXiu2Ti6XXk3SQVHh9A2SU/ihOuPuFc+8LIlNiznlpBnJWH
-						OwfkVyGYl/iixt8Q6QWvWniqkKbl7e6vAqrGMEkAFqVnXm/jZYUyp9sBnNmLLsQf
-						PCXbU+ts+rDkA9pH8rxv+NYkf7qa7+d4tJTJ7Akq5hwAKEGVOJHBksQNpDSkbBGZ
-						10RBzS9+he84NPSi0FdiJiKZf+rHfry5PWnH0KkdkfY/xW7Bf6ka3ZScxMIS++Jn
-						LVUfkyIKAQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NeSC (Glasgow): DAMES Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dames.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>