소스 검색

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

Shinsuke Sugaya 3 년 전
부모
커밋
a86882e02a
1개의 변경된 파일8개의 추가작업 그리고 3개의 파일을 삭제
  1. 8 3
      src/main/java/org/codelibs/fess/FessBoot.java

+ 8 - 3
src/main/java/org/codelibs/fess/FessBoot.java

@@ -37,6 +37,8 @@ public class FessBoot extends TomcatBoot {
 
 
     private static final String FESS_TEMP_PATH = "fess.temp.path";
     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 FESS_WEBAPP_PATH = "fess.webapp.path";
 
 
     private static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
     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()) //
         final TomcatBoot tomcatBoot = new FessBoot(getPort(), getContextPath()) //
                 .useTldDetect(); // for JSP
                 .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());
             tomcatBoot.atBaseDir(new File(tempPath, "webapp").getAbsolutePath());
         }
         }
         final String tomcatConfigPath = getTomcatConfigPath();
         final String tomcatConfigPath = getTomcatConfigPath();
@@ -90,8 +95,8 @@ public class FessBoot extends TomcatBoot {
             op.replace("fess.log.path", fessLogPath.replace("\\", "/"));
             op.replace("fess.log.path", fessLogPath.replace("\\", "/"));
         }).asYouLikeIt(resource -> {
         }).asYouLikeIt(resource -> {
             final Host host = resource.getHost();
             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();
         }).useTldDetect(jarName -> (jarName.contains("jstl") || jarName.contains("lasta-taglib"))).asDevelopment(isNoneEnv()).bootAwait();
     }
     }