Rename zeppelin-web-angular to zeppelin-web

.github/workflows/frontend.yml

@@ -60,7 +60,7 @@ jobs:
         if: always()
         run: if [ -d "logs" ]; then cat logs/*; fi
 
-  run-tests-in-zeppelin-web-angular:
+  run-tests-in-zeppelin-web:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
@@ -84,7 +84,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-zeppelin-
       - name: Run headless test
-        run: xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ./mvnw package -pl zeppelin-web-angular ${MAVEN_ARGS}
+        run: xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ./mvnw package -pl zeppelin-web ${MAVEN_ARGS}
 
   test-selenium-with-spark-module-for-spark-3-4:
     runs-on: ubuntu-20.04

bin/common.sh

@@ -51,10 +51,10 @@ if [[ -z "${ZEPPELIN_CLASSIC_WAR}" ]]; then
 fi
 
 if [[ -z "${ZEPPELIN_WAR}" ]]; then
-  if [[ -d "${ZEPPELIN_HOME}/zeppelin-web-angular/dist" ]]; then
-    export ZEPPELIN_WAR="${ZEPPELIN_HOME}/zeppelin-web-angular/dist/zeppelin"
+  if [[ -d "${ZEPPELIN_HOME}/zeppelin-web/dist" ]]; then
+    export ZEPPELIN_WAR="${ZEPPELIN_HOME}/zeppelin-web/dist/zeppelin"
   else
-    ZEPPELIN_WAR=$(find -L "${ZEPPELIN_HOME}" -name "zeppelin-web-angular*.war")
+    ZEPPELIN_WAR=$(find -L "${ZEPPELIN_HOME}" -name "zeppelin-web*.war")
     export ZEPPELIN_WAR
   fi
 fi

bin/zeppelin-daemon.sh

@@ -81,7 +81,7 @@ addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-zengine/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-classic/target/lib"
-addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-angular/target/lib"
+addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
 
 ## Add hadoop jars when env USE_HADOOP is true
 if [[ "${USE_HADOOP}" != "false"  ]]; then

bin/zeppelin.cmd

@@ -61,7 +61,7 @@ call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-interpreter\tar
 call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-zengine\target\lib"
 call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-server\target\lib"
 call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-web-classic\target\lib"
-call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-web-angular\target\lib"
+call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-web\target\lib"
 
 if not defined CLASSPATH (
     set CLASSPATH=%ZEPPELIN_CLASSPATH%

bin/zeppelin.sh

@@ -111,7 +111,7 @@ addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-zengine/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-classic/target/lib"
-addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-angular/target/lib"
+addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
 
 ZEPPELIN_CLASSPATH="$CLASSPATH:$ZEPPELIN_CLASSPATH"
 

pom.xml

@@ -85,7 +85,7 @@
     <module>zeppelin-common</module>
     <module>zeppelin-client</module>
     <module>zeppelin-client-examples</module>
-    <module>zeppelin-web-angular</module>
+    <module>zeppelin-web</module>
     <module>zeppelin-server</module>
     <module>zeppelin-jupyter</module>
     <module>zeppelin-plugins</module>
@@ -1075,7 +1075,7 @@
               <exclude>**/e2e/**/**.spec.js</exclude>
               <exclude>package-lock.json</exclude>
 
-              <!-- bundled from zeppelin-web-angular -->
+              <!-- bundled from zeppelin-web -->
               <exclude>**/*.json</exclude>
               <exclude>**/browserslist</exclude>
               <exclude>**/.prettierrc</exclude>

scripts/docker/zeppelin-server/Dockerfile

@@ -49,7 +49,7 @@ ENV LANG=en_US.UTF-8 \
 
 # Copy Zeppelin related files
 COPY --from=zeppelin-distribution /opt/zeppelin/zeppelin-web-classic-${VERSION}.war ${ZEPPELIN_HOME}/
-COPY --from=zeppelin-distribution /opt/zeppelin/zeppelin-web-angular-${VERSION}.war ${ZEPPELIN_HOME}/
+COPY --from=zeppelin-distribution /opt/zeppelin/zeppelin-web-${VERSION}.war ${ZEPPELIN_HOME}/
 COPY --from=zeppelin-distribution /opt/zeppelin/conf ${ZEPPELIN_HOME}/conf
 COPY --from=zeppelin-distribution /opt/zeppelin/bin ${ZEPPELIN_HOME}/bin
 COPY --from=zeppelin-distribution /opt/zeppelin/lib ${ZEPPELIN_HOME}/lib

zeppelin-distribution/pom.xml

@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>zeppelin-web-angular</artifactId>
+      <artifactId>zeppelin-web</artifactId>
       <version>${project.version}</version>
       <type>war</type>
     </dependency>

zeppelin-distribution/src/assemble/distribution.xml

@@ -34,7 +34,7 @@
       <!-- Now, select which projects to include in this module-set. -->
       <includes>
         <include>${project.groupId}:zeppelin-web-classic</include>
-        <include>${project.groupId}:zeppelin-web-angular</include>
+        <include>${project.groupId}:zeppelin-web</include>
       </includes>
       <useProjectArtifact>false</useProjectArtifact>
       <useTransitiveDependencies>false</useTransitiveDependencies>
@@ -43,7 +43,7 @@
       <outputDirectory>/lib</outputDirectory>
       <excludes>
         <exclude>${project.groupId}:zeppelin-web-classic</exclude>
