0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2636 use fess.var.path as base dir

Browse source
This commit is contained in:
Shinsuke Sugaya 2022-03-17 20:33:30 +09:00
parent 4cb04eda29
commit db8fc1cab8
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/org/codelibs/fess/FessBoot.java
View file

@ -37,6 +37,8 @@ public class FessBoot extends TomcatBoot {
private static final String FESS_TEMP_PATH = "fess.temp.path";
private static final String FESS_VAR_PATH = "fess.var.path";
private static final String FESS_WEBAPP_PATH = "fess.webapp.path";
private static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
@ -74,7 +76,10 @@ public class FessBoot extends TomcatBoot {
final TomcatBoot tomcatBoot = new FessBoot(getPort(), getContextPath()) //
.useTldDetect(); // for JSP
if (tempPath != null) {
final String varPath = System.getProperty(FESS_VAR_PATH);
if (varPath != null) {
tomcatBoot.atBaseDir(new File(varPath, "webapp").getAbsolutePath());
} else if (tempPath != null) {
tomcatBoot.atBaseDir(new File(tempPath, "webapp").getAbsolutePath());
}
final String tomcatConfigPath = getTomcatConfigPath();
@ -90,8 +95,8 @@ public class FessBoot extends TomcatBoot {
op.replace("fess.log.path", fessLogPath.replace("\\", "/"));
}).asYouLikeIt(resource -> {
final Host host = resource.getHost();
if (host instanceof StandardHost) {
((StandardHost) host).setErrorReportValveClass(SuppressErrorReportValve.class.getName());
if (host instanceof StandardHost standardHost) {
standardHost.setErrorReportValveClass(SuppressErrorReportValve.class.getName());
}
}).useTldDetect(jarName -> (jarName.contains("jstl") || jarName.contains("lasta-taglib"))).asDevelopment(isNoneEnv()).bootAwait();
}