inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-10 14:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting the revert, to get the changes done for MNT-23785 back on master, after verifying that test failures are unrelated to them.

Browse Source 
Revert "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 c9182e5ea4576ce52f873f23bde2539d0df8c445.
This commit is contained in:
mstrankowski
2023-10-04 12:39:22 +02:00
parent f983e2df5b
commit d14223a423
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml
View File

@@ -188,7 +188,7 @@
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
<requestHandler name="/replication" class="org.alfresco.solr.handler.AlfrescoReplicationHandler">
<requestHandler name="/replication" class="solr.ReplicationHandler">
<lst name="master">
<str name="replicateAfter">commit</str>
<str name="confFiles">schema.xml</str>

2
search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml
View File

@@ -192,7 +192,7 @@
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
<requestHandler name="/replication" class="org.alfresco.solr.handler.AlfrescoReplicationHandler">
<requestHandler name="/replication" class="solr.ReplicationHandler">
<lst name="slave">
<str name="masterUrl">{masterURL}</str>
<str name="pollInterval">00:00:02</str>

4
search-services/packaging/src/docker/search_config_setup.sh
View File

@@ -18,7 +18,7 @@ LOG_PROPERTIES=$PWD/logs/log4j.properties
if [[ $REPLICATION_TYPE == "master" ]]; then
findStringMaster='<requestHandler name="\/replication" class="org\.alfresco\.solr\.handler\.AlfrescoReplicationHandler">'
findStringMaster='<requestHandler name="\/replication" class="solr\.ReplicationHandler">'
replaceStringMaster="\n\t<lst name=\"master\"> \n"
@@ -63,7 +63,7 @@ if [[ $REPLICATION_TYPE == "slave" ]]; then
REPLICATION_POLL_INTERVAL=00:00:30
fi
sed -i 's/<requestHandler name="\/replication" class="org\.alfresco\.solr\.handler\.AlfrescoReplicationHandler">/<requestHandler name="\/replication" class="org\.alfresco\.solr\.handler\.AlfrescoReplicationHandler">\
sed -i 's/<requestHandler name="\/replication" class="solr\.ReplicationHandler">/<requestHandler name="\/replication" class="solr\.ReplicationHandler">\
<lst name="slave">\
<str name="masterUrl">'$REPLICATION_MASTER_PROTOCOL':\/\/'$REPLICATION_MASTER_HOST':'$REPLICATION_MASTER_PORT'\/solr\/${solr.core.name}<\/str>\
<str name="pollInterval">'$REPLICATION_POLL_INTERVAL'<\/str>\