-        <exclude>${project.groupId}:zeppelin-web-angular</exclude>
+        <exclude>${project.groupId}:zeppelin-web</exclude>
       </excludes>
       <useProjectArtifact>false</useProjectArtifact>
       <useTransitiveFiltering>true</useTransitiveFiltering>

zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java

@@ -963,7 +963,7 @@ public enum ConfVars {
     ZEPPELIN_SSL_TRUSTSTORE_TYPE("zeppelin.ssl.truststore.type", null),
     ZEPPELIN_SSL_TRUSTSTORE_PASSWORD("zeppelin.ssl.truststore.password", null),
     ZEPPELIN_CLASSIC_WAR("zeppelin.classic.war", "zeppelin-web-classic/dist"),
-    ZEPPELIN_WAR("zeppelin.war", "zeppelin-web-angular/dist"),
+    ZEPPELIN_WAR("zeppelin.war", "zeppelin-web/dist"),
     ZEPPELIN_WAR_TEMPDIR("zeppelin.war.tempdir", "webapps"),
     ZEPPELIN_JMX_ENABLE("zeppelin.jmx.enable", false),
     ZEPPELIN_JMX_PORT("zeppelin.jmx.port", 9996),

zeppelin-server/src/test/java/org/apache/zeppelin/MiniZeppelinServer.java

@@ -105,7 +105,7 @@ public MiniZeppelinServer(String classname, String zeppelinConfiguration) throws
       zConf.setProperty(ConfVars.ZEPPELIN_WAR.getVarName(),
           webAngularWar.get().getAbsolutePath());
     } else {
-      File dummyWebDir = new File(zeppelinHome, "zeppelin-web-angular" + File.separator + "dist");
+      File dummyWebDir = new File(zeppelinHome, "zeppelin-web" + File.separator + "dist");
       dummyWebDir.mkdirs();
       zConf.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_WAR.getVarName(),
           dummyWebDir.getAbsolutePath());
@@ -127,10 +127,10 @@ private Optional<File> getWebWar() {
 
   private Optional<File> getWebAngularWar() {
     File webWarTargetFolder =
-        new File(".." + File.separator + "zeppelin-web-angular" + File.separator + "target");
+        new File(".." + File.separator + "zeppelin-web" + File.separator + "target");
     if (webWarTargetFolder.exists()) {
       for (File targetFile : webWarTargetFolder.listFiles()) {
-        if (targetFile.getName().contains("zeppelin-web-angular")
+        if (targetFile.getName().contains("zeppelin-web")
             && targetFile.getName().contains(".war")) {
           return Optional.of(targetFile);
         }

zeppelin-server/src/test/java/org/apache/zeppelin/server/IndexHtmlServletTest.java

@@ -40,8 +40,8 @@ class IndexHtmlServletTest {
     private final static String TEST_BODY_ADDON = "<!-- foo -->";
     private final static String TEST_HEAD_ADDON = "<!-- bar -->";
 
-    private final static String FILE_PATH_INDEX_HTML_ZEPPELIN_WEB = "../zeppelin-web-classic/dist/index.html";
-    private final static String FILE_PATH_INDEX_HTML_ZEPPELIN_WEB_ANGULAR = "../zeppelin-web-angular/dist/zeppelin/index.html";
+    private final static String FILE_PATH_INDEX_HTML_ZEPPELIN_WEB_CLASSIC = "../zeppelin-web-classic/dist/index.html";
+    private final static String FILE_PATH_INDEX_HTML_ZEPPELIN_WEB = "../zeppelin-web/dist/zeppelin/index.html";
 
 
     @Test
@@ -53,7 +53,7 @@ void testZeppelinWebHtmlAddon() throws IOException, ServletException {
       ServletConfig sc = mock(ServletConfig.class);
       ServletContext ctx = mock(ServletContext.class);
       when(ctx.getResource("/index.html"))
-        .thenReturn(new URL("file:" + FILE_PATH_INDEX_HTML_ZEPPELIN_WEB));
+        .thenReturn(new URL("file:" + FILE_PATH_INDEX_HTML_ZEPPELIN_WEB_CLASSIC));
       when(sc.getServletContext()).thenReturn(ctx);
 
       IndexHtmlServlet servlet = new IndexHtmlServlet(zConf);
@@ -78,7 +78,7 @@ void testZeppelinWebHtmlAddon() throws IOException, ServletException {
     }
 
     @Test
-    @Disabled("ignored due to zeppelin-web-angular not build for core tests")
+    @Disabled("ignored due to zeppelin-web not build for core tests")
     void testZeppelinWebAngularHtmlAddon() throws IOException, ServletException {
       ZeppelinConfiguration zConf = mock(ZeppelinConfiguration.class);
       when(zConf.getHtmlBodyAddon()).thenReturn(TEST_BODY_ADDON);
@@ -87,7 +87,7 @@ void testZeppelinWebAngularHtmlAddon() throws IOException, ServletException {
       ServletConfig sc = mock(ServletConfig.class);
       ServletContext ctx = mock(ServletContext.class);
       when(ctx.getResource("/index.html"))
-        .thenReturn(new URL("file:" + FILE_PATH_INDEX_HTML_ZEPPELIN_WEB_ANGULAR));
+        .thenReturn(new URL("file:" + FILE_PATH_INDEX_HTML_ZEPPELIN_WEB));
       when(sc.getServletContext()).thenReturn(ctx);
 
       IndexHtmlServlet servlet = new IndexHtmlServlet(zConf);