inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "SEARCH-467: Windows solr.in.cmd line feed fix"

Browse Source 
This reverts commit 804b9ec5c7.
This commit is contained in:
Gethin James
2017-06-09 13:59:03 +02:00
parent 804b9ec5c7
commit c5850e9dac
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/config.properties
+5 -3
View File
@@ -3,8 +3,10 @@ alfresco.search.ssl.need=needclientauth" default="true"
alfresco.search.logs=SOLR_LOGS_DIR=../../logs\
${line.separator}LOG4J_PROPS=$SOLR_LOGS_DIR/log4j.properties
alfresco.gc.logs=GC_LOG_OPTS=""
alfresco.gc.logs.win=\u000D\u000Aset "GC_LOG_OPTS= "
alfresco.search.logs.win=set SOLR_LOGS_DIR=..\\..\\logs\u000D\u000Aset LOG4J_CONFIG=!SOLR_LOGS_DIR!\\log4j.properties
alfresco.gc.logs.win=set "GC_LOG_OPTS= "
alfresco.search.logs.win=set SOLR_LOGS_DIR=..\\..\\logs\
${line.separator}set LOG4J_CONFIG=!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"
alfresco.search.config.win=REM Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\u000D\u000Aset SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000\u000D\u000A\u000D\u000A
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
packaging/pom.xml
+2 -2
View File
@@ -165,13 +165,13 @@
<replace token= "(java9)" value="(java9)${line.separator}${alfresco.gc.logs}" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.sh"/>
</replace>
<replace token= "GC logging" value="GC logging${alfresco.gc.logs.win}" dir="target/solr-${solr.version}">
<replace token= "GC logging" value="GC logging${line.separator}${alfresco.gc.logs.win}" dir="target/solr-${solr.version}">
<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="target/solr-${solr.version}">
<include name="**/bin/solr.in.sh"/>
</replace>
<replace token= "REM Anything you add to the SOLR_OPTS" value="${alfresco.search.config.win}REM Anything you add to the SOLR_OPTS" dir="target/solr-${solr.version}">
<replace token= "REM Anything you add to the SOLR_OPTS" value="${alfresco.search.config.win}${line.separator}${line.separator}REM Anything you add to the SOLR_OPTS" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.cmd"/>
</replace>
<replace token= "${alfresco.search.ssl.need.token}" value="${alfresco.search.ssl.need}" dir="target/solr-${solr.version}">
packaging/src/assembly/solr-distribution.xml
-7
View File
@@ -17,13 +17,6 @@
<outputDirectory>.</outputDirectory>
<includes>
<include>solr.in.sh</include>
</includes>
</fileSet>
<fileSet>
<directory>target/solr-${solr.version}/bin</directory>
<outputDirectory>.</outputDirectory>
<lineEnding>windows</lineEnding>
<includes>
<include>solr.in.cmd</include>
</includes>
</fileSet>