resolve conflicts and merge

1 files changed, 0 insertions, 84 deletions

diff --git a/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml
deleted file mode 100644
index 5393319d..00000000
--- a/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mobileauth.labs.jisc.ac.uk/shibboleth">
-  <!--
-		This is a "Test Mobile Authentication Proxy" Shibboleth SP for Jisc. 
-	-->
-  <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#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/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-10-27T15:06:33Z">
-      <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://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/Login"/>
-      <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://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAPBv1wp/OCGRMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGlwLTE3Mi0zMS0yMC0yMzAwHhcNMTQxMDA4MTcyNzQzWhcNMjQxMDA1MTcy
-						NzQzWjAbMRkwFwYDVQQDExBpcC0xNzItMzEtMjAtMjMwMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAt3TRLhrGfSXumBs5SmnJC+yfA3rqF/QD4fZw9v/d
-						SveQkvvyrExRLkxDCIM2k1zxyKsZcn4IS9teBOUYcPFi75NPSQUqpUkeBEoW15+g
-						1CKDgVtwMcCEDubppfov27Js9Dx1+AAtd6o/UWpZiGo+dmDNCIKZuABGZN1jGXRU
-						VcmsnV83kuxclC+lBBk6t+U9WXI1LJNo3VNBm5F57vH/gLlou+/Js9Vt6fyDcpOq
-						FTj1ge4O8kZZIB+YeIJXA4oEVgPKXrLpnMDQZp5xtued7cX2IWwartY78doRaurm
-						bCHlsHljJ226bteRxbr2e1P95sLDXAkhCPndoNbltAHpxQIDAQABoz4wPDAbBgNV
-						HREEFDASghBpcC0xNzItMzEtMjAtMjMwMB0GA1UdDgQWBBSZ7kmarCHOt+GFQsqa
-						F9DvVFNEmDANBgkqhkiG9w0BAQUFAAOCAQEAMXl2SEg4EN0e7qsLuBUiF3x/fP6w
-						jd1aW4RQEN5DOfgZ01AK80g1VXbIv1LTg1/Sm2x5q3BZX1oC+jsBGFUgx/F8RQVY
-						78G97m2m3DVY1D2fehCLYsDcgqVBo2LukhlBL6VbUdJhN+uJVklg5IBPI9ETxijK
-						gndnJMwOxMc+buHndoeVlAs/X55FdDs5zLMb0h4e9VbYCG1aCKWsF3ECJFhp87sv
-						0FZvRG6zm2EPpEqSV0oXoY+IPMPisIDSO5jm3Y49W50XW19KVc0oeoPpfsatzvq/
-						8J/wFQ9AjU02BhtkFOyzvJznUQqbPG+SpHHO9++dYfjF/Arkr9f8mZzLxA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <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://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Jisc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Test Mobile Authentication Proxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Webb</SurName>
-    <EmailAddress>mailto:m.webb@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Webb</SurName>
-    <EmailAddress>mailto:m.webb@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>