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

Merge pull request #1565 from Alfresco/fix/ACS-3878_fix_token_replacement

Browse Source 
ACS-3878 Fix token replacement
This commit is contained in:
Damian Ujma
2022-11-03 15:59:50 +01:00
committed by GitHub
parent dbcaa2ccb7 cdeb0db5e1
commit 0e20c69ac9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
search-services/packaging/config.properties
View File

@@ -11,4 +11,6 @@ ${line.separator}set LOG4J_CONFIG=file:!SOLR_LOGS_DIR!\\log4j.properties
alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
${line.separator}SOLR_OPTS="$SOLR_OPTS -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000 -Ddisable.configEdit=true"
alfresco.search.config.win=REM Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
${line.separator}set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000 -Ddisable.configEdit=true
${line.separator}set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000 -Ddisable.configEdit=true
solr.gc.token=#GC_TUNE="-XX:NewRatio=3 -XX:SurvivorRatio=4 etc.
solr.gc.token.win=REM set GC_TUNE=-XX:NewRatio=3 -XX:SurvivorRatio=4 etc.

4
search-services/packaging/pom.xml
View File

@@ -214,10 +214,10 @@
<replace token="GC logging" value="GC logging${line.separator}${alfresco.gc.logs.win}" dir="${solr.directory}">
<include name="**/bin/solr.in.cmd" />
</replace>
<replace token="#GC_TUNE=&quot;-XX:NewRatio=3 -XX:SurvivorRatio=4 etc." value="${alfresco.gc.tune}" dir="${solr.directory}">
<replace token="${solr.gc.token}" value="${alfresco.gc.tune}" dir="${solr.directory}">
<include name="**/bin/solr.in.sh" />
</replace>
<replace token="REM set GC_TUNE=-XX:NewRatio=3 -XX:SurvivorRatio=4 etc." value="${alfresco.gc.tune.win}" dir="${solr.directory}">
<replace token="${solr.gc.token.win}" value="${alfresco.gc.tune.win}" dir="${solr.directory}">
<include name="**/bin/solr.in.cmd" />
</replace>
<replace token="# Anything you add to the SOLR_OPTS" value="${alfresco.search.config}${line.separator}${line.separator}# Anything you add to the SOLR_OPTS" dir="${solr.directory}">