(zeppelin) branch master updated: [ZEPPELIN-6355] Merge zeppelin-zengine to zeppelin-server

jongyoul Tue, 05 May 2026 05:07:50 -0700

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

jongyoul 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 036c8a05fd [ZEPPELIN-6355] Merge zeppelin-zengine to zeppelin-server
036c8a05fd is described below

commit 036c8a05fd9864a195ee1b8b23f7aaa384f3bcbd
Author: Jongyoul Lee <[email protected]>
AuthorDate: Tue May 5 21:07:31 2026 +0900

    [ZEPPELIN-6355] Merge zeppelin-zengine to zeppelin-server
    
    ### What is this PR for?
    This PR merges the `zeppelin-zengine` module into `zeppelin-server` to 
simplify the project architecture. The zengine module contained core engine 
functionality for notebook management, paragraph execution, and interpreter 
management, which is tightly coupled with the server. This merge reduces build 
complexity while preserving all git history using `git mv` for file movements.
    
    **Note:** The previous blocker (maven-shade-plugin corrupting 
ZeppelinConfiguration string literals) has been resolved by 
[ZEPPELIN-6400](https://github.com/apache/zeppelin/pull/5167), which moved 
ZeppelinConfiguration out of `zeppelin-interpreter` into `zeppelin-zengine` and 
replaced interpreter-side usage with Properties-based configuration.
    
    ### What type of PR is it?
    Refactoring
    
    ### Todos
    * [x] Move all source files from zeppelin-zengine to zeppelin-server using 
git mv (192 files)
    * [x] Merge zengine dependencies into zeppelin-server pom.xml
    * [x] Update zeppelin-plugins to depend on zeppelin-server instead of 
zeppelin-zengine
    * [x] Update zeppelin-interpreter-integration dependencies
    * [x] Update zeppelin-integration dependencies
    * [x] Remove zeppelin-zengine module from root pom.xml
    * [x] Update shell scripts (bin/*.sh, bin/*.cmd)
    * [x] Update GitHub Actions workflows
    * [x] Remove zeppelin-zengine directory
    * [x] Update documentation and code references
    * [x] Add commons-logging exclusions (per reviewer feedback)
    * [ ] Verify CI passes
    
    ### What is the Jira issue?
    * ZEPPELIN-6355
    
    ### How should this be tested?
    * CI
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the license files need to update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Closes #5095 from jongyoul/ZEPPELIN-6345.
    
    Signed-off-by: Jongyoul Lee <[email protected]>
---
 .github/workflows/core.yml                         |   2 +-
 bin/install-interpreter.sh                         |   4 +-
 bin/interpreter.cmd                                |   4 +-
 bin/interpreter.sh                                 |   6 +-
 bin/stop-interpreter.sh                            |   4 +-
 bin/zeppelin-daemon.sh                             |   5 -
 bin/zeppelin.cmd                                   |   5 -
 bin/zeppelin.sh                                    |   5 -
 .../contribution/how_to_contribute_code.md         |   4 +-
 .../helium/writing_visualization_basic.md          |   2 +-
 docs/development/writing_zeppelin_interpreter.md   |   2 +-
 pom.xml                                            |   1 -
 .../java/org/apache/zeppelin/common/Message.java   |   2 +-
 zeppelin-integration/pom.xml                       |  14 -
 zeppelin-interpreter-integration/pom.xml           |  20 --
 .../apache/zeppelin/dep/DependencyResolver.java    |   3 +-
 .../interpreter/InterpreterFactoryInterface.java   |   2 +-
 zeppelin-plugins/pom.xml                           |   6 +-
 zeppelin-server/pom.xml                            | 186 +++++++++++-
 .../zeppelin/conf/ZeppelinConfiguration.java       |   0
 .../zeppelin/conf/ZeppelinLocationStrategy.java    |   0
 .../zeppelin/healthcheck/DummyHealthCheck.java     |   0
 .../zeppelin/healthcheck/HdfsHealthCheck.java      |   0
 .../apache/zeppelin/healthcheck/HealthChecks.java  |   0
 .../java/org/apache/zeppelin/helium/Helium.java    |   0
 .../zeppelin/helium/HeliumApplicationFactory.java  |   0
 .../zeppelin/helium/HeliumBundleFactory.java       |   0
 .../org/apache/zeppelin/helium/HeliumConf.java     |   0
 .../zeppelin/helium/HeliumLocalRegistry.java       |   0
 .../zeppelin/helium/HeliumOnlineRegistry.java      |   0
 .../zeppelin/helium/HeliumPackageSearchResult.java |   0
 .../zeppelin/helium/HeliumPackageSuggestion.java   |   0
 .../org/apache/zeppelin/helium/HeliumRegistry.java |   0
 .../zeppelin/helium/HeliumRegistrySerializer.java  |   0
 .../org/apache/zeppelin/helium/NpmPackage.java     |   0
 .../org/apache/zeppelin/helium/WebpackResult.java  |   0
 .../zeppelin/interpreter/ConfInterpreter.java      |   0
 .../zeppelin/interpreter/InterpreterFactory.java   |   0
 .../zeppelin/interpreter/InterpreterInfo.java      |   0
 .../interpreter/InterpreterInfoSaving.java         |   0
 .../zeppelin/interpreter/InterpreterSetting.java   |   0
 .../interpreter/InterpreterSettingManager.java     |   0
 .../interpreter/ManagedInterpreterGroup.java       |   0
 .../interpreter/RemoteInterpreterEventServer.java  |   0
 .../interpreter/SessionConfInterpreter.java        |   0
 .../zeppelin/interpreter/YarnAppMonitor.java       |   0
 .../interpreter/install/InstallInterpreter.java    |   0
 .../interpreter/launcher/InterpreterClient.java    |   0
 .../launcher/InterpreterLaunchContext.java         |   0
 .../interpreter/launcher/InterpreterLauncher.java  |   0
 .../launcher/SparkInterpreterLauncher.java         |   0
 .../launcher/StandardInterpreterLauncher.java      |   0
 .../recovery/FileSystemRecoveryStorage.java        |   0
 .../interpreter/recovery/LocalRecoveryStorage.java |   0
 .../interpreter/recovery/NullRecoveryStorage.java  |   0
 .../interpreter/recovery/RecoveryStorage.java      |   0
 .../interpreter/recovery/RecoveryUtils.java        |   0
 .../interpreter/recovery/StopInterpreter.java      |   0
 .../interpreter/remote/AppendOutputBuffer.java     |   0
 .../interpreter/remote/AppendOutputRunner.java     |   0
 .../remote/ExecRemoteInterpreterProcess.java       |   0
 .../interpreter/remote/RemoteAngularObject.java    |   0
 .../remote/RemoteAngularObjectRegistry.java        |   0
 .../interpreter/remote/RemoteInterpreter.java      |   0
 .../remote/RemoteInterpreterManagedProcess.java    |   0
 .../remote/RemoteInterpreterProcess.java           |   0
 .../remote/RemoteInterpreterProcessListener.java   |   0
 .../remote/RemoteInterpreterRunningProcess.java    |   0
 .../apache/zeppelin/notebook/ApplicationState.java |   0
 .../zeppelin/notebook/AuthorizationService.java    |   0
 .../zeppelin/notebook/CredentialInjector.java      |   0
 .../zeppelin/notebook/FileSystemStorage.java       |   0
 .../apache/zeppelin/notebook/GsonNoteParser.java   |   0
 .../java/org/apache/zeppelin/notebook/Note.java    |   0
 .../org/apache/zeppelin/notebook/NoteAuth.java     |   0
 .../zeppelin/notebook/NoteEventAsyncListener.java  |   0
 .../zeppelin/notebook/NoteEventListener.java       |   0
 .../org/apache/zeppelin/notebook/NoteInfo.java     |   0
 .../notebook/NoteJsonExclusionStrategy.java        |   0
 .../org/apache/zeppelin/notebook/NoteManager.java  |   0
 .../org/apache/zeppelin/notebook/NoteParser.java   |   0
 .../org/apache/zeppelin/notebook/Notebook.java     |   0
 .../notebook/NotebookAuthorizationInfoSaving.java  |   0
 .../notebook/NotebookImportDeserializer.java       |   0
 .../org/apache/zeppelin/notebook/OldNoteInfo.java  |   0
 .../org/apache/zeppelin/notebook/Paragraph.java    |   0
 .../zeppelin/notebook/ParagraphJobListener.java    |   0
 .../zeppelin/notebook/ParagraphRuntimeInfo.java    |   0
 .../zeppelin/notebook/ParagraphTextParser.java     |   0
 .../notebook/exception/CorruptedNoteException.java |   0
 .../exception/NotePathAlreadyExistsException.java  |   0
 .../notebook/repo/AbstractNotebookRepo.java        |   0
 .../zeppelin/notebook/repo/GitNotebookRepo.java    |   0
 .../notebook/repo/InMemoryNotebookRepo.java        |   0
 .../zeppelin/notebook/repo/NotebookRepo.java       |   0
 .../notebook/repo/NotebookRepoSettingsInfo.java    |   0
 .../zeppelin/notebook/repo/NotebookRepoSync.java   |   0
 .../notebook/repo/NotebookRepoWithSettings.java    |   0
 .../repo/NotebookRepoWithVersionControl.java       |   0
 .../zeppelin/notebook/repo/VFSNotebookRepo.java    |   0
 .../zeppelin/notebook/scheduler/CronJob.java       |   0
 .../notebook/scheduler/MetricCronJobListener.java  |   0
 .../notebook/scheduler/NoSchedulerService.java     |   0
 .../notebook/scheduler/QuartzSchedulerService.java |   0
 .../notebook/scheduler/SchedulerService.java       |   0
 .../scheduler/ZeppelinCronJobTriggerListerner.java |   0
 .../zeppelin/notebook/socket/WatcherMessage.java   |   0
 .../apache/zeppelin/notebook/utility/IdHashes.java |   0
 .../org/apache/zeppelin/plugin/PluginManager.java  |   0
 .../apache/zeppelin/scheduler/RemoteScheduler.java |   0
 .../org/apache/zeppelin/search/LuceneSearch.java   |   0
 .../apache/zeppelin/search/NoSearchService.java    |   0
 .../org/apache/zeppelin/search/SearchService.java  |   0
 .../org/apache/zeppelin/storage/ConfigStorage.java |   0
 .../zeppelin/storage/FileSystemConfigStorage.java  |   0
 .../zeppelin/storage/LocalConfigStorage.java       |   0
 .../apache/zeppelin/ticket/TicketContainer.java    |   0
 .../java/org/apache/zeppelin/user/Credentials.java |   0
 .../zeppelin/user/CredentialsInfoSaving.java       |   0
 .../java/org/apache/zeppelin/user/Encryptor.java   |   0
 .../java/org/apache/zeppelin/util/FileUtils.java   |   0
 .../org/apache/zeppelin/util/ReflectionUtils.java  |   0
 .../apache/zeppelin/util/WatcherSecurityKey.java   |   0
 .../src/main/resources/helium/package.json         |   0
 .../src/main/resources/helium/webpack.config.js    |   0
 .../zeppelin/conf/ZeppelinConfigurationTest.java   |   0
 .../helium/HeliumApplicationFactoryTest.java       |   0
 .../zeppelin/helium/HeliumBundleFactoryTest.java   |   0
 .../zeppelin/helium/HeliumLocalRegistryTest.java   |   0
 .../zeppelin/helium/HeliumOnlineRegistryTest.java  |   0
 .../org/apache/zeppelin/helium/HeliumTest.java     |   0
 .../zeppelin/helium/HeliumTestApplication.java     |   0
 .../apache/zeppelin/helium/HeliumTestRegistry.java |   0
 .../interpreter/AbstractInterpreterTest.java       |   0
 .../zeppelin/interpreter/ConfInterpreterTest.java  |   0
 .../interpreter/DoubleEchoInterpreter.java         |   0
 .../zeppelin/interpreter/EchoInterpreter.java      |   0
 .../interpreter/InterpreterFactoryTest.java        |   0
 .../interpreter/InterpreterInfoSavingTest.java     |   0
 .../interpreter/InterpreterSettingManagerTest.java |   0
 .../interpreter/InterpreterSettingTest.java        |   0
 .../interpreter/ManagedInterpreterGroupTest.java   |   0
 .../interpreter/SessionConfInterpreterTest.java    |   0
 .../zeppelin/interpreter/SleepInterpreter.java     |   0
 .../install/InstallInterpreterTest.java            |   0
 .../launcher/InterpreterLauncherTest.java          |   0
 .../launcher/SparkInterpreterLauncherTest.java     |   0
 .../launcher/StandardInterpreterLauncherTest.java  |   2 +-
 .../lifecycle/TimeoutLifecycleManagerTest.java     |   0
 .../interpreter/mock/MockInterpreter1.java         |   0
 .../interpreter/mock/MockInterpreter2.java         |   0
 .../recovery/FileSystemRecoveryStorageTest.java    |   0
 .../recovery/LocalRecoveryStorageTest.java         |   0
 .../interpreter/remote/AppendOutputRunnerTest.java |   0
 .../remote/RemoteAngularObjectTest.java            |   0
 .../RemoteInterpreterOutputTestStreamTest.java     |   0
 .../interpreter/remote/RemoteInterpreterTest.java  |   4 +-
 .../mock/GetAngularObjectSizeInterpreter.java      |   0
 .../remote/mock/GetEnvPropertyInterpreter.java     |   0
 .../interpreter/remote/mock/MockInterpreterA.java  |   0
 .../remote/mock/MockInterpreterAngular.java        |   0
 .../remote/mock/MockInterpreterOutputStream.java   |   0
 .../remote/mock/MockInterpreterResourcePool.java   |   0
 .../zeppelin/notebook/CredentialInjectorTest.java  |   0
 .../org/apache/zeppelin/notebook/NoteAuthTest.java |   0
 .../apache/zeppelin/notebook/NoteManagerTest.java  |   0
 .../org/apache/zeppelin/notebook/NoteTest.java     |   0
 .../org/apache/zeppelin/notebook/NotebookTest.java |   0
 .../apache/zeppelin/notebook/ParagraphTest.java    |   0
 .../zeppelin/notebook/ParagraphTextParserTest.java |   0
 .../notebook/repo/GitNotebookRepoTest.java         |   0
 .../repo/NotebookRepoSyncInitializationTest.java   |   0
 .../notebook/repo/NotebookRepoSyncTest.java        |   0
 .../notebook/repo/VFSNotebookRepoTest.java         |   0
 .../notebook/repo/mock/VFSNotebookRepoMock.java    |   0
 .../apache/zeppelin/plugin/PluginManagerTest.java  |   0
 .../resource/DistributedResourcePoolTest.java      |   0
 .../zeppelin/scheduler/RemoteSchedulerTest.java    |   0
 .../apache/zeppelin/search/LuceneSearchTest.java   |   0
 .../zeppelin/storage/LocalConfigStorageTest.java   |   0
 .../org/apache/zeppelin/user/CredentialsTest.java  |   0
 .../org/apache/zeppelin/user/EncryptorTest.java    |   0
 .../java/org/apache/zeppelin/util/UtilTest.java    |   0
 .../src/test/resources/2BQA35CJZ/note.json         |   0
 .../src/test/resources/bin/interpreter_invalid.sh  |   0
 .../src/test/resources/bin/interpreter_timeout.sh  |   0
 .../src/test/resources/commons-logging-1.1.1.jar   | Bin
 .../src/test/resources/conf/interpreter.json       |   0
 .../src/test/resources/flink-conf.yaml             |   0
 .../src/test/resources/gson-2.2.jar                | Bin
 .../src/test/resources/helium/vis1/package.json    |   0
 .../src/test/resources/helium/vis1/vis1.js         |   0
 .../src/test/resources/helium/vis2/package.json    |   0
 .../src/test/resources/helium/vis2/vis2.js         |   0
 .../config_test/interpreter-setting.json           |   0
 .../interpreter/mock1/interpreter-setting.json     |   0
 .../interpreter/mock2/interpreter-setting.json     |   0
 .../mock_resource_pool/interpreter-setting.json    |   0
 .../interpreter/test/interpreter-setting.json      |   0
 .../src/test/resources/list_of_notes               |   0
 .../src/test/resources/log4j-1.2.17.jar            | Bin
 .../src/test/resources/note                        |   0
 .../notebook/my_project/my_note1_2A94M5J1Z.zpln    |   0
 .../notebook/my_project/my_note2_2A94M5J2Z.zpln    |   0
 .../src/test/resources/slf4j-api-1.7.10.jar        | Bin
 .../src/test/resources/slf4j-log4j12-1.7.10.jar    | Bin
 .../src/test/resources/test-zeppelin-site1.xml     |   0
 .../src/test/resources/test-zeppelin-site2.xml     |   0
 .../src/test/resources/zeppelin-test-site.xml      |   0
 zeppelin-zengine/.gitignore                        |  35 ---
 zeppelin-zengine/pom.xml                           | 330 ---------------------
 .../zeppelin/display/AngularObjectBuilder.java     |  26 --
 .../src/test/resources/log4j.properties            |  46 ---
 213 files changed, 194 insertions(+), 526 deletions(-)

diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 8bc26639dd..db7344d6ad 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -33,7 +33,7 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
-  # test on core-modules 
(zeppelin-interpreter,zeppelin-zengine,zeppelin-server),
+  # test on core-modules (zeppelin-interpreter,zeppelin-server),
   # some interpreters are included, because zeppelin-server test depends on 
them: spark, shell & markdown
   core-modules:
     runs-on: ubuntu-24.04
diff --git a/bin/install-interpreter.sh b/bin/install-interpreter.sh
index d0c03947c6..51bfbbcd33 100755
--- a/bin/install-interpreter.sh
+++ b/bin/install-interpreter.sh
@@ -29,8 +29,8 @@ 
ZEPPELIN_INSTALL_INTERPRETER_MAIN=org.apache.zeppelin.interpreter.install.Instal
 ZEPPELIN_LOGFILE="${ZEPPELIN_LOG_DIR}/install-interpreter.log"
 JAVA_OPTS+=" -Dzeppelin.log.file=${ZEPPELIN_LOGFILE}"
 
-if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/classes" ]]; then
-  ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/classes"
+if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/classes" ]]; then
+  ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-server/target/classes"
 fi
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
 
diff --git a/bin/interpreter.cmd b/bin/interpreter.cmd
index e9d0b7cb4f..247ca5248e 100644
--- a/bin/interpreter.cmd
+++ b/bin/interpreter.cmd
@@ -46,8 +46,8 @@ REM add test classes for unittest
 if exist "%ZEPPELIN_HOME%\zeppelin-interpreter\target\test-classes" (
     set 
ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_HOME%\zeppelin-interpreter\target\test-classes"
 )
-if exist "%ZEPPELIN_HOME%\zeppelin-zengine\target\test-classes" (
-    set 
ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_HOME%\zeppelin-zengine\target\test-classes"
+if exist "%ZEPPELIN_HOME%\zeppelin-server\target\test-classes" (
+    set 
ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_HOME%\zeppelin-server\target\test-classes"
 )
 
 call "%bin%\functions.cmd" ADDJARINDIR 
"%ZEPPELIN_HOME%\zeppelin-interpreter\target\lib"
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index 19a6fe7119..00ff030731 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -112,9 +112,9 @@ if [[ -d 
"${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
 fi
 
 # add test classes for unittest
-if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes" ]]; then
-  
ZEPPELIN_INTP_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes"
-  addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes"
+if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/test-classes" ]]; then
+  
ZEPPELIN_INTP_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-server/target/test-classes"
+  addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-server/target/test-classes"
 fi
 
 addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-interpreter-shaded/target"
diff --git a/bin/stop-interpreter.sh b/bin/stop-interpreter.sh
index e6ff16e9e9..97ccb5bb9a 100755
--- a/bin/stop-interpreter.sh
+++ b/bin/stop-interpreter.sh
@@ -30,8 +30,8 @@ 
ZEPPELIN_STOP_INTERPRETER_MAIN=org.apache.zeppelin.interpreter.recovery.StopInte
 ZEPPELIN_LOGFILE="${ZEPPELIN_LOG_DIR}/stop-interpreter.log"
 JAVA_OPTS+=" -Dzeppelin.log.file=${ZEPPELIN_LOGFILE}"
 
-if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/classes" ]]; then
-  ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/classes"
+if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/classes" ]]; then
+  ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-server/target/classes"
 fi
 
 if [[ -d "${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
diff --git a/bin/zeppelin-daemon.sh b/bin/zeppelin-daemon.sh
index dfa315c5a1..1d4c5c108e 100755
--- a/bin/zeppelin-daemon.sh
+++ b/bin/zeppelin-daemon.sh
@@ -61,10 +61,6 @@ if [[ -d 
"${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
   ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes"
 fi
 
-if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/classes" ]]; then
-  ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/classes"
-fi
-
 if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/classes" ]]; then
   ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-server/target/classes"
 fi
@@ -80,7 +76,6 @@ addJarInDir "${ZEPPELIN_HOME}"
 addJarInDir "${ZEPPELIN_HOME}/lib"
 addJarInDir "${ZEPPELIN_HOME}/lib/interpreter"
 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/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-angular/target/lib"
diff --git a/bin/zeppelin.cmd b/bin/zeppelin.cmd
index 682caf061d..bdcc8707f1 100644
--- a/bin/zeppelin.cmd
+++ b/bin/zeppelin.cmd
@@ -46,10 +46,6 @@ if exist 
"%ZEPPELIN_HOME%\zeppelin-interpreter\target\classes" (
     set 
ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_HOME%\zeppelin-interpreter\target\classes"
 )
 
-if exist "%ZEPPELIN_HOME%\zeppelin-zengine\target\classes" (
-    set 
ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_HOME%\zeppelin-zengine\target\classes"
-)
-
 if exist "%ZEPPELIN_HOME%\zeppelin-server\target\classes" (
     set 
ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_HOME%\zeppelin-server\target\classes"
 )
@@ -58,7 +54,6 @@ call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%"
 call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\lib"
 call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\lib\interpreter"
 call "%bin%\functions.cmd" ADDJARINDIR 
"%ZEPPELIN_HOME%\zeppelin-interpreter\target\lib"
-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\target\lib"
 
diff --git a/bin/zeppelin.sh b/bin/zeppelin.sh
index 9c1f7a9b41..d767891db8 100755
--- a/bin/zeppelin.sh
+++ b/bin/zeppelin.sh
@@ -96,10 +96,6 @@ if [[ -d 
"${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
   ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes"
 fi
 
-if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/classes" ]]; then
-  ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/classes"
-fi
-
 if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/classes" ]]; then
   ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-server/target/classes"
 fi
@@ -108,7 +104,6 @@ addJarInDir "${ZEPPELIN_HOME}"
 addJarInDir "${ZEPPELIN_HOME}/lib"
 addJarInDir "${ZEPPELIN_HOME}/lib/interpreter"
 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/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-angular/target/lib"
diff --git a/docs/development/contribution/how_to_contribute_code.md 
b/docs/development/contribution/how_to_contribute_code.md
index 5cdf024710..645371be2a 100644
--- a/docs/development/contribution/how_to_contribute_code.md
+++ b/docs/development/contribution/how_to_contribute_code.md
@@ -140,14 +140,14 @@ Zeppelin has [set of integration 
tests](https://github.com/apache/zeppelin/tree/
 
 ```bash
 TEST_SELENIUM=true ./mvnw test -Dtest=[TEST_NAME] -DfailIfNoTests=false \
--pl 'zeppelin-interpreter,zeppelin-zengine,zeppelin-server'
+-pl 'zeppelin-interpreter,zeppelin-server'
 ```
 
 For example, to run 
[ParagraphActionIT](https://github.com/apache/zeppelin/blob/master/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java),
 
 ```bash
 TEST_SELENIUM=true ./mvnw test -Dtest=ParagraphActionsIT -DfailIfNoTests=false 
\
--pl 'zeppelin-interpreter,zeppelin-zengine,zeppelin-server'
+-pl 'zeppelin-interpreter,zeppelin-server'
 ```
 
 You'll need Firefox web browser installed in your development environment.
diff --git a/docs/development/helium/writing_visualization_basic.md 
b/docs/development/helium/writing_visualization_basic.md
index 207e8b54b7..c1dc6968b0 100644
--- a/docs/development/helium/writing_visualization_basic.md
+++ b/docs/development/helium/writing_visualization_basic.md
@@ -46,7 +46,7 @@ Click 'enable' button.
 
 #### 3. Create and load visualization bundle on the fly
 
-Once a Visualization package is enabled, 
[HeliumBundleFactory](https://github.com/apache/zeppelin/blob/master/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java)
 creates a js bundle. The js bundle is served by `helium/bundle/load` rest api 
endpoint.
+Once a Visualization package is enabled, 
[HeliumBundleFactory](https://github.com/apache/zeppelin/blob/master/zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java)
 creates a js bundle. The js bundle is served by `helium/bundle/load` rest api 
endpoint.
 
 #### 4. Run visualization
 
diff --git a/docs/development/writing_zeppelin_interpreter.md 
b/docs/development/writing_zeppelin_interpreter.md
index fa4970a293..0d9d2d43be 100644
--- a/docs/development/writing_zeppelin_interpreter.md
+++ b/docs/development/writing_zeppelin_interpreter.md
@@ -31,7 +31,7 @@ Interpreters in the same InterpreterGroup can reference each 
other. For example,
 
 <img class="img-responsive" style="width:50%; border: 1px solid #ecf0f1;" 
height="auto" src="{{BASE_PATH}}/assets/themes/zeppelin/img/interpreter.png" />
 
-[InterpreterSetting](https://github.com/apache/zeppelin/blob/master/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java)
 is configuration of a given 
[InterpreterGroup](https://github.com/apache/zeppelin/blob/master/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterGroup.java)
 and a unit of start/stop interpreter.
+[InterpreterSetting](https://github.com/apache/zeppelin/blob/master/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java)
 is configuration of a given 
[InterpreterGroup](https://github.com/apache/zeppelin/blob/master/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterGroup.java)
 and a unit of start/stop interpreter.
 All Interpreters in the same InterpreterSetting are launched in a single, 
separate JVM process. The Interpreter communicates with Zeppelin engine via 
**[Thrift](https://github.com/apache/zeppelin/blob/master/zeppelin-interpreter/src/main/thrift/RemoteInterpreterService.thrift)**.
 
 In 'Separate Interpreter(scoped / isolated) for each note' mode which you can 
see at the **Interpreter Setting** menu when you create a new interpreter, new 
interpreter instance will be created per note. But it still runs on the same 
JVM while they're in the same InterpreterSettings.
diff --git a/pom.xml b/pom.xml
index 55a5a5a538..8fd194cd48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,6 @@
     <module>zeppelin-interpreter-parent</module>
     <module>zeppelin-interpreter</module>
     <module>zeppelin-interpreter-shaded</module>
-    <module>zeppelin-zengine</module>
     <module>rlang</module>
     <module>zeppelin-jupyter-interpreter</module>
     <module>zeppelin-jupyter-interpreter-shaded</module>
diff --git 
a/zeppelin-common/src/main/java/org/apache/zeppelin/common/Message.java 
b/zeppelin-common/src/main/java/org/apache/zeppelin/common/Message.java
index 82c5b54f88..6ec66e63db 100644
--- a/zeppelin-common/src/main/java/org/apache/zeppelin/common/Message.java
+++ b/zeppelin-common/src/main/java/org/apache/zeppelin/common/Message.java
@@ -28,7 +28,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * Copied from zeppelin-zengine (TODO, zjffdu). Should resume the same piece 
of code instead of copying.
+ * Copied from zeppelin-server (TODO, zjffdu). Should resume the same piece of 
code instead of copying.
  * Zeppelin websocket message template class.
  */
 public class Message implements JsonSerializable {
diff --git a/zeppelin-integration/pom.xml b/zeppelin-integration/pom.xml
index a53e306d9a..5bdd890b83 100644
--- a/zeppelin-integration/pom.xml
+++ b/zeppelin-integration/pom.xml
@@ -69,13 +69,6 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>zeppelin-zengine</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.zeppelin</groupId>
       <artifactId>spark-interpreter</artifactId>
@@ -132,13 +125,6 @@
       <scope>test</scope>
       <classifier>tests</classifier>
     </dependency>
-    <dependency>
-      <groupId>org.apache.zeppelin</groupId>
-      <artifactId>zeppelin-zengine</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <classifier>tests</classifier>
-    </dependency>
     <dependency>
       <groupId>org.apache.zeppelin</groupId>
       <artifactId>zeppelin-test</artifactId>
diff --git a/zeppelin-interpreter-integration/pom.xml 
b/zeppelin-interpreter-integration/pom.xml
index 3e37b4e790..a0a4e9ecd3 100644
--- a/zeppelin-interpreter-integration/pom.xml
+++ b/zeppelin-interpreter-integration/pom.xml
@@ -53,18 +53,6 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.zeppelin</groupId>
-      <artifactId>zeppelin-zengine</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.ow2.asm</groupId>
-          <artifactId>asm</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.zeppelin</groupId>
       <artifactId>zeppelin-server</artifactId>
@@ -83,14 +71,6 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.zeppelin</groupId>
-      <artifactId>zeppelin-zengine</artifactId>
-      <version>${project.version}</version>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.zeppelin</groupId>
       <artifactId>zeppelin-server</artifactId>
diff --git 
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyResolver.java
 
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyResolver.java
index e513ac2b66..6edc068029 100644
--- 
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyResolver.java
+++ 
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyResolver.java
@@ -51,8 +51,7 @@ import org.slf4j.LoggerFactory;
 public class DependencyResolver extends AbstractDependencyResolver {
   private static final Logger LOGGER = 
LoggerFactory.getLogger(DependencyResolver.class);
 
-  private final String[] exclusions = new String[] 
{"org.apache.zeppelin:zeppelin-zengine",
-                                                    
"org.apache.zeppelin:zeppelin-interpreter",
+  private final String[] exclusions = new String[] 
{"org.apache.zeppelin:zeppelin-interpreter",
                                                     
"org.apache.zeppelin:zeppelin-server"};
 
   public DependencyResolver(String localRepoPath,
diff --git 
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactoryInterface.java
 
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactoryInterface.java
index f02650b612..803993c13c 100644
--- 
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactoryInterface.java
+++ 
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactoryInterface.java
@@ -20,7 +20,7 @@ package org.apache.zeppelin.interpreter;
  * InterpreterFactory Interface
  * Provides the interface to the ClusterManagerServer
  * through the user, nodeId, replName query interpreter
- * Since the InterpreterFactory is in the zeppelin-zengine module,
+ * Since the InterpreterFactory is in the zeppelin-server module,
  * the ClusterManagerServer in the zeppelin-interpreter module
  * cannot access InterpreterFactory#getInterpreter(...),
  * So access through the interface.
diff --git a/zeppelin-plugins/pom.xml b/zeppelin-plugins/pom.xml
index 19cd1bd1af..ac859b3c76 100644
--- a/zeppelin-plugins/pom.xml
+++ b/zeppelin-plugins/pom.xml
@@ -32,7 +32,7 @@
     <name>Zeppelin: Plugins Parent</name>
     <description>Zeppelin Plugins Parent</description>
     <properties>
-        <!-- no need to include hadoop jar, because it's already included in 
zeppelin-zengine -->
+        <!-- no need to include hadoop jar, because it's already included in 
zeppelin-server -->
         <hadoop.deps.scope>provided</hadoop.deps.scope>
     </properties>
 
@@ -54,11 +54,11 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>zeppelin-zengine</artifactId>
+            <artifactId>zeppelin-server</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
             <exclusions>
-                <!-- jcl-over-slf4j is provided by zeppelin-interprerter -->
+                <!-- jcl-over-slf4j is provided by zeppelin-interpreter -->
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 487d79d4d6..6844c96428 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -40,6 +40,11 @@
     <jna.version>4.1.0</jna.version>
     <nimbus.version>9.37.4</nimbus.version>
     <kerberos.version>2.0.0-M15</kerberos.version>
+    <guava.version>32.0.0-jre</guava.version>
+    <lucene.version>8.7.0</lucene.version>
+    <commons.vfs2.version>2.10.0</commons.vfs2.version>
+    <eclipse.jgit.version>4.5.4.201711221230-r</eclipse.jgit.version>
+    <eirslett.version>1.6</eirslett.version>
 
     <!--test library versions-->
     <selenium.java.version>2.48.2</selenium.java.version>
@@ -50,47 +55,183 @@
 
   <dependencies>
 
+    <!-- former zeppelin-zengine dependencies (merged) -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>zeppelin-zengine</artifactId>
+      <artifactId>zeppelin-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>zeppelin-interpreter</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-core</artifactId>
+          <groupId>javax.inject</groupId>
+          <artifactId>javax.inject</artifactId>
         </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>zeppelin-jupyter</artifactId>
+      <version>${project.version}</version>
+      <exclusions>
         <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-json</artifactId>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-server</artifactId>
+          <groupId>org.jsoup</groupId>
+          <artifactId>jsoup</artifactId>
         </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-vfs2-jackrabbit1</artifactId>
+      <version>${commons.vfs2.version}</version>
+      <exclusions>
         <exclusion>
-          <groupId>org.ow2.asm</groupId>
-          <artifactId>asm</artifactId>
+          <groupId>commons-httpclient</groupId>
+          <artifactId>commons-httpclient</artifactId>
         </exclusion>
         <!-- using jcl-over-slf4j instead -->
         <exclusion>
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpasyncclient</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-jetty-client</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <!-- Healthcheck -->
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-healthchecks</artifactId>
+      <version>${dropwizard.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>${lucene.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+      <version>${lucene.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-queryparser</artifactId>
+      <version>${lucene.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-highlighter</artifactId>
+      <version>${lucene.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.eirslett</groupId>
+      <artifactId>frontend-plugin-core</artifactId>
+      <version>${eirslett.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+        </exclusion>
         <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-compress</artifactId>
         </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-vfs2</artifactId>
+      <version>${commons.vfs2.version}</version>
+      <exclusions>
+        <!-- use hadoop-client-runtime to mount hadoop filesystems -->
         <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-reload4j</artifactId>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-hdfs-client</artifactId>
         </exclusion>
+        <!-- using jcl-over-slf4j instead -->
         <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>jcl-over-slf4j</artifactId>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.eclipse.jgit</groupId>
+      <artifactId>org.eclipse.jgit</artifactId>
+      <version>${eclipse.jgit.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>${commons.compress.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
@@ -300,6 +441,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>
@@ -389,6 +536,12 @@
     </dependency>
   </dependencies>
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-failsafe-plugin</artifactId>
@@ -411,6 +564,9 @@
           <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
           <argLine>-Xmx3g -Xms1g -Dfile.encoding=UTF-8</argLine>
+          <systemProperties>
+            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+          </systemProperties>
           <excludes>
             <exclude>${tests.to.exclude}</exclude>
           </excludes>
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinLocationStrategy.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/conf/ZeppelinLocationStrategy.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinLocationStrategy.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/conf/ZeppelinLocationStrategy.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/healthcheck/DummyHealthCheck.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/healthcheck/DummyHealthCheck.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/healthcheck/DummyHealthCheck.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/healthcheck/DummyHealthCheck.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/healthcheck/HdfsHealthCheck.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/healthcheck/HdfsHealthCheck.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/healthcheck/HdfsHealthCheck.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/healthcheck/HdfsHealthCheck.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/healthcheck/HealthChecks.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/healthcheck/HealthChecks.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/healthcheck/HealthChecks.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/healthcheck/HealthChecks.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/Helium.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/Helium.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/Helium.java
rename to zeppelin-server/src/main/java/org/apache/zeppelin/helium/Helium.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumApplicationFactory.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumApplicationFactory.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumApplicationFactory.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumApplicationFactory.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumConf.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumConf.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumConf.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumConf.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumLocalRegistry.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumLocalRegistry.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumLocalRegistry.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumLocalRegistry.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumPackageSearchResult.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumPackageSearchResult.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumPackageSearchResult.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumPackageSearchResult.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumPackageSuggestion.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumPackageSuggestion.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumPackageSuggestion.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumPackageSuggestion.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumRegistry.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumRegistry.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumRegistry.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumRegistry.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumRegistrySerializer.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumRegistrySerializer.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumRegistrySerializer.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/helium/HeliumRegistrySerializer.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/NpmPackage.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/NpmPackage.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/NpmPackage.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/helium/NpmPackage.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/WebpackResult.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/helium/WebpackResult.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/WebpackResult.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/helium/WebpackResult.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ConfInterpreter.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/ConfInterpreter.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ConfInterpreter.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/ConfInterpreter.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfo.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfo.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfo.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfo.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/SessionConfInterpreter.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/SessionConfInterpreter.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/SessionConfInterpreter.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/SessionConfInterpreter.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/YarnAppMonitor.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/YarnAppMonitor.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/YarnAppMonitor.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/YarnAppMonitor.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/install/InstallInterpreter.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/install/InstallInterpreter.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/install/InstallInterpreter.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/install/InstallInterpreter.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterClient.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterClient.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterClient.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterClient.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterLaunchContext.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterLaunchContext.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterLaunchContext.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterLaunchContext.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterLauncher.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterLauncher.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterLauncher.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/launcher/InterpreterLauncher.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncher.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncher.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncher.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncher.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncher.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncher.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncher.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncher.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorage.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorage.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorage.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorage.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorage.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorage.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorage.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorage.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/NullRecoveryStorage.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/NullRecoveryStorage.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/NullRecoveryStorage.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/NullRecoveryStorage.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/RecoveryStorage.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/RecoveryStorage.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/RecoveryStorage.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/RecoveryStorage.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/RecoveryUtils.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/RecoveryUtils.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/RecoveryUtils.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/RecoveryUtils.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/StopInterpreter.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/StopInterpreter.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/recovery/StopInterpreter.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/recovery/StopInterpreter.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputBuffer.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunner.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/ExecRemoteInterpreterProcess.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/ExecRemoteInterpreterProcess.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/ExecRemoteInterpreterProcess.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/ExecRemoteInterpreterProcess.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObject.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectRegistry.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectRegistry.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectRegistry.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectRegistry.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterManagedProcess.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterManagedProcess.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterManagedProcess.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterManagedProcess.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessListener.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterRunningProcess.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterRunningProcess.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterRunningProcess.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterRunningProcess.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/ApplicationState.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/ApplicationState.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/ApplicationState.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/ApplicationState.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/AuthorizationService.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/AuthorizationService.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/AuthorizationService.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/AuthorizationService.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/CredentialInjector.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/CredentialInjector.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/CredentialInjector.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/CredentialInjector.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/FileSystemStorage.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/FileSystemStorage.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/FileSystemStorage.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/FileSystemStorage.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/GsonNoteParser.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/GsonNoteParser.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/GsonNoteParser.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/GsonNoteParser.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/Note.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
rename to zeppelin-server/src/main/java/org/apache/zeppelin/notebook/Note.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteAuth.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteAuth.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteAuth.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteAuth.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteEventAsyncListener.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteEventAsyncListener.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteEventAsyncListener.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteEventAsyncListener.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteEventListener.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteEventListener.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteEventListener.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteEventListener.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteInfo.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteInfo.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteInfo.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteInfo.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteJsonExclusionStrategy.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteJsonExclusionStrategy.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteJsonExclusionStrategy.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteJsonExclusionStrategy.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteManager.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteManager.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteManager.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteManager.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteParser.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteParser.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteParser.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NoteParser.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/Notebook.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/Notebook.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookAuthorizationInfoSaving.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NotebookAuthorizationInfoSaving.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookAuthorizationInfoSaving.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NotebookAuthorizationInfoSaving.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookImportDeserializer.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NotebookImportDeserializer.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookImportDeserializer.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/NotebookImportDeserializer.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/OldNoteInfo.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/OldNoteInfo.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/OldNoteInfo.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/OldNoteInfo.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/ParagraphJobListener.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/ParagraphJobListener.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/ParagraphJobListener.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/ParagraphJobListener.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/ParagraphRuntimeInfo.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/ParagraphRuntimeInfo.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/ParagraphRuntimeInfo.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/ParagraphRuntimeInfo.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/ParagraphTextParser.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/ParagraphTextParser.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/ParagraphTextParser.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/ParagraphTextParser.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/exception/CorruptedNoteException.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/exception/CorruptedNoteException.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/exception/CorruptedNoteException.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/exception/CorruptedNoteException.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/exception/NotePathAlreadyExistsException.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/exception/NotePathAlreadyExistsException.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/exception/NotePathAlreadyExistsException.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/exception/NotePathAlreadyExistsException.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/AbstractNotebookRepo.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/AbstractNotebookRepo.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/AbstractNotebookRepo.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/AbstractNotebookRepo.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/InMemoryNotebookRepo.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/InMemoryNotebookRepo.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/InMemoryNotebookRepo.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/InMemoryNotebookRepo.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepo.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepo.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepo.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepo.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSettingsInfo.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSettingsInfo.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSettingsInfo.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSettingsInfo.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoWithSettings.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoWithSettings.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoWithSettings.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoWithSettings.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoWithVersionControl.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoWithVersionControl.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoWithVersionControl.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoWithVersionControl.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/CronJob.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/CronJob.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/CronJob.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/CronJob.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/MetricCronJobListener.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/MetricCronJobListener.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/MetricCronJobListener.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/MetricCronJobListener.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/NoSchedulerService.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/NoSchedulerService.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/NoSchedulerService.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/NoSchedulerService.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/QuartzSchedulerService.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/QuartzSchedulerService.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/QuartzSchedulerService.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/QuartzSchedulerService.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/SchedulerService.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/SchedulerService.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/SchedulerService.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/SchedulerService.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/ZeppelinCronJobTriggerListerner.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/ZeppelinCronJobTriggerListerner.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/scheduler/ZeppelinCronJobTriggerListerner.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/scheduler/ZeppelinCronJobTriggerListerner.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/WatcherMessage.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/socket/WatcherMessage.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/WatcherMessage.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/socket/WatcherMessage.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/plugin/PluginManager.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/plugin/PluginManager.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/plugin/PluginManager.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/plugin/PluginManager.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/search/LuceneSearch.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/search/LuceneSearch.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/search/LuceneSearch.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/search/LuceneSearch.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/search/NoSearchService.java
 b/zeppelin-server/src/main/java/org/apache/zeppelin/search/NoSearchService.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/search/NoSearchService.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/search/NoSearchService.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/search/SearchService.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/search/SearchService.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/search/SearchService.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/search/SearchService.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/storage/ConfigStorage.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/storage/ConfigStorage.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/storage/ConfigStorage.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/storage/ConfigStorage.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/storage/FileSystemConfigStorage.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/storage/FileSystemConfigStorage.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/storage/FileSystemConfigStorage.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/storage/FileSystemConfigStorage.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/storage/LocalConfigStorage.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/storage/LocalConfigStorage.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/storage/LocalConfigStorage.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/storage/LocalConfigStorage.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/ticket/TicketContainer.java
 b/zeppelin-server/src/main/java/org/apache/zeppelin/ticket/TicketContainer.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/ticket/TicketContainer.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/ticket/TicketContainer.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/user/Credentials.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/user/Credentials.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/user/Credentials.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/user/Credentials.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/user/CredentialsInfoSaving.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/user/CredentialsInfoSaving.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/user/CredentialsInfoSaving.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/user/CredentialsInfoSaving.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/user/Encryptor.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/user/Encryptor.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/user/Encryptor.java
rename to zeppelin-server/src/main/java/org/apache/zeppelin/user/Encryptor.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/util/FileUtils.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/util/FileUtils.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/util/FileUtils.java
rename to zeppelin-server/src/main/java/org/apache/zeppelin/util/FileUtils.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/util/ReflectionUtils.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/util/ReflectionUtils.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/util/ReflectionUtils.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/util/ReflectionUtils.java
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/util/WatcherSecurityKey.java
 
b/zeppelin-server/src/main/java/org/apache/zeppelin/util/WatcherSecurityKey.java
similarity index 100%
rename from 
zeppelin-zengine/src/main/java/org/apache/zeppelin/util/WatcherSecurityKey.java
rename to 
zeppelin-server/src/main/java/org/apache/zeppelin/util/WatcherSecurityKey.java
diff --git a/zeppelin-zengine/src/main/resources/helium/package.json 
b/zeppelin-server/src/main/resources/helium/package.json
similarity index 100%
rename from zeppelin-zengine/src/main/resources/helium/package.json
rename to zeppelin-server/src/main/resources/helium/package.json
diff --git a/zeppelin-zengine/src/main/resources/helium/webpack.config.js 
b/zeppelin-server/src/main/resources/helium/webpack.config.js
similarity index 100%
rename from zeppelin-zengine/src/main/resources/helium/webpack.config.js
rename to zeppelin-server/src/main/resources/helium/webpack.config.js
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/conf/ZeppelinConfigurationTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/conf/ZeppelinConfigurationTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/conf/ZeppelinConfigurationTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/conf/ZeppelinConfigurationTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumBundleFactoryTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumBundleFactoryTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumBundleFactoryTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumBundleFactoryTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumLocalRegistryTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumLocalRegistryTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumLocalRegistryTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumLocalRegistryTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumOnlineRegistryTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumOnlineRegistryTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumOnlineRegistryTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumOnlineRegistryTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTest.java 
b/zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTestApplication.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumTestApplication.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTestApplication.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumTestApplication.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTestRegistry.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumTestRegistry.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTestRegistry.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/helium/HeliumTestRegistry.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/AbstractInterpreterTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/AbstractInterpreterTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/AbstractInterpreterTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/AbstractInterpreterTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ConfInterpreterTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/ConfInterpreterTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ConfInterpreterTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/ConfInterpreterTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/DoubleEchoInterpreter.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/DoubleEchoInterpreter.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/DoubleEchoInterpreter.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/DoubleEchoInterpreter.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/EchoInterpreter.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/EchoInterpreter.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/EchoInterpreter.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/EchoInterpreter.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterInfoSavingTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/InterpreterInfoSavingTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterInfoSavingTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/InterpreterInfoSavingTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroupTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroupTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroupTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroupTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SessionConfInterpreterTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/SessionConfInterpreterTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SessionConfInterpreterTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/SessionConfInterpreterTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SleepInterpreter.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/SleepInterpreter.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SleepInterpreter.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/SleepInterpreter.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/install/InstallInterpreterTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/install/InstallInterpreterTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/install/InstallInterpreterTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/install/InstallInterpreterTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/InterpreterLauncherTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/launcher/InterpreterLauncherTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/InterpreterLauncherTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/launcher/InterpreterLauncherTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncherTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncherTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncherTest.java
similarity index 97%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncherTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncherTest.java
index a9db3ee05a..3cb2d9a781 100644
--- 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncherTest.java
+++ 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/launcher/StandardInterpreterLauncherTest.java
@@ -53,7 +53,7 @@ class StandardInterpreterLauncherTest {
     assertEquals("name", interpreterProcess.getInterpreterSettingName());
     assertEquals(".//interpreter/groupName", 
interpreterProcess.getInterpreterDir());
     assertEquals(".//local-repo/groupId", 
interpreterProcess.getLocalRepoDir());
-    
assertEquals(ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_CONNECT_TIMEOUT.getLongValue(),
+    
assertEquals(zConf.getLong(ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_CONNECT_TIMEOUT),
         interpreterProcess.getConnectTimeout());
     assertEquals(zConf.getInterpreterRemoteRunnerPath(), 
interpreterProcess.getInterpreterRunner());
     assertTrue(interpreterProcess.getEnv().size() >= 2);
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/lifecycle/TimeoutLifecycleManagerTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/lifecycle/TimeoutLifecycleManagerTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/lifecycle/TimeoutLifecycleManagerTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/lifecycle/TimeoutLifecycleManagerTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter2.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter2.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter2.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter2.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorageTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorageTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorageTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/recovery/FileSystemRecoveryStorageTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorageTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorageTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorageTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/recovery/LocalRecoveryStorageTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/AppendOutputRunnerTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStreamTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStreamTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStreamTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStreamTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java
similarity index 98%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java
index cdeea28dcb..d970a03390 100644
--- 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java
+++ 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java
@@ -418,7 +418,7 @@ class RemoteInterpreterTest extends AbstractInterpreterTest 
{
   void testFailToLaunchInterpreterProcess_ErrorInRunner() {
     try {
       
System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_REMOTE_RUNNER.getVarName(),
-               zeppelinHome.getAbsolutePath() + 
"/zeppelin-zengine/src/test/resources/bin/interpreter_invalid.sh");
+               zeppelinHome.getAbsolutePath() + 
"/zeppelin-server/src/test/resources/bin/interpreter_invalid.sh");
       final Interpreter interpreter1 = 
interpreterSetting.getInterpreter("user1", note1Id, "sleep");
       final InterpreterContext context1 = createDummyInterpreterContext();
       // run this dummy interpret method first to launch the 
RemoteInterpreterProcess to avoid the
@@ -438,7 +438,7 @@ class RemoteInterpreterTest extends AbstractInterpreterTest 
{
   void testFailToLaunchInterpreterProcess_Timeout() {
     try {
       
System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_REMOTE_RUNNER.getVarName(),
-              zeppelinHome.getAbsolutePath() + 
"/zeppelin-zengine/src/test/resources/bin/interpreter_timeout.sh");
+              zeppelinHome.getAbsolutePath() + 
"/zeppelin-server/src/test/resources/bin/interpreter_timeout.sh");
       
System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_CONNECT_TIMEOUT.getVarName(),
 "10s");
       final Interpreter interpreter1 = 
interpreterSetting.getInterpreter("user1", note1Id, "sleep");
       final InterpreterContext context1 = createDummyInterpreterContext();
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/GetAngularObjectSizeInterpreter.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/GetAngularObjectSizeInterpreter.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/GetAngularObjectSizeInterpreter.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/GetAngularObjectSizeInterpreter.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/GetEnvPropertyInterpreter.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/GetEnvPropertyInterpreter.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/GetEnvPropertyInterpreter.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/GetEnvPropertyInterpreter.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterA.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterA.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterA.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterA.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterAngular.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterAngular.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterAngular.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterAngular.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterOutputStream.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterOutputStream.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterOutputStream.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterOutputStream.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/CredentialInjectorTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/CredentialInjectorTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/CredentialInjectorTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/CredentialInjectorTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteAuthTest.java 
b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/NoteAuthTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteAuthTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/NoteAuthTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteManagerTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/NoteManagerTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteManagerTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/NoteManagerTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java 
b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/NoteTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/NoteTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java 
b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java
 b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/ParagraphTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTextParserTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/ParagraphTextParserTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/ParagraphTextParserTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/ParagraphTextParserTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/repo/GitNotebookRepoTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncInitializationTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/mock/VFSNotebookRepoMock.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/notebook/repo/mock/VFSNotebookRepoMock.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/mock/VFSNotebookRepoMock.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/notebook/repo/mock/VFSNotebookRepoMock.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/plugin/PluginManagerTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/plugin/PluginManagerTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/plugin/PluginManagerTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/plugin/PluginManagerTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/search/LuceneSearchTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/search/LuceneSearchTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/search/LuceneSearchTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/search/LuceneSearchTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/storage/LocalConfigStorageTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/storage/LocalConfigStorageTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/storage/LocalConfigStorageTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/storage/LocalConfigStorageTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/user/CredentialsTest.java 
b/zeppelin-server/src/test/java/org/apache/zeppelin/user/CredentialsTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/user/CredentialsTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/user/CredentialsTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/user/EncryptorTest.java 
b/zeppelin-server/src/test/java/org/apache/zeppelin/user/EncryptorTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/user/EncryptorTest.java
rename to 
zeppelin-server/src/test/java/org/apache/zeppelin/user/EncryptorTest.java
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/util/UtilTest.java 
b/zeppelin-server/src/test/java/org/apache/zeppelin/util/UtilTest.java
similarity index 100%
rename from 
zeppelin-zengine/src/test/java/org/apache/zeppelin/util/UtilTest.java
rename to zeppelin-server/src/test/java/org/apache/zeppelin/util/UtilTest.java
diff --git a/zeppelin-zengine/src/test/resources/2BQA35CJZ/note.json 
b/zeppelin-server/src/test/resources/2BQA35CJZ/note.json
similarity index 100%
rename from zeppelin-zengine/src/test/resources/2BQA35CJZ/note.json
rename to zeppelin-server/src/test/resources/2BQA35CJZ/note.json
diff --git a/zeppelin-zengine/src/test/resources/bin/interpreter_invalid.sh 
b/zeppelin-server/src/test/resources/bin/interpreter_invalid.sh
similarity index 100%
rename from zeppelin-zengine/src/test/resources/bin/interpreter_invalid.sh
rename to zeppelin-server/src/test/resources/bin/interpreter_invalid.sh
diff --git a/zeppelin-zengine/src/test/resources/bin/interpreter_timeout.sh 
b/zeppelin-server/src/test/resources/bin/interpreter_timeout.sh
similarity index 100%
rename from zeppelin-zengine/src/test/resources/bin/interpreter_timeout.sh
rename to zeppelin-server/src/test/resources/bin/interpreter_timeout.sh
diff --git a/zeppelin-zengine/src/test/resources/commons-logging-1.1.1.jar 
b/zeppelin-server/src/test/resources/commons-logging-1.1.1.jar
similarity index 100%
rename from zeppelin-zengine/src/test/resources/commons-logging-1.1.1.jar
rename to zeppelin-server/src/test/resources/commons-logging-1.1.1.jar
diff --git a/zeppelin-zengine/src/test/resources/conf/interpreter.json 
b/zeppelin-server/src/test/resources/conf/interpreter.json
similarity index 100%
rename from zeppelin-zengine/src/test/resources/conf/interpreter.json
rename to zeppelin-server/src/test/resources/conf/interpreter.json
diff --git a/zeppelin-zengine/src/test/resources/flink-conf.yaml 
b/zeppelin-server/src/test/resources/flink-conf.yaml
similarity index 100%
rename from zeppelin-zengine/src/test/resources/flink-conf.yaml
rename to zeppelin-server/src/test/resources/flink-conf.yaml
diff --git a/zeppelin-zengine/src/test/resources/gson-2.2.jar 
b/zeppelin-server/src/test/resources/gson-2.2.jar
similarity index 100%
rename from zeppelin-zengine/src/test/resources/gson-2.2.jar
rename to zeppelin-server/src/test/resources/gson-2.2.jar
diff --git a/zeppelin-zengine/src/test/resources/helium/vis1/package.json 
b/zeppelin-server/src/test/resources/helium/vis1/package.json
similarity index 100%
rename from zeppelin-zengine/src/test/resources/helium/vis1/package.json
rename to zeppelin-server/src/test/resources/helium/vis1/package.json
diff --git a/zeppelin-zengine/src/test/resources/helium/vis1/vis1.js 
b/zeppelin-server/src/test/resources/helium/vis1/vis1.js
similarity index 100%
rename from zeppelin-zengine/src/test/resources/helium/vis1/vis1.js
rename to zeppelin-server/src/test/resources/helium/vis1/vis1.js
diff --git a/zeppelin-zengine/src/test/resources/helium/vis2/package.json 
b/zeppelin-server/src/test/resources/helium/vis2/package.json
similarity index 100%
rename from zeppelin-zengine/src/test/resources/helium/vis2/package.json
rename to zeppelin-server/src/test/resources/helium/vis2/package.json
diff --git a/zeppelin-zengine/src/test/resources/helium/vis2/vis2.js 
b/zeppelin-server/src/test/resources/helium/vis2/vis2.js
similarity index 100%
rename from zeppelin-zengine/src/test/resources/helium/vis2/vis2.js
rename to zeppelin-server/src/test/resources/helium/vis2/vis2.js
diff --git 
a/zeppelin-zengine/src/test/resources/interpreter/config_test/interpreter-setting.json
 
b/zeppelin-server/src/test/resources/interpreter/config_test/interpreter-setting.json
similarity index 100%
rename from 
zeppelin-zengine/src/test/resources/interpreter/config_test/interpreter-setting.json
rename to 
zeppelin-server/src/test/resources/interpreter/config_test/interpreter-setting.json
diff --git 
a/zeppelin-zengine/src/test/resources/interpreter/mock1/interpreter-setting.json
 b/zeppelin-server/src/test/resources/interpreter/mock1/interpreter-setting.json
similarity index 100%
rename from 
zeppelin-zengine/src/test/resources/interpreter/mock1/interpreter-setting.json
rename to 
zeppelin-server/src/test/resources/interpreter/mock1/interpreter-setting.json
diff --git 
a/zeppelin-zengine/src/test/resources/interpreter/mock2/interpreter-setting.json
 b/zeppelin-server/src/test/resources/interpreter/mock2/interpreter-setting.json
similarity index 100%
rename from 
zeppelin-zengine/src/test/resources/interpreter/mock2/interpreter-setting.json
rename to 
zeppelin-server/src/test/resources/interpreter/mock2/interpreter-setting.json
diff --git 
a/zeppelin-zengine/src/test/resources/interpreter/mock_resource_pool/interpreter-setting.json
 
b/zeppelin-server/src/test/resources/interpreter/mock_resource_pool/interpreter-setting.json
similarity index 100%
rename from 
zeppelin-zengine/src/test/resources/interpreter/mock_resource_pool/interpreter-setting.json
rename to 
zeppelin-server/src/test/resources/interpreter/mock_resource_pool/interpreter-setting.json
diff --git 
a/zeppelin-zengine/src/test/resources/interpreter/test/interpreter-setting.json 
b/zeppelin-server/src/test/resources/interpreter/test/interpreter-setting.json
similarity index 100%
rename from 
zeppelin-zengine/src/test/resources/interpreter/test/interpreter-setting.json
rename to 
zeppelin-server/src/test/resources/interpreter/test/interpreter-setting.json
diff --git a/zeppelin-zengine/src/test/resources/list_of_notes 
b/zeppelin-server/src/test/resources/list_of_notes
similarity index 100%
rename from zeppelin-zengine/src/test/resources/list_of_notes
rename to zeppelin-server/src/test/resources/list_of_notes
diff --git a/zeppelin-zengine/src/test/resources/log4j-1.2.17.jar 
b/zeppelin-server/src/test/resources/log4j-1.2.17.jar
similarity index 100%
rename from zeppelin-zengine/src/test/resources/log4j-1.2.17.jar
rename to zeppelin-server/src/test/resources/log4j-1.2.17.jar
diff --git a/zeppelin-zengine/src/test/resources/note 
b/zeppelin-server/src/test/resources/note
similarity index 100%
rename from zeppelin-zengine/src/test/resources/note
rename to zeppelin-server/src/test/resources/note
diff --git 
a/zeppelin-zengine/src/test/resources/notebook/my_project/my_note1_2A94M5J1Z.zpln
 
b/zeppelin-server/src/test/resources/notebook/my_project/my_note1_2A94M5J1Z.zpln
similarity index 100%
rename from 
zeppelin-zengine/src/test/resources/notebook/my_project/my_note1_2A94M5J1Z.zpln
rename to 
zeppelin-server/src/test/resources/notebook/my_project/my_note1_2A94M5J1Z.zpln
diff --git 
a/zeppelin-zengine/src/test/resources/notebook/my_project/my_note2_2A94M5J2Z.zpln
 
b/zeppelin-server/src/test/resources/notebook/my_project/my_note2_2A94M5J2Z.zpln
similarity index 100%
rename from 
zeppelin-zengine/src/test/resources/notebook/my_project/my_note2_2A94M5J2Z.zpln
rename to 
zeppelin-server/src/test/resources/notebook/my_project/my_note2_2A94M5J2Z.zpln
diff --git a/zeppelin-zengine/src/test/resources/slf4j-api-1.7.10.jar 
b/zeppelin-server/src/test/resources/slf4j-api-1.7.10.jar
similarity index 100%
rename from zeppelin-zengine/src/test/resources/slf4j-api-1.7.10.jar
rename to zeppelin-server/src/test/resources/slf4j-api-1.7.10.jar
diff --git a/zeppelin-zengine/src/test/resources/slf4j-log4j12-1.7.10.jar 
b/zeppelin-server/src/test/resources/slf4j-log4j12-1.7.10.jar
similarity index 100%
rename from zeppelin-zengine/src/test/resources/slf4j-log4j12-1.7.10.jar
rename to zeppelin-server/src/test/resources/slf4j-log4j12-1.7.10.jar
diff --git a/zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml 
b/zeppelin-server/src/test/resources/test-zeppelin-site1.xml
similarity index 100%
rename from zeppelin-zengine/src/test/resources/test-zeppelin-site1.xml
rename to zeppelin-server/src/test/resources/test-zeppelin-site1.xml
diff --git a/zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml 
b/zeppelin-server/src/test/resources/test-zeppelin-site2.xml
similarity index 100%
rename from zeppelin-zengine/src/test/resources/test-zeppelin-site2.xml
rename to zeppelin-server/src/test/resources/test-zeppelin-site2.xml
diff --git a/zeppelin-zengine/src/test/resources/zeppelin-test-site.xml 
b/zeppelin-server/src/test/resources/zeppelin-test-site.xml
similarity index 100%
rename from zeppelin-zengine/src/test/resources/zeppelin-test-site.xml
rename to zeppelin-server/src/test/resources/zeppelin-test-site.xml
diff --git a/zeppelin-zengine/.gitignore b/zeppelin-zengine/.gitignore
deleted file mode 100644
index 7b7c9eede2..0000000000
--- a/zeppelin-zengine/.gitignore
+++ /dev/null
@@ -1,35 +0,0 @@
-*.class
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-*.log
-metastore_db/
-
-
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-.cache
-Icon?
-ehthumbs.db
-Thumbs.db
-
-# maven target files
-target/
-**/target/
-
-*~
-\#*\#
-/.emacs.desktop
-/.emacs.desktop.lock
-.elc
-auto-save-list
-tramp
-.\#*
diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
deleted file mode 100644
index 288f70051d..0000000000
--- a/zeppelin-zengine/pom.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>zeppelin</artifactId>
-    <groupId>org.apache.zeppelin</groupId>
-    <version>0.13.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>zeppelin-zengine</artifactId>
-  <packaging>jar</packaging>
-  <name>Zeppelin: Zengine</name>
-  <description>Zeppelin Zengine</description>
-
-  <properties>
-    <!--library versions-->
-    <guava.version>32.0.0-jre</guava.version>
-    <lucene.version>8.7.0</lucene.version>
-    <org.reflections.version>0.9.8</org.reflections.version>
-    <xml.apis.version>1.4.01</xml.apis.version>
-    <commons.vfs2.version>2.10.0</commons.vfs2.version>
-    <eclipse.jgit.version>4.5.4.201711221230-r</eclipse.jgit.version>
-    <eirslett.version>1.6</eirslett.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>zeppelin-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>zeppelin-interpreter</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.inject</groupId>
-          <artifactId>javax.inject</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>zeppelin-jupyter</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.ow2.asm</groupId>
-          <artifactId>asm</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jsoup</groupId>
-          <artifactId>jsoup</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-        <groupId>jakarta.inject</groupId>
-        <artifactId>jakarta.inject-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk18on</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-vfs2-jackrabbit1</artifactId>
-      <version>${commons.vfs2.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpasyncclient</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-client</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-jetty-client</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.quartz-scheduler</groupId>
-      <artifactId>quartz</artifactId>
-      <version>${quartz.scheduler.version}</version>
-    </dependency>
-
-    <!-- Metrics -->
-    <dependency>
-        <groupId>io.micrometer</groupId>
-        <artifactId>micrometer-core</artifactId>
-        <version>${micrometer.version}</version>
-    </dependency>
-    <!-- Healthcheck -->
-    <dependency>
-        <groupId>io.dropwizard.metrics</groupId>
-        <artifactId>metrics-healthchecks</artifactId>
-        <version>${dropwizard.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
-      <version>${lucene.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-      <version>${lucene.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-queryparser</artifactId>
-      <version>${lucene.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-highlighter</artifactId>
-      <version>${lucene.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.eirslett</groupId>
-      <artifactId>frontend-plugin-core</artifactId>
-      <version>${eirslett.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-utils</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-compress</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-vfs2</artifactId>
-      <version>${commons.vfs2.version}</version>
-      <exclusions>
-        <!-- use hadoop-client-runtime to mount hadoop filesystems -->
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-hdfs-client</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <version>${eclipse.jgit.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.codehaus.jettison</groupId>
-      <artifactId>jettison</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${jetty.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${jetty.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-jetty-server</artifactId>
-      <version>${jetty.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.zeppelin</groupId>
-      <artifactId>zeppelin-test</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>${commons.compress.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-client-runtime</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <reuseForks>false</reuseForks>
-          <forkCount>1</forkCount>
-          <systemProperties>
-            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
-          </systemProperties>
-        </configuration>
-      </plugin>
-
-      <!-- publish test jar as well so that zeppelin-server module can use it 
-->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-  </build>
-</project>
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/display/AngularObjectBuilder.java
 
b/zeppelin-zengine/src/test/java/org/apache/zeppelin/display/AngularObjectBuilder.java
deleted file mode 100644
index c2018588cf..0000000000
--- 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/display/AngularObjectBuilder.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.display;
-
-public class AngularObjectBuilder {
-
-    public static <T> AngularObject<T> build(String varName, T value, String 
noteId,
-                                             String paragraphId) {
-        return new AngularObject<>(varName, value, noteId, paragraphId, null);
-    }
-}
\ No newline at end of file
diff --git a/zeppelin-zengine/src/test/resources/log4j.properties 
b/zeppelin-zengine/src/test/resources/log4j.properties
deleted file mode 100644
index b888064770..0000000000
--- a/zeppelin-zengine/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p [%d] ({%t} %F[%M]:%L) - %m%n
-#log4j.appender.stdout.layout.ConversionPattern=
-#%5p [%t] (%F:%L) - %m%n
-#%-4r [%t] %-5p %c %x - %m%n
-#
-
-# Root logger option
-log4j.rootLogger=INFO, stdout
-
-#mute some noisy guys
-log4j.logger.org.apache.hadoop.mapred=WARN
-log4j.logger.org.apache.hadoop.hive.ql=WARN
-log4j.logger.org.apache.hadoop.hive.metastore=WARN
-log4j.logger.org.apache.haadoop.hive.service.HiveServer=WARN
-
-log4j.logger.org.quartz=WARN
-log4j.logger.DataNucleus=WARN
-log4j.logger.DataNucleus.MetaData=ERROR
-log4j.logger.DataNucleus.Datastore=ERROR
-
-# Log all JDBC parameters
-log4j.logger.org.hibernate.type=ALL
-
-log4j.logger.org.apache.hadoop=WARN
-log4j.logger.org.apache.zeppelin.interpreter.remote.RemoteInterpreterManagedProcess=INFO

(zeppelin) branch master updated: [ZEPPELIN-6355] Merge zeppelin-zengine to zeppelin-server

Reply via email to