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:34 UTC
[kylin] branch 3.0.x updated (ef1e63c -> ce04820)
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a change to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/kylin.git.
from ef1e63c statement cache eviction invalidation base on time
new a91ae52 upgrade tomcat to 7.0.100
new ce04820 KYLIN-4390 Update tomcat to 7.0.100, update server.xml and web.xml
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build/deploy/server.xml | 6 ++++--
build/script/download-tomcat.sh | 26 ++++++++++++++++++++++----
pom.xml | 2 +-
server/src/main/webapp/WEB-INF/web.xml | 1 +
4 files changed, 28 insertions(+), 7 deletions(-)
[kylin] 02/02: KYLIN-4390 Update tomcat to 7.0.100,
update server.xml and web.xml
Posted by sh...@apache.org.
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>
[kylin] 01/02: upgrade tomcat to 7.0.100
Posted by sh...@apache.org.
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 a91ae526af54ed31874373b2165993aa632bfab9
Author: shaofengshi <sh...@apache.org>
AuthorDate: Tue Feb 25 18:05:07 2020 +0800
upgrade tomcat to 7.0.100
---
build/script/download-tomcat.sh | 4 ++--
pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/script/download-tomcat.sh b/build/script/download-tomcat.sh
index 4f348f9..0f580e9 100755
--- a/build/script/download-tomcat.sh
+++ b/build/script/download-tomcat.sh
@@ -27,8 +27,8 @@ if [[ `uname -a` =~ "Darwin" ]]; then
alias md5cmd="md5 -q"
fi
-tomcat_pkg_version="7.0.91"
-tomcat_pkg_md5="8bfbb358b51f90374067879f8db1e91c"
+tomcat_pkg_version="7.0.100"
+tomcat_pkg_md5="79be4ba5a6e770730a4be3d5cb3c7862"
if [ ! -f "build/apache-tomcat-${tomcat_pkg_version}.tar.gz" ]
then
diff --git a/pom.xml b/pom.xml
index fb040f4..9affa47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,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.91</tomcat.version>
+ <tomcat.version>7.0.100</tomcat.version>
<t-digest.version>3.1</t-digest.version>
<freemarker.version>2.3.23</freemarker.version>
<rocksdb.version>5.9.2</rocksdb.version>