resolve conflicts and merge

1 files changed, 0 insertions, 110 deletions

diff --git a/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml
deleted file mode 100644
index f512d420..00000000
--- a/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.fucape.br/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fucape.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:Description>
-        <mdui:Description xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fucape.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.fucape.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDkjCCAnoCAQAwDQYJKoZIhvcNAQEFBQAwgY4xDzANBgNVBAoTBkZVQ0FQRTEL
-MAkGA1UECxMCVEkxHTAbBgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYD
-VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
-QlIxFzAVBgNVBAMTDmNhZmUuZnVjYXBlLmJyMB4XDTE0MDcyMTE0MTQzMloXDTE3
-MDcyMDE0MTQzMlowgY4xDzANBgNVBAoTBkZVQ0FQRTELMAkGA1UECxMCVEkxHTAb
-BgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcw
-FQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNh
-ZmUuZnVjYXBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuelJ
-x+b7r1a3vz6ppasqWtnuIEm4peG1175sZV5n4Oi1Ue2l3RLaFIQCuN3QgMOX9aRw
-bHdyPcmVMx00V6h6+O5d9jEgQMAKmNaaZnk+Np0g9foDhas88QqGzOSiuVqqfM2t
-xKUeCrmtpcWfkA3m45bMqsJn6dXqw2ab1aAE4Q1IomGbEaKihPXeYjiTmUV/1Hi0
-Y1hNRA61k2nitSWQejfoWpwLtK70k+Puk9ATckYzEGxwnAdi9weymfGEvS/EOyf/
-SPJA9guZLqk1hI/+CuiBzJhtZCS4pKEHH+QLMCzUL9jkEoANkZdbRPrPiul9iQJ6
-eFiY+E1qLkm3UjAYDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBDrq/iLpDIlO2N
-88cHM2THmN2Dxn7ZuQRr19FJCIirSSky4GOIsSB/14+BdR4eQoEbyEs5Uvm3ieF9
-61fcpTjzz++aO5InnG7lHizf7UWr9nzF2fU2IkGLwQxVfeaHDistKOK76rnI95mu
-E4OdkYGgyf+LHp/aUhHln+NTuJQpxrXdtXsIcPa3iZQqKRmeJRr1lOL8yyxtI/40
-dHLpEb2GiAkHQNRQKTTCQg+yOAk/nWBTzmu+TBpkzC5TnO3uDVKxdmt5T3OuWjdQ
-qMubODGxkJq4vSSeMKiYsZ5fRXyphXm3D/XUeBWkDNpllO0vCbW9BomAeLeAUJgj
-zD1vw9HJ
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.fucape.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.fucape.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.fucape.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.fucape.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.fucape.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.fucape.br/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fucape.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDkjCCAnoCAQAwDQYJKoZIhvcNAQEFBQAwgY4xDzANBgNVBAoTBkZVQ0FQRTEL
-MAkGA1UECxMCVEkxHTAbBgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYD
-VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
-QlIxFzAVBgNVBAMTDmNhZmUuZnVjYXBlLmJyMB4XDTE0MDcyMTE0MTQzMloXDTE3
-MDcyMDE0MTQzMlowgY4xDzANBgNVBAoTBkZVQ0FQRTELMAkGA1UECxMCVEkxHTAb
-BgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcw
-FQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNh
-ZmUuZnVjYXBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuelJ
-x+b7r1a3vz6ppasqWtnuIEm4peG1175sZV5n4Oi1Ue2l3RLaFIQCuN3QgMOX9aRw
-bHdyPcmVMx00V6h6+O5d9jEgQMAKmNaaZnk+Np0g9foDhas88QqGzOSiuVqqfM2t
-xKUeCrmtpcWfkA3m45bMqsJn6dXqw2ab1aAE4Q1IomGbEaKihPXeYjiTmUV/1Hi0
-Y1hNRA61k2nitSWQejfoWpwLtK70k+Puk9ATckYzEGxwnAdi9weymfGEvS/EOyf/
-SPJA9guZLqk1hI/+CuiBzJhtZCS4pKEHH+QLMCzUL9jkEoANkZdbRPrPiul9iQJ6
-eFiY+E1qLkm3UjAYDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBDrq/iLpDIlO2N
-88cHM2THmN2Dxn7ZuQRr19FJCIirSSky4GOIsSB/14+BdR4eQoEbyEs5Uvm3ieF9
-61fcpTjzz++aO5InnG7lHizf7UWr9nzF2fU2IkGLwQxVfeaHDistKOK76rnI95mu
-E4OdkYGgyf+LHp/aUhHln+NTuJQpxrXdtXsIcPa3iZQqKRmeJRr1lOL8yyxtI/40
-dHLpEb2GiAkHQNRQKTTCQg+yOAk/nWBTzmu+TBpkzC5TnO3uDVKxdmt5T3OuWjdQ
-qMubODGxkJq4vSSeMKiYsZ5fRXyphXm3D/XUeBWkDNpllO0vCbW9BomAeLeAUJgj
-zD1vw9HJ
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.fucape.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.fucape.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fucape.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.fucape.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Alan Ruan</md:SurName>
-    <md:EmailAddress>alan@fucape.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>