[zeppelin] branch master updated: [ZEPPELIN-4573] Disable zeppelin-web.war extraction when pointing to a .war file

[zjffdu]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new caf49da  [ZEPPELIN-4573] Disable zeppelin-web.war extraction when 
pointing to a .war file
caf49da is described below

commit caf49da53dc36c53020eea78c3ed37d2cd3e5cba
Author: Muhammad-ms <59560973+muhammad...@users.noreply.github.com>
AuthorDate: Mon Jan 20 14:31:25 2020 +0000

    [ZEPPELIN-4573] Disable zeppelin-web.war extraction when pointing to a .war 
file
    
    ### What is this PR for?
    This PR disables the local extraction of zeppelin-web.war if ZEPPELIN_WAR 
is pointing to a .war file. This has 2 advantages:
    1. Skipping WAR extraction improves Zeppelin launch time
    2. It prevents any problems arising from the corruption of local 
zeppelin-web extraction
    
    ### What type of PR is it?
    Improvement
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4573
    
    THIS SOFTWARE IS CONTRIBUTED SUBJECT TO THE TERMS OF THE APACHE SOFTWARE 
FOUNDATION SOFTWARE GRANT AND CORPORATE CONTRIBUTOR LICENSE AGREEMENT VERSION 
R190612.
    
    THIS SOFTWARE IS LICENSED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND 
ANY WARRANTY OF NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE 
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
PROCUREMENT OF SUBSTITUTE GOODS [...]
    
    Author: Muhammad-ms <59560973+muhammad...@users.noreply.github.com>
    Author: Muhammad Taufiq <muhammad.tau...@morganstanley.com>
    
    Closes #3614 from Muhammad-ms/zeppelin9_war_extraction and squashes the 
following commits:
    
    d01bdd2da [Muhammad Taufiq] [ZEPPELIN-4564] Disable zeppelin-web.war 
extraction when pointing to a .war file
    4f532aad5 [Muhammad-ms] Merge pull request #1 from apache/master
---
 .../src/main/java/org/apache/zeppelin/server/ZeppelinServer.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index 966f5b5..35de52c 100644
--- 
a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ 
b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -431,6 +431,7 @@ public class ZeppelinServer extends ResourceConfig {
     } else {
       // use packaged WAR
       webApp.setWar(warFile.getAbsolutePath());
+      webApp.setExtractWAR(false);
       File warTempDirectory = new 
File(conf.getRelativeDir(ConfVars.ZEPPELIN_WAR_TEMPDIR) + contextPath);
       warTempDirectory.mkdir();
       LOG.info("ZeppelinServer Webapp path: {}", warTempDirectory.getPath());