KYLIN-2361 Upgrade Tomcat 8.5.9
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2b60ac6a Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2b60ac6a Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2b60ac6a Branch: refs/heads/master Commit: 2b60ac6a42741ca70d63e6680a0fbe9aeed7d46e Parents: a058bfb Author: Billy Liu <billy...@apache.org> Authored: Wed Jan 18 17:19:04 2017 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Sat Feb 4 11:42:02 2017 +0800 ---------------------------------------------------------------------- build/script/download-tomcat.sh | 8 ++++---- pom.xml | 2 +- .../java/org/apache/kylin/rest/DebugTomcat.java | 16 +++++++++------- .../kylin/ext/CustomizedWebappClassloader.java | 5 ++--- 4 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/2b60ac6a/build/script/download-tomcat.sh ---------------------------------------------------------------------- diff --git a/build/script/download-tomcat.sh b/build/script/download-tomcat.sh index b3aa509..bdfe351 100755 --- a/build/script/download-tomcat.sh +++ b/build/script/download-tomcat.sh @@ -27,19 +27,19 @@ if [[ `uname -a` =~ "Darwin" ]]; then alias md5cmd="md5 -q" fi -tomcat_pkg_version="7.0.69" -tomcat_pkg_md5="10a071e5169a1a8b14ff35a0ad181052" +tomcat_pkg_version="8.5.9" +tomcat_pkg_md5="b41270a64b7774c964e4bec813eea2ed" if [ ! -f "build/apache-tomcat-${tomcat_pkg_version}.tar.gz" ] then echo "no binary file found" - wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat_pkg_version}/bin/apache-tomcat-${tomcat_pkg_version}.tar.gz || echo "Download tomcat failed" + wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat_pkg_version}/bin/apache-tomcat-${tomcat_pkg_version}.tar.gz || echo "Download tomcat failed" else if [ `md5cmd build/apache-tomcat-${tomcat_pkg_version}.tar.gz | awk '{print $1}'` != "${tomcat_pkg_md5}" ] then echo "md5 check failed" rm build/apache-tomcat-${tomcat_pkg_version}.tar.gz - wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat_pkg_version}/bin/apache-tomcat-${tomcat_pkg_version}.tar.gz || echo "download tomcat failed" + wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat_pkg_version}/bin/apache-tomcat-${tomcat_pkg_version}.tar.gz || echo "download tomcat failed" fi fi unalias md5cmd http://git-wip-us.apache.org/repos/asf/kylin/blob/2b60ac6a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bf33e07..b82eee2 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ <cglib.version>3.2.4</cglib.version> <supercsv.version>2.4.0</supercsv.version> <cors.version>2.5</cors.version> - <tomcat.version>7.0.69</tomcat.version> + <tomcat.version>8.5.9</tomcat.version> <t-digest.version>3.1</t-digest.version> <!-- REST Service --> http://git-wip-us.apache.org/repos/asf/kylin/blob/2b60ac6a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java index 3461e1d..1b47f79 100644 --- a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java +++ b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java @@ -21,11 +21,13 @@ package org.apache.kylin.rest; import org.apache.catalina.Context; import org.apache.catalina.core.AprLifecycleListener; import org.apache.catalina.core.StandardServer; -import org.apache.catalina.deploy.ErrorPage; import org.apache.catalina.startup.Tomcat; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.util.Shell; import org.apache.kylin.common.KylinConfig; +import org.apache.tomcat.JarScanFilter; +import org.apache.tomcat.JarScanType; +import org.apache.tomcat.util.descriptor.web.ErrorPage; import java.io.File; import java.lang.reflect.Field; @@ -127,12 +129,12 @@ public class DebugTomcat { notFound.setLocation("/index.html"); webContext.addErrorPage(notFound); webContext.addWelcomeFile("index.html"); -// webContext.getJarScanner().setJarScanFilter(new JarScanFilter() { -// @Override -// public boolean check(JarScanType arg0, String arg1) { -// return false; -// } -// }); + webContext.getJarScanner().setJarScanFilter(new JarScanFilter() { + @Override + public boolean check(JarScanType arg0, String arg1) { + return false; + } + }); // tomcat start tomcat.start(); http://git-wip-us.apache.org/repos/asf/kylin/blob/2b60ac6a/tomcat-ext/src/main/java/org/apache/kylin/ext/CustomizedWebappClassloader.java ---------------------------------------------------------------------- diff --git a/tomcat-ext/src/main/java/org/apache/kylin/ext/CustomizedWebappClassloader.java b/tomcat-ext/src/main/java/org/apache/kylin/ext/CustomizedWebappClassloader.java index 816601f..f241865 100644 --- a/tomcat-ext/src/main/java/org/apache/kylin/ext/CustomizedWebappClassloader.java +++ b/tomcat-ext/src/main/java/org/apache/kylin/ext/CustomizedWebappClassloader.java @@ -45,7 +45,7 @@ public class CustomizedWebappClassloader extends ParallelWebappClassLoader { * @param name class name * @return true if the class should be filtered */ - protected boolean filter(String name) { + protected boolean filter(String name, boolean isClassName) { if (name == null) return false; @@ -62,7 +62,6 @@ public class CustomizedWebappClassloader extends ParallelWebappClassLoader { return true; } - //return super.filter(name, isClassName); - return false; + return super.filter(name, isClassName); } }
