From f983e2df5bb7839d0df59f61b35028f9eaa9709a Mon Sep 17 00:00:00 2001 From: mstrankowski Date: Wed, 4 Oct 2023 10:01:16 +0200 Subject: [PATCH] Revert "MNT-23785: Replacing removed class references from org.alfresco.solr.handler.AlfrescoReplicationHandler to solr.ReplicationHandler. It seems that during the process of class removal, not all instances of usage have been addressed. There seems to be no such issue for other removed classes mentioned in 00001-solr-content-store-removal.md" This reverts commit bf73385bd16fb00b5dca0602e0d94635368720d6. --- .../src/test/resources/test-files/master/conf/solrconfig.xml | 2 +- .../src/test/resources/test-files/slave/conf/solrconfig.xml | 2 +- search-services/packaging/src/docker/search_config_setup.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml b/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml index c52520953..caca72a0e 100644 --- a/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml +++ b/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml @@ -188,7 +188,7 @@ - + commit schema.xml diff --git a/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml b/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml index dbdff2aec..b4fe36741 100644 --- a/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml +++ b/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml @@ -192,7 +192,7 @@ - + {masterURL} 00:00:02 diff --git a/search-services/packaging/src/docker/search_config_setup.sh b/search-services/packaging/src/docker/search_config_setup.sh index 75e4a4e30..89688e905 100644 --- a/search-services/packaging/src/docker/search_config_setup.sh +++ b/search-services/packaging/src/docker/search_config_setup.sh @@ -18,7 +18,7 @@ LOG_PROPERTIES=$PWD/logs/log4j.properties if [[ $REPLICATION_TYPE == "master" ]]; then - findStringMaster='' + findStringMaster='' replaceStringMaster="\n\t \n" @@ -63,7 +63,7 @@ if [[ $REPLICATION_TYPE == "slave" ]]; then REPLICATION_POLL_INTERVAL=00:00:30 fi - sed -i 's//\ + sed -i 's//\ \ '$REPLICATION_MASTER_PROTOCOL':\/\/'$REPLICATION_MASTER_HOST':'$REPLICATION_MASTER_PORT'\/solr\/${solr.core.name}<\/str>\ '$REPLICATION_POLL_INTERVAL'<\/str>\