This is an automated email from the ASF dual-hosted git repository.
chengpan 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 ac48cc2db1 [ZEPPELIN-6099] Fix default ZEPPELIN_ANGULAR_WAR value
ac48cc2db1 is described below
commit ac48cc2db1b55257230cae2c382961da2a9cf80d
Author: ChanHo Lee <chanho0...@yonsei.ac.kr>
AuthorDate: Sun Sep 22 21:28:58 2024 +0900
[ZEPPELIN-6099] Fix default ZEPPELIN_ANGULAR_WAR value
### What is this PR for?
The misconfigured default `ZEPPELIN_ANGULAR_WAR` value is causing the
failure to load the new UI web application files on development environment.
The new UI web apps are built into
`ZEPPELIN_HOME/zeppelin-web-angular/dist/zeppelin`, but the default value lacks
the `/zeppelin` postfix.
When developers run Zeppelin with `ZeppelinServer.main` method, it defaults
to the incorrect `ZEPPELIN_ANGULAR_WAR` value, leading to failure to load the
web apps.
*Note: This issue does not occur when Zeppelin is run using shell scripts
in the `bin`, as they correctly set the `ZEPPELIN_ANGULAR_WAR` value.*
### What type of PR is it?
Bug Fix
### Todos
* [ ] - Task
### What is the Jira issue?
* Open an issue on Jira https://issues.apache.org/jira/browse/ZEPPELIN/6099
### How should this be tested?
* Build Zeppelin
* Run Zeppelin using `ZeppelinServer.main` method and connect to
`http://localhost:8080`
### Questions:
* Does the license files need to update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Closes #4840 from tbonelee/fix-default-web-angular-config.
Signed-off-by: Cheng Pan <cheng...@apache.org>
---
.../src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index 566242145f..52aa33f737 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -963,7 +963,7 @@ public class ZeppelinConfiguration {
ZEPPELIN_SSL_TRUSTSTORE_TYPE("zeppelin.ssl.truststore.type", null),
ZEPPELIN_SSL_TRUSTSTORE_PASSWORD("zeppelin.ssl.truststore.password", null),
ZEPPELIN_WAR("zeppelin.war", "zeppelin-web/dist"),
- ZEPPELIN_ANGULAR_WAR("zeppelin.angular.war", "zeppelin-web-angular/dist"),
+ ZEPPELIN_ANGULAR_WAR("zeppelin.angular.war",
"zeppelin-web-angular/dist/zeppelin"),
ZEPPELIN_WAR_TEMPDIR("zeppelin.war.tempdir", "webapps"),
ZEPPELIN_JMX_ENABLE("zeppelin.jmx.enable", false),
ZEPPELIN_JMX_PORT("zeppelin.jmx.port", 9996),
