You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2020/02/28 09:47:36 UTC
[kylin] 02/02: KYLIN-4390 Update tomcat to 7.0.100,
update server.xml and web.xml
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit ce04820a42f78b4a9e065b88fc992a0921640398
Author: shaofengshi <sh...@apache.org>
AuthorDate: Fri Feb 28 17:21:49 2020 +0800
KYLIN-4390 Update tomcat to 7.0.100, update server.xml and web.xml
---
build/deploy/server.xml | 6 ++++--
build/script/download-tomcat.sh | 22 ++++++++++++++++++++--
server/src/main/webapp/WEB-INF/web.xml | 1 +
3 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/build/deploy/server.xml b/build/deploy/server.xml
index c626bc4..aab07a0 100644
--- a/build/deploy/server.xml
+++ b/build/deploy/server.xml
@@ -82,14 +82,16 @@
style configuration. When using the APR/native implementation, the
OpenSSL style configuration is required as described in the APR/native
documentation -->
+ <!--
<Connector port="7443" protocol="org.apache.coyote.http11.Http11Protocol"
maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
keystoreFile="conf/.keystore" keystorePass="changeit"
clientAuth="false" sslProtocol="TLS" />
-
+ -->
<!-- Define an AJP 1.3 Connector on port 8009 -->
+ <!--
<Connector port="9009" protocol="AJP/1.3" redirectPort="9443" />
-
+ -->
<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
diff --git a/build/script/download-tomcat.sh b/build/script/download-tomcat.sh
index 0f580e9..205373f 100755
--- a/build/script/download-tomcat.sh
+++ b/build/script/download-tomcat.sh
@@ -76,11 +76,29 @@ cp tomcat-ext/target/kylin-tomcat-ext-${version}.jar build/tomcat/lib/kylin-tomc
chmod 644 build/tomcat/lib/kylin-tomcat-ext-${version}.jar
# add ROOT application
-mkdir -p build/tomcat/webapps/ROOT
+mkdir -p build/tomcat/webapps/ROOT/WEB-INF/
cat > build/tomcat/webapps/ROOT/index.html <<EOL
<html>
<head>
<meta http-equiv="refresh" content="1;url=kylin">
</head>
</html>
-EOL
\ No newline at end of file
+EOL
+
+cat > build/tomcat/webapps/ROOT/WEB-INF/web.xml <<EOL
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <display-name>ROOT</display-name>
+ <absolute-ordering />
+ <welcome-file-list>
+ <welcome-file>/index.html</welcome-file>
+ </welcome-file-list>
+
+ <distributable />
+</web-app>
+EOL
diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
index cbce758..a609ca2 100644
--- a/server/src/main/webapp/WEB-INF/web.xml
+++ b/server/src/main/webapp/WEB-INF/web.xml
@@ -20,6 +20,7 @@
version="2.5">
<display-name>Kylin REST Service</display-name>
+ <absolute-ordering />
<welcome-file-list>
<welcome-file>/index.html</welcome-file>