Explorar el Código

update tomcat-boot

Shinsuke Sugaya hace 9 años
padre
commit
762a3043bd
Se han modificado 2 ficheros con 5 adiciones y 11 borrados
  1. 5 1
      pom.xml
  2. 0 10
      src/main/java/org/codelibs/fess/FessBoot.java

+ 5 - 1
pom.xml

@@ -67,7 +67,7 @@
 		<cluster.runner.version>2.3.0.0</cluster.runner.version>
 		<cluster.runner.version>2.3.0.0</cluster.runner.version>
 
 
 		<!-- Tomcat -->
 		<!-- Tomcat -->
-		<tomcat.boot.version>0.5.0-RC1</tomcat.boot.version>
+		<tomcat.boot.version>0.5.0-RC2</tomcat.boot.version>
 
 
 		<!-- DEB & RPM build -->
 		<!-- DEB & RPM build -->
 		<packaging.fess.home.dir>/usr/share/fess</packaging.fess.home.dir>
 		<packaging.fess.home.dir>/usr/share/fess</packaging.fess.home.dir>
@@ -1242,6 +1242,10 @@
 					<groupId>org.apache.tomcat</groupId>
 					<groupId>org.apache.tomcat</groupId>
 					<artifactId>tomcat-util-scan</artifactId>
 					<artifactId>tomcat-util-scan</artifactId>
 				</exclusion>
 				</exclusion>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>tomcat-juli</artifactId>
+				</exclusion>
 			</exclusions>
 			</exclusions>
 		</dependency>
 		</dependency>
 
 

+ 0 - 10
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();
         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
     //                                                                        main
     //                                                                        ============
     //                                                                        ============