resolve conflicts and merge

1 files changed, 0 insertions, 75 deletions

diff --git a/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml b/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml
deleted file mode 100644
index f067f0d1..00000000
--- a/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.wavelan.su.se/Shibboleth.sso">
-  <md: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">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.wavelan.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.wavelan.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wavelan-prod-sp1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wavelan-prod-sp1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDEjCCAfqgAwIBAgIJANU7a0lt6+5VMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXdhdmVsYW4tcHJvZC1zcDEuaXQuc3Uuc2UwHhcNMDkwNzI4MTA0MzA0WhcN
-MTkwNzI2MTA0MzA0WjAkMSIwIAYDVQQDExl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7TYTIfV7kI7g+TIi
-x6tXtusozDHOK4sXm2StU3soSFb+WbQAyVsqDV1oqGmMUEULyPYwwo7MiXhZinii
-pMxuhiUbjc414efx5Il+etQekzkGFWnEPMCaDKt0oRKd+IgIJsS2InqvCmIKr2e9
-Hn0/z36E7enobEJFundduLIrHnAgLvbVZBekLI00293v96JHUjYshhy0i1uCtAuh
-oa+QzzbVSjZNOpIoeGMno/h4+QilRquoLuYWPjVT0Jujqrb+nN4CsebV4hAwwFun
-P1J+fVXI+JSs/H1QJqe+2fIGIZCDsUBR3xHVp7FQ9y+4b/5k9LQ8wJgamcbToC64
-8JJ3pwIDAQABo0cwRTAkBgNVHREEHTAbghl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMB0GA1UdDgQWBBQOxqZr1tIfKe06aYoCDaMLu/t43zANBgkqhkiG9w0BAQUF
-AAOCAQEAaWCjso7/vVsDu4c6xbxKB0DoRwhGqTRC70SXC76n60CwmJNJdBP2QqZN
-B8XukYsJGr/Dkr/jO4qqVc1xi9Qfksyft6LpKdWm3mSPNL5m5i5snlukyFnYvz6m
-oaYb5vSBRyoHuz/nN979Qm6XFx+rl7sjOUhIklTLJkM0ghJRrOa137GEGdwYKmCH
-mVBY3XZTlatsogAojbHN8656Mps1cH+FzZhTYMTA+1ta4TT9Q4mTD5W/xM2k4Ldy
-xjQvMgNsCbY2jk0mgupDVYcZwa82ODKdbAMC6dFlGGHn7I8+IW05jVRrLtfR7lt7
-m/XvKye561mB0W1mWHdByCY8Q2jIWQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wavelan-prod-sp1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wavelan-prod-sp1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDEjCCAfqgAwIBAgIJANU7a0lt6+5VMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXdhdmVsYW4tcHJvZC1zcDEuaXQuc3Uuc2UwHhcNMDkwNzI4MTA0MzA0WhcN
-MTkwNzI2MTA0MzA0WjAkMSIwIAYDVQQDExl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7TYTIfV7kI7g+TIi
-x6tXtusozDHOK4sXm2StU3soSFb+WbQAyVsqDV1oqGmMUEULyPYwwo7MiXhZinii
-pMxuhiUbjc414efx5Il+etQekzkGFWnEPMCaDKt0oRKd+IgIJsS2InqvCmIKr2e9
-Hn0/z36E7enobEJFundduLIrHnAgLvbVZBekLI00293v96JHUjYshhy0i1uCtAuh
-oa+QzzbVSjZNOpIoeGMno/h4+QilRquoLuYWPjVT0Jujqrb+nN4CsebV4hAwwFun
-P1J+fVXI+JSs/H1QJqe+2fIGIZCDsUBR3xHVp7FQ9y+4b/5k9LQ8wJgamcbToC64
-8JJ3pwIDAQABo0cwRTAkBgNVHREEHTAbghl3YXZlbGFuLXByb2Qtc3AxLml0LnN1
-LnNlMB0GA1UdDgQWBBQOxqZr1tIfKe06aYoCDaMLu/t43zANBgkqhkiG9w0BAQUF
-AAOCAQEAaWCjso7/vVsDu4c6xbxKB0DoRwhGqTRC70SXC76n60CwmJNJdBP2QqZN
-B8XukYsJGr/Dkr/jO4qqVc1xi9Qfksyft6LpKdWm3mSPNL5m5i5snlukyFnYvz6m
-oaYb5vSBRyoHuz/nN979Qm6XFx+rl7sjOUhIklTLJkM0ghJRrOa137GEGdwYKmCH
-mVBY3XZTlatsogAojbHN8656Mps1cH+FzZhTYMTA+1ta4TT9Q4mTD5W/xM2k4Ldy
-xjQvMgNsCbY2jk0mgupDVYcZwa82ODKdbAMC6dFlGGHn7I8+IW05jVRrLtfR7lt7
-m/XvKye561mB0W1mWHdByCY8Q2jIWQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.wavelan.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>