From 3e506364af78646d3ba85cb15272c0c1b1ff93f6 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@yahoo.co.jp>
Date: Sun, 6 Dec 2015 21:53:50 +0900
Subject: [PATCH] tomcat boot 0.4.0-RC2
---
pom.xml | 2 +-
src/main/assemblies/files/fess.in.sh | 1 -
src/main/java/org/codelibs/fess/FessBoot.java | 11 -----------
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index b73efd650..c1d906b60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<cluster.runner.version>2.1.0.0</cluster.runner.version>
<!-- Tomcat -->
- <tomcat.boot.version>0.3.9</tomcat.boot.version>
+ <tomcat.boot.version>0.4.0-RC2</tomcat.boot.version>
</properties>
<build>
<finalName>fess</finalName>
diff --git a/src/main/assemblies/files/fess.in.sh b/src/main/assemblies/files/fess.in.sh
index 563ccdfab..b01831fc5 100755
--- a/src/main/assemblies/files/fess.in.sh
+++ b/src/main/assemblies/files/fess.in.sh
@@ -74,7 +74,6 @@ FESS_JAVA_OPTS="$FESS_JAVA_OPTS -Dfess.home=$FESS_HOME"
FESS_JAVA_OPTS="$FESS_JAVA_OPTS -Dfess.context.path=/$APP_NAME"
FESS_JAVA_OPTS="$FESS_JAVA_OPTS -Dfess.port=8080"
FESS_JAVA_OPTS="$FESS_JAVA_OPTS -Dfess.webapp.path=$FESS_HOME/app"
-FESS_JAVA_OPTS="$FESS_JAVA_OPTS -Dfess.webxml.path=$FESS_HOME/app/WEB-INF/web.xml"
FESS_JAVA_OPTS="$FESS_JAVA_OPTS -Dfess.temp.path=$FESS_HOME/temp"
FESS_JAVA_OPTS="$FESS_JAVA_OPTS -Dfess.log.name=$APP_NAME"
FESS_JAVA_OPTS="$FESS_JAVA_OPTS -Dfess.log.path=$FESS_HOME/logs"
diff --git a/src/main/java/org/codelibs/fess/FessBoot.java b/src/main/java/org/codelibs/fess/FessBoot.java
index 1e75c5a14..69960f735 100644
--- a/src/main/java/org/codelibs/fess/FessBoot.java
+++ b/src/main/java/org/codelibs/fess/FessBoot.java
@@ -29,8 +29,6 @@ public class FessBoot extends TomcatBoot {
private static final String FESS_TEMP_PATH = "fess.temp.path";
- private static final String FESS_WEBXML_PATH = "fess.webxml.path";
-
private static final String FESS_WEBAPP_PATH = "fess.webapp.path";
private static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
@@ -50,15 +48,6 @@ public class FessBoot extends TomcatBoot {
return super.prepareWebappPath();
}
- @Override
- protected String prepareWebXmlPath() {
- final String value = System.getProperty(FESS_WEBXML_PATH);
- if (value != null) {
- return value;
- }
- return super.prepareWebXmlPath();
- }
-
@Override
protected String getMarkDir() {
return new File(System.getProperty(JAVA_IO_TMPDIR), "fessboot").getAbsolutePath();
--
GitLab