Change Zeppelin-web code and compiled code folders

.gitignore

@@ -21,7 +21,6 @@ zeppelin-web/dist
 zeppelin-web/.tmp
 zeppelin-web/.sass-cache
 zeppelin-web/bower_components
-zeppelin-web/src
 **nbproject/
 **node/
 

bin/common.sh

@@ -45,8 +45,8 @@ if [[ -z "$ZEPPELIN_PID_DIR" ]]; then
 fi
 
 if [[ -z "${ZEPPELIN_WAR}" ]]; then
-  if [[ -d "${ZEPPELIN_HOME}/zeppelin-web/src/main/webapp" ]]; then
-    export ZEPPELIN_WAR="${ZEPPELIN_HOME}/zeppelin-web/src/main/webapp"
+  if [[ -d "${ZEPPELIN_HOME}/zeppelin-web/dist" ]]; then
+    export ZEPPELIN_WAR="${ZEPPELIN_HOME}/zeppelin-web/dist"
   else
     export ZEPPELIN_WAR=$(find -L "${ZEPPELIN_HOME}" -name "zeppelin-web*.war")
   fi

zeppelin-web/Gruntfile.js

@@ -34,8 +34,8 @@ module.exports = function (grunt) {
 
   // Configurable paths for the application
   var appConfig = {
-    app: require('./bower.json').appPath || 'app',
-    dist: 'src/main/webapp'
+    app: require('./bower.json').appPath || 'src',
+    dist: 'dist'
   };
 
   // Define the configuration for all the tasks
@@ -157,7 +157,8 @@ module.exports = function (grunt) {
       all: {
         src: [
           'Gruntfile.js',
-          '<%= yeoman.app %>/{app, components}/**/*.js'
+          '<%= yeoman.app %>/app/**/*.js',
+          '<%= yeoman.app %>/components/**/*.js'
         ]
       },
       test: {
@@ -285,7 +286,11 @@ module.exports = function (grunt) {
         files: [{
           expand: true,
           cwd: '<%= yeoman.dist %>',
-          src: ['*.html', '{app, components}/**/*.html'],
+          src: [
+            '*.html',
+            'app/**/*.html',
+            'components/**/*.html'
+          ],
           dest: '<%= yeoman.dist %>'
         }]
       }

zeppelin-web/bower.json

@@ -29,7 +29,10 @@
     "angular-mocks": "1.3.8",
     "angular-scenario": "1.3.8"
   },
-  "appPath": "app",
+  "appPath": "src",
+  "resolutions": {
+    "perfect-scrollbar": "~0.5.4"
+  },
   "overrides": {
     "ace-builds": {
         "main": ["src-noconflict/ace.js",

zeppelin-web/pom.xml

@@ -33,6 +33,13 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webXml>dist\WEB-INF\web.xml</webXml>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
@@ -55,7 +62,7 @@
             <exclude>node_modules/**</exclude>
             <exclude>bower_components/**</exclude>
             <exclude>test/**</exclude>
-            <exclude>src/main/webapp/**</exclude>
+            <exclude>dist/**</exclude>
             <exclude>app/.buildignore</exclude>
             <exclude>app/fonts/fontawesome*</exclude>
             <exclude>app/fonts/font-awesome*</exclude>

zeppelin-web/src/index.html

@@ -63,16 +63,16 @@ limitations under the License.
             <span class="icon-bar"></span>
           </button>
           <a class="navbar-brand" href="#/">
-            <img style="margin-top: -7px;s" src="assets/images/zepLogoW.png" width="50" alt="I'm zeppelin">Zeppelin
+            <img style="margin-top: -7px;s" src="assets/images/zepLogoW.png" width="50" alt="I'm zeppelin"> Zeppelin
           </a>
         </div>
 
         <div class="collapse navbar-collapse" ng-controller="NavCtrl">
           <ul class="nav navbar-nav">
             <li class="dropdown">
-              <a href="#" class="dropdown-toggle">Notebook<span class="caret"></span></a>
+              <a href="#" class="dropdown-toggle">Notebook <span class="caret"></span></a>
               <ul class="dropdown-menu" role="menu">
-                <li><a href="javascript:void(0);" ng-click="createNewNote()"><i class="fa fa-plus"></i>Create new note</a></li>
+                <li><a href="javascript:void(0);" ng-click="createNewNote()"><i class="fa fa-plus"></i> Create new note</a></li>
                 <li class="divider"></li>
                 <div id="notebook-list" class="scrollbar-container">
                   <li ng-repeat="note in notes track by $index" ng-class="{'active' : isActive(note.id)}">
@@ -142,7 +142,7 @@ limitations under the License.
     <script src="bower_components/highlightjs/highlight.pack.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
-    <!-- build:js({.tmp,app}) scripts/scripts.js -->
+    <!-- build:js({.tmp,src}) scripts/scripts.js -->
     <script src="app/app.js"></script>
     <script src="app/home/home.controller.js"></script>
     <script src="app/notebook/notebook.controller.js"></script>

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

@@ -386,7 +386,7 @@ public class ZeppelinConfiguration extends XMLConfiguration {
     ZEPPELIN_SSL_TRUSTSTORE_PATH("zeppelin.ssl.truststore.path", null),
     ZEPPELIN_SSL_TRUSTSTORE_TYPE("zeppelin.ssl.truststore.type", null),
     ZEPPELIN_SSL_TRUSTSTORE_PASSWORD("zeppelin.ssl.truststore.password", null),
-    ZEPPELIN_WAR("zeppelin.war", "../zeppelin-web/src/main/webapp"),
+    ZEPPELIN_WAR("zeppelin.war", "../zeppelin-web/dist"),
     ZEPPELIN_API_WAR("zeppelin.api.war", "../zeppelin-docs/src/main/swagger"),
     ZEPPELIN_INTERPRETERS("zeppelin.interpreters", "org.apache.zeppelin.spark.SparkInterpreter,"
         + "org.apache.zeppelin.spark.PySparkInterpreter,"