Change configuration name (zeppelin.war -> zeppelin.classic.war)

apache · Aug 27, 2024 · 07bdf91 · 07bdf91
1 parent 855e98c
commit 07bdf91
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/bin/common.cmd b/bin/common.cmd
@@ -33,12 +33,12 @@ if not defined ZEPPELIN_PID_DIR (
     set ZEPPELIN_PID_DIR=%ZEPPELIN_HOME%\run
 )
 
-if not defined ZEPPELIN_WAR (
+if not defined ZEPPELIN_CLASSIC_WAR (
     if exist "%ZEPPELIN_HOME%\zeppelin-web\dist" (
-        set ZEPPELIN_WAR=%ZEPPELIN_HOME%\zeppelin-web\dist
+        set ZEPPELIN_CLASSIC_WAR=%ZEPPELIN_HOME%\zeppelin-web\dist
     ) else (
         for %%d in ("%ZEPPELIN_HOME%\zeppelin-web*.war") do (
-            set ZEPPELIN_WAR=%%d
+            set ZEPPELIN_CLASSIC_WAR=%%d
         )
     )
 )

diff --git a/bin/common.sh b/bin/common.sh
@@ -41,12 +41,12 @@ if [[ -z "$ZEPPELIN_PID_DIR" ]]; then
   export ZEPPELIN_PID_DIR="${ZEPPELIN_HOME}/run"
 fi
 
-if [[ -z "${ZEPPELIN_WAR}" ]]; then
+if [[ -z "${ZEPPELIN_CLASSIC_WAR}" ]]; then
   if [[ -d "${ZEPPELIN_HOME}/zeppelin-web/dist" ]]; then
-    export ZEPPELIN_WAR="${ZEPPELIN_HOME}/zeppelin-web/dist"
+    export ZEPPELIN_CLASSIC_WAR="${ZEPPELIN_HOME}/zeppelin-web/dist"
   else
-    ZEPPELIN_WAR=$(find -L "${ZEPPELIN_HOME}" -name "zeppelin-web-[0-9]*.war")
-    export ZEPPELIN_WAR
+    ZEPPELIN_CLASSIC_WAR=$(find -L "${ZEPPELIN_HOME}" -name "zeppelin-web-[0-9]*.war")
+    export ZEPPELIN_CLASSIC_WAR
   fi
 fi
 

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
@@ -962,7 +962,7 @@ public enum ConfVars {
     ZEPPELIN_SSL_TRUSTSTORE_PATH("zeppelin.ssl.truststore.path", null),
     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_CLASSIC_WAR("zeppelin.classic.war", "zeppelin-web/dist"),
     ZEPPELIN_ANGULAR_WAR("zeppelin.angular.war", "zeppelin-web-angular/dist"),
     ZEPPELIN_WAR_TEMPDIR("zeppelin.war.tempdir", "webapps"),
     ZEPPELIN_JMX_ENABLE("zeppelin.jmx.enable", false),

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
@@ -227,7 +227,7 @@ protected void configure() {
 
     // Multiple Web UI
     final WebAppContext defaultWebApp = setupWebAppContext(contexts, zConf, zConf.getString(ConfVars.ZEPPELIN_ANGULAR_WAR), zConf.getServerContextPath());
-    final WebAppContext classicWebApp = setupWebAppContext(contexts, zConf, zConf.getString(ConfVars.ZEPPELIN_WAR), WEB_APP_CONTEXT_CLASSIC);
+    final WebAppContext classicWebApp = setupWebAppContext(contexts, zConf, zConf.getString(ConfVars.ZEPPELIN_CLASSIC_WAR), WEB_APP_CONTEXT_CLASSIC);
 
     initWebApp(defaultWebApp);
     initWebApp(classicWebApp);

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/MiniZeppelinServer.java b/zeppelin-server/src/test/java/org/apache/zeppelin/MiniZeppelinServer.java
@@ -92,13 +92,13 @@ public MiniZeppelinServer(String classname, String zeppelinConfiguration) throws
     Optional<File> webWar = getWebWar();
     Optional<File> webAngularWar = getWebAngularWar();
     if (webWar.isPresent()) {
-      zConf.setProperty(ConfVars.ZEPPELIN_WAR.getVarName(), webWar.get().getAbsolutePath());
+      zConf.setProperty(ConfVars.ZEPPELIN_CLASSIC_WAR.getVarName(), webWar.get().getAbsolutePath());
     } else {
       // some test profile does not build zeppelin-web.
       // to prevent zeppelin starting up fail, create zeppelin-web/dist directory
       File dummyWebDir = new File(zeppelinHome, "zeppelin-web" + File.separator + "dist");
       dummyWebDir.mkdirs();
-      zConf.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_WAR.getVarName(),
+      zConf.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_CLASSIC_WAR.getVarName(),
           dummyWebDir.getAbsolutePath());
     }
     if (webAngularWar.isPresent()) {

diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-common.interface.ts b/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-common.interface.ts
@@ -86,7 +86,7 @@ export interface ConfigurationsInfo {
     'zeppelin.interpreter.setting': string;
     'zeppelin.server.xxss.protection': string;
     'zeppelin.server.rpc.portRange': string;
-    'zeppelin.war': string;
+    'zeppelin.classic.war': string;
     'zeppelin.interpreter.output.limit': string;
     'zeppelin.dep.localrepo': string;
     'zeppelin.interpreter.max.poolsize': string;