From 762a3043bdf567033ac501a7834058a872d2988e Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@yahoo.co.jp>
Date: Sun, 24 Jul 2016 21:34:05 +0900
Subject: [PATCH] update tomcat-boot
---
pom.xml | 6 +++++-
src/main/java/org/codelibs/fess/FessBoot.java | 10 ----------
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index c744e5dfb..36ad1dfa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
<cluster.runner.version>2.3.0.0</cluster.runner.version>
<!-- Tomcat -->
- <tomcat.boot.version>0.5.0-RC1</tomcat.boot.version>
+ <tomcat.boot.version>0.5.0-RC2</tomcat.boot.version>
<!-- DEB & RPM build -->
<packaging.fess.home.dir>/usr/share/fess</packaging.fess.home.dir>
@@ -1242,6 +1242,10 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-util-scan</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/src/main/java/org/codelibs/fess/FessBoot.java b/src/main/java/org/codelibs/fess/FessBoot.java
index f1994cd1c..bfd14fb93 100644
--- a/src/main/java/org/codelibs/fess/FessBoot.java
+++ b/src/main/java/org/codelibs/fess/FessBoot.java
@@ -59,16 +59,6 @@ public class FessBoot extends TomcatBoot {
return new File(System.getProperty(JAVA_IO_TMPDIR), "fessboot").getAbsolutePath();
}
- @Override
- protected void reflectConfigToServer(Tomcat server, Connector connector, Properties props) { // you can override
- super.reflectConfigToServer(server, connector, props);
- final String bindAddress = props.getProperty("tomcat.bindAddress");
- if (bindAddress != null) {
- info(" tomcat.bindAddress = " + bindAddress);
- connector.setProperty("address", bindAddress);
- }
- }
-
// ===================================================================================
// main
// ============
--
GitLab