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

tomcat boot 0.4.0-RC2

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-12-06 21:53:50 +09:00
parent d0889a5798
commit 3e506364af
3 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -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>

1
src/main/assemblies/files/fess.in.sh
View file

@ -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"

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

@ -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();